From d7e7a651810d74e1d0d474090cb9fd78ffd5427b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 09:09:53 +0800
Subject: [PATCH] screen-manage               更新版本获取因子接口以及分配因子接口

---
 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 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 845f996..ddf3404 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;
@@ -47,6 +49,9 @@
 
     @Autowired(required = false)
     private VersionSensorUnitMapper versionSensorUnitMapper;
+
+    @Autowired(required = false)
+    private SysDictDataMapper sysDictDataMapper;
 
     @Autowired
     LogUtils logUtils;
@@ -137,7 +142,7 @@
                 wrapper_Version.eq("sensor_code",oldSensor.getCode());
                 wrapper_Version.eq("is_delete","0");
                 VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
-                versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
+               // versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
                 versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
                 content = content+"������:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
             }
@@ -188,6 +193,13 @@
             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);
+                sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+            }
             sensorList.add(sensorMap);
         }
         resultMap.put("sensors",sensorList);
@@ -263,6 +275,13 @@
             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);
+                sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+            }
             sensorList.add(sensorMap);
         }
         resultMap.put("sensors",sensorList);

--
Gitblit v1.8.0