Commit dcdec0b0 authored by 张森's avatar 张森

健康指数部分bug修改

parent d82b1899
...@@ -1360,7 +1360,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1360,7 +1360,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
if (iotDataVO.getKey().equalsIgnoreCase(CAFS_FoamTank_FoamTankLevel) || iotDataVO.getKey().equalsIgnoreCase(CAFS_WaterTank_WaterTankLevel)) { if (iotDataVO.getKey().equalsIgnoreCase(CAFS_FoamTank_FoamTankLevel) || iotDataVO.getKey().equalsIgnoreCase(CAFS_WaterTank_WaterTankLevel)) {
map = fireFightingSystemMapper.getFoamTankLevel(equipmentSpecificIndex.getEquipmentSpecificId()); map = fireFightingSystemMapper.getFoamTankLevel(equipmentSpecificIndex.getEquipmentSpecificId());
indexKey = iotDataVO.getKey().equalsIgnoreCase(CAFS_FoamTank_FoamTankLevel) ? "CAFS_FOAM_TANK" : "WATER_TANK_LEVEL"; indexKey = iotDataVO.getKey().equalsIgnoreCase(CAFS_FoamTank_FoamTankLevel) ? "CAFS_FOAM_TANK" : "CAFS_WaterTank_WaterTankLevel";
} else { } else {
map = fireFightingSystemMapper.getPipeNetwork(equipmentSpecificIndex.getEquipmentSpecificId()); map = fireFightingSystemMapper.getPipeNetwork(equipmentSpecificIndex.getEquipmentSpecificId());
indexKey = "PIPE_PRESSURE"; indexKey = "PIPE_PRESSURE";
...@@ -1487,7 +1487,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1487,7 +1487,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
TableContentVo tableContentVo2 = new TableContentVo("报警时间", "text", DateUtil.now(), "3"); TableContentVo tableContentVo2 = new TableContentVo("报警时间", "text", DateUtil.now(), "3");
TableContentVo tableContentVo3 = new TableContentVo("报警对象", "text", map.getOrDefault("name", "").toString(), "4"); TableContentVo tableContentVo3 = new TableContentVo("报警对象", "text", map.getOrDefault("name", "").toString(), "4");
List<TableContentVo> tableContentVos = Arrays.asList(tableContentVo, tableContentVo1, tableContentVo2, tableContentVo3); List<TableContentVo> tableContentVos = Arrays.asList(tableContentVo, tableContentVo1, tableContentVo2, tableContentVo3);
equipmentSpecificIndex.setEquipmentSpecificName(map.get("name").toString());
equipmentSpecificIndex.setEquipmentSpecificCode(map.get("id").toString());
//预警业务 消防水池和消防水箱 //预警业务 消防水池和消防水箱
handleWarning(minValue, handleWarning(minValue,
maxValue, maxValue,
...@@ -1495,7 +1496,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1495,7 +1496,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
equipmentSpecificIndex, equipmentSpecificIndex,
map.get("id").toString(), map.get("id").toString(),
"fireIot/data/analysis", "fireIot/data/analysis",
"WATER_POOL_LEVEL", "pool".equals(map.get("resourceType").toString()) ? "WATER_POOL_LEVEL" : "WATER_TANK_LEVEL",
extra, extra,
"waterLevelOver", "waterLevelOver",
tableContentVos); tableContentVos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment