Commit b3b0d42a authored by zhengjiangtao's avatar zhengjiangtao

Merge branch 'develop_20200601' of http://172.16.10.76/bank/AmosBankRoot into develop_20200601

parents 856d1996 2f59ebad
...@@ -357,7 +357,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean ...@@ -357,7 +357,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
alarmPoint1.setUpdateDate(new Date()); alarmPoint1.setUpdateDate(new Date());
alarmPoint1.setIsAlarm(1);// 不合格 alarmPoint1.setIsAlarm(1);// 不合格
alarmPoint1.setContent(eqpName + "-" + ipAddress + "," + ALARM_CAUSE); alarmPoint1.setContent(eqpName + "-" + ipAddress + "," + ALARM_CAUSE);
alarmPoint1.setCode(orgCode);
alarmPoint1.setPointName(eqpName); alarmPoint1.setPointName(eqpName);
alarmPoint1.setAuthOrg(orgCode); alarmPoint1.setAuthOrg(orgCode);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
......
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