From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index dc7f819..966c51d 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -55,8 +55,6 @@
@Autowired(required = false)
private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
- @Autowired
- LogUtils logUtils;
@Autowired
RedisTemplate redisTemplate;
@@ -90,7 +88,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:" + sensor.getName() + ";";
- logUtils.saveOperationForManage(request, content, Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content, Constants.INSERT_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
@@ -143,6 +141,7 @@
}
//������deviceInfo������
CacheUtils.refreshDeviceAlarmInfo();
+ CacheUtils.refreshSpecialDeviceAlarmInfo();
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:" + oldSensor.getName() + ";";
for (Object key : updateSensorMap.keySet()) {
@@ -171,7 +170,7 @@
content = content + "������������:" + oldSensor.getDesc() + "->" + updateSensorMap.get(key) + ";";
}
}
- logUtils.saveOperationForManage(request, content, Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content, Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
@@ -292,7 +291,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:" + sensor.getName() + ";";
- logUtils.saveOperationForManage(request, content, Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content, Constants.DELETE_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
//������������
--
Gitblit v1.8.0