From 771623fe17658cc988445a031df6ed3e6edb76bc Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Jun 2021 10:43:50 +0800
Subject: [PATCH] screen-manage 修复因子删除bug
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 0bf6dc0..5086ec4 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
@@ -179,9 +179,9 @@
if (!ObjectUtils.isEmpty(map.get("orderType"))){
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_DESC)){
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}else {
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}
}
Page resultPage = sensorMapper.selectPage(page,wrapper);
@@ -218,6 +218,36 @@
}
@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;
+ }
+
+ @Override
@Transactional
public Map<String, Object> deleteSensor(Map map) {
Map<String,Object> resultMap = new HashMap<>();
@@ -234,7 +264,7 @@
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);
@@ -264,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();
@@ -279,7 +309,7 @@
sensorMap.put("createTime",createTime);
sensorMap.put("updateTime",updateTime);
sensorMap.put("key",sensor.getId());
- if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ 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());
--
Gitblit v1.8.0