Commit 6f26ca3d authored by 李秀明's avatar 李秀明

fix: 装备指标更新报错处理

parent 746debfc
...@@ -1662,6 +1662,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1662,6 +1662,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
BeanUtils.copyProperties(equipmentSpecificIndex, equipmentSpecificAlarm); BeanUtils.copyProperties(equipmentSpecificIndex, equipmentSpecificAlarm);
equipmentSpecificAlarm.setId(null); equipmentSpecificAlarm.setId(null);
equipmentSpecificAlarm.setFrequency(1); equipmentSpecificAlarm.setFrequency(1);
equipmentSpecificAlarm.setEquipmentSpecificName(equipmentSpecificIndex.getEquipmentSpecificName());
equipmentSpecificAlarm.setStatus(AlarmStatusEnum.BJ.getCode()); equipmentSpecificAlarm.setStatus(AlarmStatusEnum.BJ.getCode());
equipmentSpecificAlarm.setEquipmentSpecificIndexKey(equipmentSpecificIndex.getNameKey()); equipmentSpecificAlarm.setEquipmentSpecificIndexKey(equipmentSpecificIndex.getNameKey());
equipmentSpecificAlarm.setEquipmentSpecificIndexValue(equipmentSpecificIndex.getValue()); equipmentSpecificAlarm.setEquipmentSpecificIndexValue(equipmentSpecificIndex.getValue());
...@@ -1996,6 +1997,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1996,6 +1997,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
action.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value); action.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
action.setStatus(AlarmStatusEnum.HF.getCode()); action.setStatus(AlarmStatusEnum.HF.getCode());
} }
action.setEquipmentSpecificName(equipmentSpcIndex.getEquipmentSpecificName());
action.setUpdateDate(new Date()); action.setUpdateDate(new Date());
// 更新所在系统,设备可能编辑过,更新所在系统、装备名称、装备定义code // 更新所在系统,设备可能编辑过,更新所在系统、装备名称、装备定义code
action.setTraceId(equipmentSpcIndex.getTraceId()); action.setTraceId(equipmentSpcIndex.getTraceId());
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
wei.name AS indexName, wei.name AS indexName,
wei.unit AS indexUnitName, wei.unit AS indexUnitName,
wes.org_code AS orgCode, wes.org_code AS orgCode,
ed.`name` AS equipmentSpecificName, wes.name AS equipmentSpecificName,
ed.equipment_name AS equipmentName, ed.equipment_name AS equipmentName,
wes.iot_code AS iotCode, wes.iot_code AS iotCode,
wes.code AS specificCode, wes.code AS specificCode,
......
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