From 133982999dc61cd4e8acbf8a8d72aeb0251db47f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Jun 2021 14:07:02 +0800
Subject: [PATCH] screen-manage 增加报警以及因子显示单位缓存
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 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 d1da7a9..537ffe4 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
@@ -5,8 +5,10 @@
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.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;
@@ -14,6 +16,7 @@
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -46,6 +49,9 @@
@Autowired(required = false)
private VersionSensorUnitMapper versionSensorUnitMapper;
+
+ @Autowired(required = false)
+ private SysDictDataMapper sysDictDataMapper;
@Autowired
LogUtils logUtils;
@@ -132,12 +138,12 @@
content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
}
if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
- QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
+ /*QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
wrapper_Version.eq("sensor_code",oldSensor.getCode());
wrapper_Version.eq("is_delete","0");
VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
- versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
+ versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);*/
content = content+"������:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
}
if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
@@ -149,7 +155,7 @@
if (key.toString().equals("lower")&&updateSensorMap.get(key)!=null){
content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
}
- if (key.toString().equals("default_util")&&updateSensorMap.get(key)!=null){
+ if (key.toString().equals("default_unit_key")&&updateSensorMap.get(key)!=null){
content = content+"������������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
}
}
@@ -170,11 +176,13 @@
QueryWrapper<Sensor> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
int totleNum = sensorMapper.selectCount(wrapper);
- String orderType = map.get("orderType").toString();
- if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
- }else {
- wrapper.orderByDesc("create_time");
+ if (!ObjectUtils.isEmpty(map.get("orderType"))){
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_DESC)){
+ wrapper.orderByDesc("update_time");
+ }else {
+ wrapper.orderByAsc("update_time");
+ }
}
Page resultPage = sensorMapper.selectPage(page,wrapper);
List<Sensor> sensors = resultPage.getRecords();
@@ -187,9 +195,18 @@
sensorMap.put("createTime",createTime);
sensorMap.put("updateTime",updateTime);
sensorMap.put("key",sensor.getId());
+ if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
+ wrapper_VSU.eq("is_delete",0);
+ wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id",14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ }
+ }
sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensorList);
+ resultMap.put("sensors",sensorList);
resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
int totalPageNumber = totleNum/size;
@@ -197,6 +214,36 @@
totalPageNumber += 1;
}
resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> getAllSensorWithoutPage() {
+ Map<String,Object> resultMap = new HashMap<>();
+ QueryWrapper<Sensor> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ List<Sensor> sensors = sensorMapper.selectList(wrapper);
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor:sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ String createTime = SDF.format(sensor.getCreateTime());
+ String updateTime = SDF.format(sensor.getUpdateTime());
+ sensorMap.put("createTime",createTime);
+ sensorMap.put("updateTime",updateTime);
+ sensorMap.put("key",sensor.getId());
+ if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
+ wrapper_VSU.eq("is_delete",0);
+ wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id",14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ }
+ }
+ sensorList.add(sensorMap);
+ }
+ resultMap.put("sensors",sensorList);
return resultMap;
}
@@ -230,6 +277,8 @@
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
+ //������token
+ TokenUtils.destoryToken(Integer.parseInt(map.get("id").toString()));
return resultMap;
}
@@ -245,9 +294,9 @@
int totleNum = sensorMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}else {
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}
Page resultPage = sensorMapper.selectPage(page,wrapper);
List<Sensor> sensors = resultPage.getRecords();
@@ -260,9 +309,16 @@
sensorMap.put("createTime",createTime);
sensorMap.put("updateTime",updateTime);
sensorMap.put("key",sensor.getId());
+ if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
+ QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
+ wrapper_VSU.eq("is_delete",0);
+ wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id",14);
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ }
sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensorList);
+ resultMap.put("sensors",sensorList);
resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
int totalPageNumber = totleNum/size;
@@ -273,6 +329,7 @@
return resultMap;
}
+ @Override
public Map<String,Sensor> getAllSensorFromCache(){
Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
if(ObjectUtils.isEmpty(sensors))
--
Gitblit v1.8.0