diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/well/manager/AlarmRuleManager.java b/src/main/java/org/well/well/manager/AlarmRuleManager.java index aa1bf4a..bf6849a 100644 --- a/src/main/java/org/well/well/manager/AlarmRuleManager.java +++ b/src/main/java/org/well/well/manager/AlarmRuleManager.java @@ -79,7 +79,7 @@ ruleStr += (null != alarmRule3 ? (String.valueOf(alarmRule3.getHighValue()) + "^" + String.valueOf(alarmRule.getLowValue())) : ""); } else if (DeviceTypeEnum.Methane.toString().equals(devTypeName)) { - ruleStr += "50,25"; + ruleStr += "2,1"; } else if (DeviceTypeEnum.WasteGas.toString().equals(devTypeName)) { ruleStr += "50,10,2,18:23";//CO,H2S,CH4,O2(18~23) } else if (DeviceTypeEnum.TempHumi.toString().equals(devTypeName)) { diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/well/manager/AlarmRuleManager.java b/src/main/java/org/well/well/manager/AlarmRuleManager.java index aa1bf4a..bf6849a 100644 --- a/src/main/java/org/well/well/manager/AlarmRuleManager.java +++ b/src/main/java/org/well/well/manager/AlarmRuleManager.java @@ -79,7 +79,7 @@ ruleStr += (null != alarmRule3 ? (String.valueOf(alarmRule3.getHighValue()) + "^" + String.valueOf(alarmRule.getLowValue())) : ""); } else if (DeviceTypeEnum.Methane.toString().equals(devTypeName)) { - ruleStr += "50,25"; + ruleStr += "2,1"; } else if (DeviceTypeEnum.WasteGas.toString().equals(devTypeName)) { ruleStr += "50,10,2,18:23";//CO,H2S,CH4,O2(18~23) } else if (DeviceTypeEnum.TempHumi.toString().equals(devTypeName)) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 30b22b4..5b53343 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -79,11 +79,14 @@ } } + + + public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = criteria.list(); + List deviceList = (List)criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -108,12 +111,12 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { - sql = "select * from data_gas " + + } else if (devTypeName.equals(DeviceTypeEnum.LG.toString())) { + sql = "select * from data_gasliquid_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.NoiseDig.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Dig.toString())) { sql = "select * from data_dig " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/well/manager/AlarmRuleManager.java b/src/main/java/org/well/well/manager/AlarmRuleManager.java index aa1bf4a..bf6849a 100644 --- a/src/main/java/org/well/well/manager/AlarmRuleManager.java +++ b/src/main/java/org/well/well/manager/AlarmRuleManager.java @@ -79,7 +79,7 @@ ruleStr += (null != alarmRule3 ? (String.valueOf(alarmRule3.getHighValue()) + "^" + String.valueOf(alarmRule.getLowValue())) : ""); } else if (DeviceTypeEnum.Methane.toString().equals(devTypeName)) { - ruleStr += "50,25"; + ruleStr += "2,1"; } else if (DeviceTypeEnum.WasteGas.toString().equals(devTypeName)) { ruleStr += "50,10,2,18:23";//CO,H2S,CH4,O2(18~23) } else if (DeviceTypeEnum.TempHumi.toString().equals(devTypeName)) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 30b22b4..5b53343 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -79,11 +79,14 @@ } } + + + public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = criteria.list(); + List deviceList = (List)criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -108,12 +111,12 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { - sql = "select * from data_gas " + + } else if (devTypeName.equals(DeviceTypeEnum.LG.toString())) { + sql = "select * from data_gasliquid_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.NoiseDig.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Dig.toString())) { sql = "select * from data_dig " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 47ed13e..b79c549 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -72,7 +72,7 @@ //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; - String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 + String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; String isAlarm = "1";//是否开启报警(1为开启) diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/well/manager/AlarmRuleManager.java b/src/main/java/org/well/well/manager/AlarmRuleManager.java index aa1bf4a..bf6849a 100644 --- a/src/main/java/org/well/well/manager/AlarmRuleManager.java +++ b/src/main/java/org/well/well/manager/AlarmRuleManager.java @@ -79,7 +79,7 @@ ruleStr += (null != alarmRule3 ? (String.valueOf(alarmRule3.getHighValue()) + "^" + String.valueOf(alarmRule.getLowValue())) : ""); } else if (DeviceTypeEnum.Methane.toString().equals(devTypeName)) { - ruleStr += "50,25"; + ruleStr += "2,1"; } else if (DeviceTypeEnum.WasteGas.toString().equals(devTypeName)) { ruleStr += "50,10,2,18:23";//CO,H2S,CH4,O2(18~23) } else if (DeviceTypeEnum.TempHumi.toString().equals(devTypeName)) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 30b22b4..5b53343 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -79,11 +79,14 @@ } } + + + public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = criteria.list(); + List deviceList = (List)criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -108,12 +111,12 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { - sql = "select * from data_gas " + + } else if (devTypeName.equals(DeviceTypeEnum.LG.toString())) { + sql = "select * from data_gasliquid_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.NoiseDig.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Dig.toString())) { sql = "select * from data_dig " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 47ed13e..b79c549 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -72,7 +72,7 @@ //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; - String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 + String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; String isAlarm = "1";//是否开启报警(1为开启) diff --git a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java index bcce2a6..42dc69f 100644 --- a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java +++ b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java @@ -30,8 +30,8 @@ // every 10 seconds @Scheduled(cron = "0 0 5 * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(cron = "0 0/2 * * * ?") public void execute() { if (!enabled) { return; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/well/manager/AlarmRuleManager.java b/src/main/java/org/well/well/manager/AlarmRuleManager.java index aa1bf4a..bf6849a 100644 --- a/src/main/java/org/well/well/manager/AlarmRuleManager.java +++ b/src/main/java/org/well/well/manager/AlarmRuleManager.java @@ -79,7 +79,7 @@ ruleStr += (null != alarmRule3 ? (String.valueOf(alarmRule3.getHighValue()) + "^" + String.valueOf(alarmRule.getLowValue())) : ""); } else if (DeviceTypeEnum.Methane.toString().equals(devTypeName)) { - ruleStr += "50,25"; + ruleStr += "2,1"; } else if (DeviceTypeEnum.WasteGas.toString().equals(devTypeName)) { ruleStr += "50,10,2,18:23";//CO,H2S,CH4,O2(18~23) } else if (DeviceTypeEnum.TempHumi.toString().equals(devTypeName)) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 30b22b4..5b53343 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -79,11 +79,14 @@ } } + + + public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = criteria.list(); + List deviceList = (List)criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -108,12 +111,12 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { - sql = "select * from data_gas " + + } else if (devTypeName.equals(DeviceTypeEnum.LG.toString())) { + sql = "select * from data_gasliquid_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.NoiseDig.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Dig.toString())) { sql = "select * from data_dig " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 47ed13e..b79c549 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -72,7 +72,7 @@ //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; - String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 + String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; String isAlarm = "1";//是否开启报警(1为开启) diff --git a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java index bcce2a6..42dc69f 100644 --- a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java +++ b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java @@ -30,8 +30,8 @@ // every 10 seconds @Scheduled(cron = "0 0 5 * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(cron = "0 0/2 * * * ?") public void execute() { if (!enabled) { return; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 59d1d4a..04496e7 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://192.168.0.212:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.8.104:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=root +db.default.password=123456 ### ============================================================================ # dbReal # ============================================================================ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index d677171..25cb46b 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,7 +142,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; -// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322000010001\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":0.0,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20190825233100\"},{\"liquid\":0.0,\"uptime\":\"20190825233600\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20190825234600\"},{\"liquid\":0.0,\"uptime\":\"20190825235100\"},{\"liquid\":0.0,\"uptime\":\"20190825235600\"},{\"liquid\":0.0,\"uptime\":\"20190826000100\"},{\"liquid\":0.0,\"uptime\":\"20190826000600\"},{\"liquid\":0.0,\"uptime\":\"20190826001100\"},{\"liquid\":0.0,\"uptime\":\"20190826001600\"},{\"liquid\":0.0,\"uptime\":\"20190826002100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20190826003100\"}],\"logTime\":\"20190826003335\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index 627c9ec..7578d81 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -18,13 +18,13 @@ TempHumi("温湿度监测仪", 13), Concentrator("数据集中器", 14), Lamphouse("灯箱监测仪", 15), -// Dig("开挖监测仪", 16), + Dig("开挖监测仪", 16), NoiseDig("噪声开挖监测仪", 17), Locator("井盖定位监测仪", 18), Meter("水质监测仪", 19), FLOWGAUGE("流量计", 20), RAINGAUGE("雨量计", 21), - LG("燃气液位监测仪", 22); + LG("燃气智能监测终端(一体化)", 22); // 成员变量 diff --git a/src/main/java/org/well/well/domain/Device.java b/src/main/java/org/well/well/domain/Device.java index d86b6da..8529a1e 100644 --- a/src/main/java/org/well/well/domain/Device.java +++ b/src/main/java/org/well/well/domain/Device.java @@ -62,7 +62,7 @@ * 设备型号（关联型号表） */ @Column(name ="VERSION") - private Integer version; + private Long version; @Column(name ="JOB_GENERATION_TYPE") @@ -134,11 +134,11 @@ this.logtime = logtime; } - public Integer getVersion() { + public Long getVersion() { return version; } - public void setVersion(Integer version) { + public void setVersion(Long version) { this.version = version; } diff --git a/src/main/java/org/well/well/manager/AlarmRuleManager.java b/src/main/java/org/well/well/manager/AlarmRuleManager.java index aa1bf4a..bf6849a 100644 --- a/src/main/java/org/well/well/manager/AlarmRuleManager.java +++ b/src/main/java/org/well/well/manager/AlarmRuleManager.java @@ -79,7 +79,7 @@ ruleStr += (null != alarmRule3 ? (String.valueOf(alarmRule3.getHighValue()) + "^" + String.valueOf(alarmRule.getLowValue())) : ""); } else if (DeviceTypeEnum.Methane.toString().equals(devTypeName)) { - ruleStr += "50,25"; + ruleStr += "2,1"; } else if (DeviceTypeEnum.WasteGas.toString().equals(devTypeName)) { ruleStr += "50,10,2,18:23";//CO,H2S,CH4,O2(18~23) } else if (DeviceTypeEnum.TempHumi.toString().equals(devTypeName)) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 30b22b4..5b53343 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -79,11 +79,14 @@ } } + + + public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = criteria.list(); + List deviceList = (List)criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -108,12 +111,12 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { - sql = "select * from data_gas " + + } else if (devTypeName.equals(DeviceTypeEnum.LG.toString())) { + sql = "select * from data_gasliquid_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.NoiseDig.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Dig.toString())) { sql = "select * from data_dig " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 47ed13e..b79c549 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -72,7 +72,7 @@ //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; - String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 + String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; String isAlarm = "1";//是否开启报警(1为开启) diff --git a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java index bcce2a6..42dc69f 100644 --- a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java +++ b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java @@ -30,8 +30,8 @@ // every 10 seconds @Scheduled(cron = "0 0 5 * * ?") +// @Scheduled(cron = "0 0/5 * * * ?") // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(cron = "0 0/2 * * * ?") public void execute() { if (!enabled) { return; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 59d1d4a..04496e7 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://192.168.0.212:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.8.104:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=root +db.default.password=123456 ### ============================================================================ # dbReal # ============================================================================ diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 59d1d4a..04496e7 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://192.168.0.212:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.8.104:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=root +db.default.password=123456 ### ============================================================================ # dbReal # ============================================================================