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 queryStoreroomId(@RequestParam String storeroomId) { if (StringUtils.isEmpty(storeroomId)) {