Browse Source

新增查询字段,新增日志操作字段

master
刘力 3 years ago
parent
commit
0b8781f44e
  1. 2
      logging/src/main/java/com/storeroom/annotation/Log.java
  2. 3
      logging/src/main/java/com/storeroom/domain/Log.java
  3. 2
      logging/src/main/java/com/storeroom/service/dto/LogQueryCriteria.java
  4. 6
      storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java
  5. 2
      storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java

2
logging/src/main/java/com/storeroom/annotation/Log.java

@ -12,4 +12,6 @@ public @interface Log {
String value() default "";
String apiAddress() default "";
}

3
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;

2
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

6
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);
}

2
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)) {

Loading…
Cancel
Save