From 0b8781f44e887c417c53f14aaf4776f1714542dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Wed, 17 Aug 2022 10:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logging/src/main/java/com/storeroom/annotation/Log.java     | 2 ++
 logging/src/main/java/com/storeroom/domain/Log.java         | 3 +++
 .../java/com/storeroom/service/dto/LogQueryCriteria.java    | 2 +-
 .../modules/device/service/impl/DeviceSpecParamImpl.java    | 6 ++++--
 .../modules/storeroom3d/controller/AlarmInfoController.java | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/logging/src/main/java/com/storeroom/annotation/Log.java b/logging/src/main/java/com/storeroom/annotation/Log.java
index 333a6ad..101aee2 100644
--- a/logging/src/main/java/com/storeroom/annotation/Log.java
+++ b/logging/src/main/java/com/storeroom/annotation/Log.java
@@ -12,4 +12,6 @@ public @interface Log {
     String value() default "";
 
     String apiAddress() default "";
+
+
 }
diff --git a/logging/src/main/java/com/storeroom/domain/Log.java b/logging/src/main/java/com/storeroom/domain/Log.java
index 1faf60a..725ea1f 100644
--- a/logging/src/main/java/com/storeroom/domain/Log.java
+++ b/logging/src/main/java/com/storeroom/domain/Log.java
@@ -54,6 +54,9 @@ public class Log implements Serializable {
     /** 请求耗时 */
     private Long time;
 
+    /** 操作 **/
+    private String operate;
+
     /** 异常详细  */
     private byte[] exceptionDetail;
 
diff --git a/logging/src/main/java/com/storeroom/service/dto/LogQueryCriteria.java b/logging/src/main/java/com/storeroom/service/dto/LogQueryCriteria.java
index 224d5f2..26d4fdd 100644
--- a/logging/src/main/java/com/storeroom/service/dto/LogQueryCriteria.java
+++ b/logging/src/main/java/com/storeroom/service/dto/LogQueryCriteria.java
@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class LogQueryCriteria {
 
-    @Query(blurry = "username,description,address,requestIp,method,params")
+    @Query(blurry = "username,description,address,requestIp,method,params,ApiName")
     private String blurry;
 
     @Query
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java
index 3ce00a2..9c6f996 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java
@@ -56,8 +56,10 @@ public class DeviceSpecParamImpl implements DeviceSpecParamService {
     public void delete(String id) {
         DeviceSpecParam deviceSpecParam = deviceSpecParamRepository.findById(id).orElseGet(DeviceSpecParam::new);
         DisplayConfig displayConfig = displayConfigRepository.findById(deviceSpecParam.getDeviceInfoId()).orElseGet(DisplayConfig::new);
-        displayConfig.setDeviceInfo(null);
-        displayConfigRepository.save(displayConfig);
+        if (!StringUtils.isEmpty(displayConfig.getId())) {
+            displayConfig.setDeviceInfo(null);
+            displayConfigRepository.save(displayConfig);
+        }
         deviceSpecParamRepository.deleteById(id);
     }
 
diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java
index cccdbca..b564f17 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java
@@ -38,7 +38,7 @@ public class AlarmInfoController {
 
 
 
-    //@Log(value = "报警处理",apiAddress = "/api/alarm")
+    @Log(value = "报警处理",apiAddress = "/api/alarm")
     @AnonymousGetMapping("info")
     public ApiResponse<Object> queryStoreroomId(@RequestParam String storeroomId) {
         if (StringUtils.isEmpty(storeroomId)) {