From 0c5b1fb1a93a07cff6dd02d227dc8efcd5798a9b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 14:13:26 +0800
Subject: [PATCH] screen-api 更新MybatisPLUS版本
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 cd17e63..953468c 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
@@ -3,15 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.moral.api.entity.ManageRole;
-import com.moral.api.entity.Sensor;
-import com.moral.api.entity.SysDictData;
-import com.moral.api.entity.VersionSensorUnit;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.CacheUtils;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
@@ -52,6 +51,9 @@
@Autowired(required = false)
private SysDictDataMapper sysDictDataMapper;
+
+ @Autowired(required = false)
+ private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
@Autowired
LogUtils logUtils;
@@ -131,6 +133,16 @@
return resultMap;
}
sensorMapper.updateSensor(updateSensorMap);
+ if (!ObjectUtils.isEmpty(updateSensorMap.get("code"))&&!oldSensor.getCode().equals(updateSensorMap.get("code"))){
+ QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
+ wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_OUA.eq("sensor_code",oldSensor.getCode());
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());
+ organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ //������deviceInfo������
+ CacheUtils.refreshDeviceAlarmInfo();
+ }
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+oldSensor.getName()+";";
for (Object key:updateSensorMap.keySet()) {
@@ -264,11 +276,19 @@
deleteSensor.setIsDelete(Constants.DELETE);
sensorMapper.update(deleteSensor,wrapper);
QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
- wrapper_Version.eq("sensor_id",sensor.getId());
+ wrapper_Version.eq("sensor_code",sensor.getCode());
wrapper_Version.eq("is_delete","0");
VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
versionSensorUnit.setIsDelete(Constants.DELETE);
versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
+ if (!ObjectUtils.isEmpty(sensor.getCode())&&!sensor.getCode().equals("")){
+ QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
+ wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_OUA.eq("sensor_code",sensor.getCode());
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setIsDelete(Constants.DELETE);
+ organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
+ }
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+sensor.getName()+";";
@@ -329,6 +349,7 @@
return resultMap;
}
+ @Override
public Map<String,Sensor> getAllSensorFromCache(){
Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
if(ObjectUtils.isEmpty(sensors))
@@ -336,6 +357,12 @@
//������������
refreshCache(sensors);
return sensors;
+ }
+
+ @Override
+ public void refreshCache(){
+ Map<String, Sensor> sensors = getAllSensorFromDB();
+ refreshCache(sensors);
}
private Map<String,Sensor> getAllSensorFromDB(){
@@ -347,11 +374,6 @@
result.put(sensor.getCode(),sensor);
}
return result;
- }
-
- private void refreshCache(){
- Map<String, Sensor> sensors = getAllSensorFromDB();
- refreshCache(sensors);
}
private void refreshCache(Map<String,Sensor> sensors){
--
Gitblit v1.8.0