diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4ba5d59..f1e7474 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -209,7 +209,7 @@ ThreadUtil.excuteMsg(jobId, WasteGasAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4ba5d59..f1e7474 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -209,7 +209,7 @@ ThreadUtil.excuteMsg(jobId, WasteGasAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index 3f8d588..59b10cc 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -120,7 +120,7 @@ ThreadUtil.excuteMsg(jobId,WellAlarmEnum.WellOpenAlarm.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),"", busWell.getPosition(), WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4ba5d59..f1e7474 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -209,7 +209,7 @@ ThreadUtil.excuteMsg(jobId, WasteGasAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index 3f8d588..59b10cc 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -120,7 +120,7 @@ ThreadUtil.excuteMsg(jobId,WellAlarmEnum.WellOpenAlarm.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),"", busWell.getPosition(), WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index 07e5c1a..e1fb030 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -52,7 +52,7 @@ // } } - public static void alarmPushBuilder(String devcode, String tels, String value, String position, + public static void alarmPushBuilder(String wellCode,String devcode, String tels, String value, String position, String alarmContent, String deviceType, String units) { // JSONArray msglist = new JSONArray(); // JSONObject msgMap = new JSONObject(); @@ -62,8 +62,13 @@ // msgMap.put("position", position); // msgMap.put("content", alarmContent); // String phoneJson = ""; - String content ="设备编号为"+devcode+"的"+deviceType+"，在"+position+"发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; - HyShortMsgUtil.sendMsg(content,tels); + + String hywxSwitch = Configure.getProperty("HYWX_SWITCH", ""); + if(hywxSwitch.equals("true")){ + String content ="位于"+position+"的(井编号:"+wellCode+")编号为"+devcode+"的"+deviceType + + "发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; + HyShortMsgUtil.sendMsg(content,tels); + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4ba5d59..f1e7474 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -209,7 +209,7 @@ ThreadUtil.excuteMsg(jobId, WasteGasAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index 3f8d588..59b10cc 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -120,7 +120,7 @@ ThreadUtil.excuteMsg(jobId,WellAlarmEnum.WellOpenAlarm.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),"", busWell.getPosition(), WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index 07e5c1a..e1fb030 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -52,7 +52,7 @@ // } } - public static void alarmPushBuilder(String devcode, String tels, String value, String position, + public static void alarmPushBuilder(String wellCode,String devcode, String tels, String value, String position, String alarmContent, String deviceType, String units) { // JSONArray msglist = new JSONArray(); // JSONObject msgMap = new JSONObject(); @@ -62,8 +62,13 @@ // msgMap.put("position", position); // msgMap.put("content", alarmContent); // String phoneJson = ""; - String content ="设备编号为"+devcode+"的"+deviceType+"，在"+position+"发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; - HyShortMsgUtil.sendMsg(content,tels); + + String hywxSwitch = Configure.getProperty("HYWX_SWITCH", ""); + if(hywxSwitch.equals("true")){ + String content ="位于"+position+"的(井编号:"+wellCode+")编号为"+devcode+"的"+deviceType + + "发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; + HyShortMsgUtil.sendMsg(content,tels); + } } diff --git a/src/main/java/org/well/well/util/HyShortMsgUtil.java b/src/main/java/org/well/well/util/HyShortMsgUtil.java index 601288c..0fb692a 100644 --- a/src/main/java/org/well/well/util/HyShortMsgUtil.java +++ b/src/main/java/org/well/well/util/HyShortMsgUtil.java @@ -22,8 +22,11 @@ * @date 2023-3-20 */ public class HyShortMsgUtil { -// private static String Url = "http://106.ihuyi.com/webservice/sms.php?method=Submit"; + /** + * 手机号正则表达式 + */ + private static String PHONE_NUMBER_REG = "^(1[3-9])\\d{9}$"; private static final Logger log = LoggerFactory.getLogger(HyShortMsgUtil.class.getName()); public static void sendMsg(String content, String mobiles) { @@ -43,7 +46,7 @@ new NameValuePair("account", appId), //查看用户名 登录用户中心->验证码通知短信>产品总览->API接口信息->APIID new NameValuePair("password", appKey), //查看密码 登录用户中心->验证码通知短信>产品总览->API接口信息->APIKEY //new NameValuePair("password", util.StringUtil.MD5Encode("密码")), - new NameValuePair("mobile", "13651065090"), + new NameValuePair("mobile", ""), new NameValuePair("content", content), }; @@ -52,19 +55,23 @@ try { //批量发送 for (String mobile : mobileList) { + if (!mobile.matches(PHONE_NUMBER_REG)) { + continue; + } data[2].setValue(mobile); method.setRequestBody(data); client.executeMethod(method); String SubmitResult = method.getResponseBodyAsString(); - //System.out.println(SubmitResult); Document doc = DocumentHelper.parseText(SubmitResult); - Element root = doc.getRootElement(); - String code = root.elementText("code"); - String msg = root.elementText("msg"); - String smsid = root.elementText("smsid"); - log.info("手机号是{},发送内容是{},短信回执码:{},返回消息是{},smsid是{}", data[2].getValue(), data[3].getValue(), code, msg, smsid); - if ("2".equals(code)) { - System.out.println("短信提交成功"); + if (doc != null) { + Element root = doc.getRootElement(); + log.info("手机号是{},发送内容是{},短信回执码:{},返回消息是{},smsid是{}", data[2].getValue(), data[3].getValue(), root.elementText("code") + , root.elementText("msg"), root.elementText("smsid")); + if ("2".equals(root.elementText("code"))) { + System.out.println("短信提交成功"); + } + } else { + log.info("手机号是{},发送内容是{},返回的解析内容存在异常", data[2].getValue(), data[3].getValue()); } } } catch (HttpException e) { diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4ba5d59..f1e7474 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -209,7 +209,7 @@ ThreadUtil.excuteMsg(jobId, WasteGasAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index 3f8d588..59b10cc 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -120,7 +120,7 @@ ThreadUtil.excuteMsg(jobId,WellAlarmEnum.WellOpenAlarm.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),"", busWell.getPosition(), WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index 07e5c1a..e1fb030 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -52,7 +52,7 @@ // } } - public static void alarmPushBuilder(String devcode, String tels, String value, String position, + public static void alarmPushBuilder(String wellCode,String devcode, String tels, String value, String position, String alarmContent, String deviceType, String units) { // JSONArray msglist = new JSONArray(); // JSONObject msgMap = new JSONObject(); @@ -62,8 +62,13 @@ // msgMap.put("position", position); // msgMap.put("content", alarmContent); // String phoneJson = ""; - String content ="设备编号为"+devcode+"的"+deviceType+"，在"+position+"发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; - HyShortMsgUtil.sendMsg(content,tels); + + String hywxSwitch = Configure.getProperty("HYWX_SWITCH", ""); + if(hywxSwitch.equals("true")){ + String content ="位于"+position+"的(井编号:"+wellCode+")编号为"+devcode+"的"+deviceType + + "发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; + HyShortMsgUtil.sendMsg(content,tels); + } } diff --git a/src/main/java/org/well/well/util/HyShortMsgUtil.java b/src/main/java/org/well/well/util/HyShortMsgUtil.java index 601288c..0fb692a 100644 --- a/src/main/java/org/well/well/util/HyShortMsgUtil.java +++ b/src/main/java/org/well/well/util/HyShortMsgUtil.java @@ -22,8 +22,11 @@ * @date 2023-3-20 */ public class HyShortMsgUtil { -// private static String Url = "http://106.ihuyi.com/webservice/sms.php?method=Submit"; + /** + * 手机号正则表达式 + */ + private static String PHONE_NUMBER_REG = "^(1[3-9])\\d{9}$"; private static final Logger log = LoggerFactory.getLogger(HyShortMsgUtil.class.getName()); public static void sendMsg(String content, String mobiles) { @@ -43,7 +46,7 @@ new NameValuePair("account", appId), //查看用户名 登录用户中心->验证码通知短信>产品总览->API接口信息->APIID new NameValuePair("password", appKey), //查看密码 登录用户中心->验证码通知短信>产品总览->API接口信息->APIKEY //new NameValuePair("password", util.StringUtil.MD5Encode("密码")), - new NameValuePair("mobile", "13651065090"), + new NameValuePair("mobile", ""), new NameValuePair("content", content), }; @@ -52,19 +55,23 @@ try { //批量发送 for (String mobile : mobileList) { + if (!mobile.matches(PHONE_NUMBER_REG)) { + continue; + } data[2].setValue(mobile); method.setRequestBody(data); client.executeMethod(method); String SubmitResult = method.getResponseBodyAsString(); - //System.out.println(SubmitResult); Document doc = DocumentHelper.parseText(SubmitResult); - Element root = doc.getRootElement(); - String code = root.elementText("code"); - String msg = root.elementText("msg"); - String smsid = root.elementText("smsid"); - log.info("手机号是{},发送内容是{},短信回执码:{},返回消息是{},smsid是{}", data[2].getValue(), data[3].getValue(), code, msg, smsid); - if ("2".equals(code)) { - System.out.println("短信提交成功"); + if (doc != null) { + Element root = doc.getRootElement(); + log.info("手机号是{},发送内容是{},短信回执码:{},返回消息是{},smsid是{}", data[2].getValue(), data[3].getValue(), root.elementText("code") + , root.elementText("msg"), root.elementText("smsid")); + if ("2".equals(root.elementText("code"))) { + System.out.println("短信提交成功"); + } + } else { + log.info("手机号是{},发送内容是{},返回的解析内容存在异常", data[2].getValue(), data[3].getValue()); } } } catch (HttpException e) { diff --git a/src/main/java/org/well/well/util/SendBatchSmsUtil.java b/src/main/java/org/well/well/util/SendBatchSmsUtil.java index 05c969d..32925ad 100644 --- a/src/main/java/org/well/well/util/SendBatchSmsUtil.java +++ b/src/main/java/org/well/well/util/SendBatchSmsUtil.java @@ -24,6 +24,10 @@ public static void sendMsg(String phoneJson, String msgJson,String aliSignNameJson) { + String ghSwitch = Configure.getProperty("GH_SWITCH", ""); + if(!ghSwitch.equals("true")){ + return; + } String aliKey = Configure.getProperty("aliKey", ""); String aliSecret = Configure.getProperty("aliSecret", ""); String aliUrl = Configure.getProperty("aliUrl", ""); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 01f5002..e08aa6f 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -170,7 +170,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; // // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":80.0,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":55.6,\"uptime\":\"20220513020200\"},{\"gas\":40.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index d958178..a9cac47 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -77,18 +77,18 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - if (null == ((JSONObject) jsonArray.get(i)).get("gas")) { + if (null == ((JSONObject) jsonFilter.get(i)).get("gas")) { continue; } - String gas = ((JSONObject) jsonArray.get(i)).getString("gas"); - String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime"); + String gas = ((JSONObject) jsonFilter.get(i)).getString("gas"); + String upTime = ((JSONObject) jsonFilter.get(i)).getString("uptime"); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); //2.有无超限处理流程（判断最后一条数据） -// if (i < jsonArray.size() - 1) { -// continue; -// } + if (i < jsonFilter.size() - 1) { + continue; + } //4.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, ""); @@ -136,7 +136,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), "%LEL"); } } else { @@ -146,7 +146,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index bf7e4f1..d036063 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -151,7 +151,7 @@ ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), level, busWell.getPosition(), alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 1f35bf7..587cddb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -142,7 +142,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode,busWell.getTel(),level, busWell.getPosition(), alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index c4c2b7f..382fb8d 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -25,53 +25,53 @@ AlarmJobManager alarmJobManager; @Transactional - public void processMeterData(Map meterMap){ + public void processMeterData(Map meterMap) { try { - String devCode=meterMap.get("devCode"); + String devCode = meterMap.get("devCode"); //1.清离线 deviceManager.clearOffline(devCode); //2.存数据 BusWell busWell = busWellManager.getWellByDevCode(devCode); - save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); + save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ - alarmContent+="温度超限报警,"; - alarmValue+="温度:" + meterMap.get("temp") + "℃,"; + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) > 60) { + alarmContent += "温度超限报警,"; + alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ - alarmContent+="PH值超限报警,"; - alarmValue+="PH:" + meterMap.get("PH") + ","; + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) > 10 || + Float.valueOf(meterMap.get("PH")) < 6)) { + alarmContent += "PH值超限报警,"; + alarmValue += "PH:" + meterMap.get("PH") + ","; } - if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ - alarmContent+="电导率超限报警,"; - alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; + if (StringUtils.isNotBlank(meterMap.get("conductivity")) && + Float.valueOf(meterMap.get("conductivity")) > 5) { + alarmContent += "电导率超限报警,"; + alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ - alarmContent+="溶解氧超限报警,"; - alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) > 20) { + alarmContent += "溶解氧超限报警,"; + alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ - alarmContent+="浊度超限报警,"; - alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; + if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) > 1000) { + alarmContent += "浊度超限报警,"; + alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ - alarmContent+="化学需氧量超限报警,"; - alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) > 500) { + alarmContent += "化学需氧量超限报警,"; + alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ - alarmContent+="氨氮超限报警,"; - alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) > 20) { + alarmContent += "氨氮超限报警,"; + alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ - alarmContent+="总磷超限报警,"; - alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) > 15) { + alarmContent += "总磷超限报警,"; + alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ - alarmContent+="总氮超限报警,"; - alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) > 30) { + alarmContent += "总氮超限报警,"; + alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } if (StringUtils.isNotBlank(alarmContent)) { AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); @@ -88,14 +88,14 @@ Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 - Long jobId= SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(),"1"); + Long jobId = SnowFlakeUtil.getId(); + alarmJobManager.saveData(jobId, devCode, busWell != null ? + busWell.getWellCode() : "", DeviceTypeEnum.Meter.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", null, "水质超限告警", alarmValue.substring(0, alarmValue.length() - 1), device, - devCode, busWell!=null?busWell.getWellCode():"", meterMap.get("DataTime"), + devCode, busWell != null ? busWell.getWellCode() : "", meterMap.get("DataTime"), alarmContent.substring(0, alarmContent.length() - 1)); // //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); @@ -103,9 +103,9 @@ // PushList.pushToUser(cids, "液位超限", "报警啦，快来处理"); ThreadUtil.excuteMsg(jobId, "水质超限告警"); //配置了手机号，可以走短信平台发送 - if(!StringUtils.isEmpty(busWell.getTel())){ - AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Meter.toString(), ""); + if (!StringUtils.isEmpty(busWell.getTel())) { + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + alarmContent, DeviceTypeEnum.Meter.toString(), ""); } } @@ -115,7 +115,7 @@ //2.结束之前的工单 alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index fb5d569..706c405 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -78,13 +78,13 @@ List jsonFilter=listFilter.collect(Collectors.toList()); for (int i = 0; i < jsonFilter.size(); i++) { try { - String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); - String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + String gas = ((JSONObject) jsonFilter.get(i)).get("gas").toString(); + String upTime = ((JSONObject) jsonFilter.get(i)).get("uptime").toString(); gas = String.format("%.2f", Double.valueOf(gas)); //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr); //2.有无超限处理流程（判断最后一条数据） - if (i < jsonArray.size() - 1) { + if (i < jsonFilter.size() - 1) { continue; } @@ -139,7 +139,7 @@ } //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), gas, busWell.getPosition(), alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { @@ -149,7 +149,7 @@ deviceManager.clearOffline(devCode); } catch (IOException e) { e.printStackTrace(); - logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonArray.get(i).toString() + "失败-------"); + logger.error("--------ERROR:设备编号：" + devCode + "，存储数据：" + jsonFilter.get(i).toString() + "失败-------"); } } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 662b300..52ad4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -48,7 +48,7 @@ try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData,pci,rsrp,snr); + frequency, dData, pci, rsrp, snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -120,12 +120,12 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 Long jobId = SnowFlakeUtil.getId(); - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "1"); //2.写入新的告警 alarmRecordManager.saveData(jobId, "1", alarmLevel, alarmContent, val, device, - devCode, busWell!=null?busWell.getWellCode():"", upTime, alarmContent); + devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 // List cids = userManager.getClients(busWell); // if (cids.size() > 0) @@ -133,7 +133,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } @@ -168,9 +168,9 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); - Long jobId=alarmJob==null? SnowFlakeUtil.getId():alarmJob.getId(); + Long jobId = alarmJob == null ? SnowFlakeUtil.getId() : alarmJob.getId(); if (null == alarmJob) { - alarmJobManager.saveData(jobId,devCode, busWell != null ? + alarmJobManager.saveData(jobId, devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.NoiseDig.toString(), "0"); } alarmRecordManager.saveData(jobId, "2", null, diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index 547ab2e..94409f2 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -126,7 +126,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder(busWell.getWellCode(), devCode, busWell.getTel(), val, busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index afde01d..b260dcc 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -162,7 +162,7 @@ ThreadUtil.excuteMsg(jobId, TempHumiAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 4002c1d..90acc22 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -125,7 +125,7 @@ ThreadUtil.excuteMsg(jobId, alarmContent); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),gas,busWell.getPosition(), alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4ba5d59..f1e7474 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -209,7 +209,7 @@ ThreadUtil.excuteMsg(jobId, WasteGasAlarmEnum.OVER_THRESH.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index 3f8d588..59b10cc 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -120,7 +120,7 @@ ThreadUtil.excuteMsg(jobId,WellAlarmEnum.WellOpenAlarm.getName()); //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { - AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), + AlarmPushProvider.alarmPushBuilder( busWell.getWellCode() ,devCode, busWell.getTel(),"", busWell.getPosition(), WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index 07e5c1a..e1fb030 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -52,7 +52,7 @@ // } } - public static void alarmPushBuilder(String devcode, String tels, String value, String position, + public static void alarmPushBuilder(String wellCode,String devcode, String tels, String value, String position, String alarmContent, String deviceType, String units) { // JSONArray msglist = new JSONArray(); // JSONObject msgMap = new JSONObject(); @@ -62,8 +62,13 @@ // msgMap.put("position", position); // msgMap.put("content", alarmContent); // String phoneJson = ""; - String content ="设备编号为"+devcode+"的"+deviceType+"，在"+position+"发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; - HyShortMsgUtil.sendMsg(content,tels); + + String hywxSwitch = Configure.getProperty("HYWX_SWITCH", ""); + if(hywxSwitch.equals("true")){ + String content ="位于"+position+"的(井编号:"+wellCode+")编号为"+devcode+"的"+deviceType + + "发生了"+alarmContent+",报警值为"+value+units+"，请及时处理！"; + HyShortMsgUtil.sendMsg(content,tels); + } } diff --git a/src/main/java/org/well/well/util/HyShortMsgUtil.java b/src/main/java/org/well/well/util/HyShortMsgUtil.java index 601288c..0fb692a 100644 --- a/src/main/java/org/well/well/util/HyShortMsgUtil.java +++ b/src/main/java/org/well/well/util/HyShortMsgUtil.java @@ -22,8 +22,11 @@ * @date 2023-3-20 */ public class HyShortMsgUtil { -// private static String Url = "http://106.ihuyi.com/webservice/sms.php?method=Submit"; + /** + * 手机号正则表达式 + */ + private static String PHONE_NUMBER_REG = "^(1[3-9])\\d{9}$"; private static final Logger log = LoggerFactory.getLogger(HyShortMsgUtil.class.getName()); public static void sendMsg(String content, String mobiles) { @@ -43,7 +46,7 @@ new NameValuePair("account", appId), //查看用户名 登录用户中心->验证码通知短信>产品总览->API接口信息->APIID new NameValuePair("password", appKey), //查看密码 登录用户中心->验证码通知短信>产品总览->API接口信息->APIKEY //new NameValuePair("password", util.StringUtil.MD5Encode("密码")), - new NameValuePair("mobile", "13651065090"), + new NameValuePair("mobile", ""), new NameValuePair("content", content), }; @@ -52,19 +55,23 @@ try { //批量发送 for (String mobile : mobileList) { + if (!mobile.matches(PHONE_NUMBER_REG)) { + continue; + } data[2].setValue(mobile); method.setRequestBody(data); client.executeMethod(method); String SubmitResult = method.getResponseBodyAsString(); - //System.out.println(SubmitResult); Document doc = DocumentHelper.parseText(SubmitResult); - Element root = doc.getRootElement(); - String code = root.elementText("code"); - String msg = root.elementText("msg"); - String smsid = root.elementText("smsid"); - log.info("手机号是{},发送内容是{},短信回执码:{},返回消息是{},smsid是{}", data[2].getValue(), data[3].getValue(), code, msg, smsid); - if ("2".equals(code)) { - System.out.println("短信提交成功"); + if (doc != null) { + Element root = doc.getRootElement(); + log.info("手机号是{},发送内容是{},短信回执码:{},返回消息是{},smsid是{}", data[2].getValue(), data[3].getValue(), root.elementText("code") + , root.elementText("msg"), root.elementText("smsid")); + if ("2".equals(root.elementText("code"))) { + System.out.println("短信提交成功"); + } + } else { + log.info("手机号是{},发送内容是{},返回的解析内容存在异常", data[2].getValue(), data[3].getValue()); } } } catch (HttpException e) { diff --git a/src/main/java/org/well/well/util/SendBatchSmsUtil.java b/src/main/java/org/well/well/util/SendBatchSmsUtil.java index 05c969d..32925ad 100644 --- a/src/main/java/org/well/well/util/SendBatchSmsUtil.java +++ b/src/main/java/org/well/well/util/SendBatchSmsUtil.java @@ -24,6 +24,10 @@ public static void sendMsg(String phoneJson, String msgJson,String aliSignNameJson) { + String ghSwitch = Configure.getProperty("GH_SWITCH", ""); + if(!ghSwitch.equals("true")){ + return; + } String aliKey = Configure.getProperty("aliKey", ""); String aliSecret = Configure.getProperty("aliSecret", ""); String aliUrl = Configure.getProperty("aliUrl", ""); diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index b921a04..f997a4f 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -161,4 +161,7 @@ appKey=9c80f9334af06a5f9cacc1468eb84632 hy_url=http://106.ihuyi.com/webservice/sms.php?method=Submit +GH_SWITCH=false +HYWX_SWITCH=true +