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 | 10 +++-------
1 files changed, 3 insertions(+), 7 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 b409e79..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
@@ -142,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)+";";
}
@@ -198,9 +198,7 @@
wrapper_VSU.eq("is_delete",0);
wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
wrapper_VSU.eq("dict_type_id",14);
- Map<String,Object> defaultUnitMap = new HashMap<>();
- defaultUnitMap.put(sensor.getDefaultUnitKey(),sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
- sensorMap.put("default_unit_key",defaultUnitMap);
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
sensorList.add(sensorMap);
}
@@ -282,9 +280,7 @@
wrapper_VSU.eq("is_delete",0);
wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
wrapper_VSU.eq("dict_type_id",14);
- Map<String,Object> defaultUnitMap = new HashMap<>();
- defaultUnitMap.put(sensor.getDefaultUnitKey(),sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
- sensorMap.put("default_unit_key",defaultUnitMap);
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
sensorList.add(sensorMap);
}
--
Gitblit v1.8.0