diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f7a8fce..f755f92 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,10 +124,10 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; + temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":7.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f7a8fce..f755f92 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,10 +124,10 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; + temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":7.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index fc685ad..e0b6b4b 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -99,10 +99,10 @@ alarmRecordManager.saveData(alarmJob.getId(), "1", LiquidAlarmEnum.OVER_THRESH.getName(), level, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f7a8fce..f755f92 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,10 +124,10 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; + temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":7.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index fc685ad..e0b6b4b 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -99,10 +99,10 @@ alarmRecordManager.saveData(alarmJob.getId(), "1", LiquidAlarmEnum.OVER_THRESH.getName(), level, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index f1e110c..a9204b2 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -77,7 +77,7 @@ if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); - //2.写入新的告警记录,更新工单号为上一条告警记录的工单号 + //2.写入新的告警记录,工单号为上一条告警记录的工单号 alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmRecord.getAlarmContent(), gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime); } else {//不存在上一条报警时 @@ -92,9 +92,9 @@ MethaneAlarmEnum.OVER_THRESH.getName(), gas, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f7a8fce..f755f92 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,10 +124,10 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; + temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":7.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index fc685ad..e0b6b4b 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -99,10 +99,10 @@ alarmRecordManager.saveData(alarmJob.getId(), "1", LiquidAlarmEnum.OVER_THRESH.getName(), level, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index f1e110c..a9204b2 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -77,7 +77,7 @@ if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); - //2.写入新的告警记录,更新工单号为上一条告警记录的工单号 + //2.写入新的告警记录,工单号为上一条告警记录的工单号 alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmRecord.getAlarmContent(), gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime); } else {//不存在上一条报警时 @@ -92,9 +92,9 @@ MethaneAlarmEnum.OVER_THRESH.getName(), gas, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 1684a18..8d4efa6 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -91,9 +91,9 @@ NoiseDigAlarmEnum.OVER_THRESH.getName(), val, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f7a8fce..f755f92 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,10 +124,10 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; + temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":7.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index fc685ad..e0b6b4b 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -99,10 +99,10 @@ alarmRecordManager.saveData(alarmJob.getId(), "1", LiquidAlarmEnum.OVER_THRESH.getName(), level, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index f1e110c..a9204b2 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -77,7 +77,7 @@ if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); - //2.写入新的告警记录,更新工单号为上一条告警记录的工单号 + //2.写入新的告警记录,工单号为上一条告警记录的工单号 alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmRecord.getAlarmContent(), gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime); } else {//不存在上一条报警时 @@ -92,9 +92,9 @@ MethaneAlarmEnum.OVER_THRESH.getName(), gas, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 1684a18..8d4efa6 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -91,9 +91,9 @@ NoiseDigAlarmEnum.OVER_THRESH.getName(), val, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index de66ae8..a2a402f 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -102,10 +102,10 @@ alarmContent.substring(0, alarmContent.length() - 1), alarmValue, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f7a8fce..f755f92 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,10 +124,10 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; + temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":7.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"4120180002\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index fc685ad..e0b6b4b 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -99,10 +99,10 @@ alarmRecordManager.saveData(alarmJob.getId(), "1", LiquidAlarmEnum.OVER_THRESH.getName(), level, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index f1e110c..a9204b2 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -77,7 +77,7 @@ if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); - //2.写入新的告警记录,更新工单号为上一条告警记录的工单号 + //2.写入新的告警记录,工单号为上一条告警记录的工单号 alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmRecord.getAlarmContent(), gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime); } else {//不存在上一条报警时 @@ -92,9 +92,9 @@ MethaneAlarmEnum.OVER_THRESH.getName(), gas, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 1684a18..8d4efa6 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -91,9 +91,9 @@ NoiseDigAlarmEnum.OVER_THRESH.getName(), val, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index de66ae8..a2a402f 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -102,10 +102,10 @@ alarmContent.substring(0, alarmContent.length() - 1), alarmValue, device, devCode, alarmJob.getWellCode(), upTime); - //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// //3.toDo:向app推送报警消息 +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 8252e42..b9b0c56 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -102,9 +102,9 @@ alarmValue, device, devCode, alarmJob.getWellCode(), upTime); //3.toDo:向app推送报警消息 - List cids = userManager.getClients(busWell); - if (cids.size() > 0) - PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); +// List cids = userManager.getClients(busWell); +// if (cids.size() > 0) +// PushList.pushToUser(cids, "液位超限", "报警啦,快来处理"); } } else {//未超限 //1.清除之前的报警