diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%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 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 9605d19..3d2ede0 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -67,16 +67,17 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 Device device = deviceManager.getDeviceByDevCode(devCode); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 9605d19..3d2ede0 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -67,16 +67,17 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 Device device = deviceManager.getDeviceByDevCode(devCode); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 2f83956..f59a910 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -67,16 +67,17 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 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; + //2.清离线 + deviceManager.clearOffline(devCode); + //3.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 9605d19..3d2ede0 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -67,16 +67,17 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 Device device = deviceManager.getDeviceByDevCode(devCode); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 2f83956..f59a910 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -67,16 +67,17 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 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; + //2.清离线 + deviceManager.clearOffline(devCode); + //3.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index dd4c107..dee4d13 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -68,7 +68,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.format_sql=false -hibernate.generate_statistics=true +hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 9605d19..3d2ede0 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -67,16 +67,17 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 Device device = deviceManager.getDeviceByDevCode(devCode); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 2f83956..f59a910 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -67,16 +67,17 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 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; + //2.清离线 + deviceManager.clearOffline(devCode); + //3.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index dd4c107..dee4d13 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -68,7 +68,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.format_sql=false -hibernate.generate_statistics=true +hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index b21f99c..ea3b888 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - true - true + false + false diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 9605d19..3d2ede0 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -67,16 +67,17 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 Device device = deviceManager.getDeviceByDevCode(devCode); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 2f83956..f59a910 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -67,16 +67,17 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 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; + //2.清离线 + deviceManager.clearOffline(devCode); + //3.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index dd4c107..dee4d13 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -68,7 +68,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.format_sql=false -hibernate.generate_statistics=true +hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index b21f99c..ea3b888 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - true - true + false + false diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index dd4c107..dee4d13 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -68,7 +68,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.format_sql=false -hibernate.generate_statistics=true +hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 57808e7..11b3357 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -45,7 +45,7 @@ } ac = new ClassPathXmlApplicationContext( new String[]{"classpath:wellSensor/*.xml"}); - batchSize = context.getInteger("batchSize", 100); + batchSize = context.getInteger("batchSize", 1000); } @Override diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 5b53343..57fc816 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -27,7 +27,7 @@ List devices = criteria.list(); if (devices != null && devices.size() > 0) return devices.get(0); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } return null; @@ -54,14 +54,14 @@ public void setOfflineBySevenNoData(String devCode) { Criteria criteria = getSession().createCriteria(Device.class); - criteria.add(Restrictions.eq("devCode", devCode)); - criteria.add(Restrictions.eq("valid", true)); - criteria.add(Restrictions.eq("onlineState", "1")); - List devices = criteria.list(); - for (Device device : devices) { - device.setOnlineState("0"); - device.setLogtime(new Date()); - save(device); + criteria.add(Restrictions.eq("devCode", devCode)); + criteria.add(Restrictions.eq("valid", true)); + criteria.add(Restrictions.eq("onlineState", "1")); + List devices = criteria.list(); + for (Device device : devices) { + device.setOnlineState("0"); + device.setLogtime(new Date()); + save(device); } } @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list==null||list.size() == 0) { + if (list == null || list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -80,13 +80,11 @@ } - - public void updateDeviceStatus() { Criteria criteria = getSession().createCriteria(Device.class); criteria.add(Restrictions.eq("valid", true)); criteria.add(Restrictions.eq("onlineState", "1")); - List deviceList = (List)criteria.list(); + List deviceList = (List) criteria.list(); if (deviceList.size() > 0) { for (Device device : deviceList) { String devTypeName = device.getDeviceType().getTypeName(); @@ -101,7 +99,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; @@ -126,17 +124,17 @@ " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.Meter.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.Meter.toString())) { sql = "select * from data_meter " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.FLOWGAUGE.toString())) { sql = "select * from data_flowmeter " + " where date_format(logtime,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - }else if(devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())){ + } else if (devTypeName.equals(DeviceTypeEnum.RAINGAUGE.toString())) { sql = "select * from data_hyetometer " + " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index c4cf7f9..df8b9a9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -70,18 +70,19 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString()); if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d8fdaf4..9d8f36d 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -74,24 +74,25 @@ String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); //存采集数据 this.saveData(liquidDTO); - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) { continue; } + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //获取报警阈值 String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString()); List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 4017a7a..a301fcb 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -74,17 +74,18 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 +// if(isExist(devCode,upTime)) continue;//去重 + + //1.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, upTime, devCode, busWell == null ? "" : busWell.getWellCode()); this.saveData(liquidDTO);//存采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Liquid.toString());//获取报警阈值 List ruleRankList = new ArrayList(); float rankThresh = 0; @@ -138,7 +139,7 @@ } else {//不存在上一条报警时 if (device == null) return;//未注册设备舍弃 AlarmJob alarmJob = null; - if ("1".equals(isJob)&&"1".equals(device.getJobGenerationType())) { + if ("1".equals(isJob) && "1".equals(device.getJobGenerationType())) { //1.若开启告警，生成新的工单 alarmJob = alarmJobManager.saveData(devCode, busWell != null ? busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), "1"); @@ -198,7 +199,7 @@ } } - public boolean isExist(String devcode,String upTime){ + public boolean isExist(String devcode, String upTime) { Criteria criteria = getSession().createCriteria(Liquid.class); criteria.add(Restrictions.eq("devId", devcode)); @@ -208,6 +209,6 @@ e.printStackTrace(); } List methaneList = criteria.list(); - return methaneList.size()>0?true:false; + return methaneList.size() > 0 ? true : false; } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 9605d19..3d2ede0 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -67,16 +67,17 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 - //4.有无超限处理流程（判断最后一条数据） + //2.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; + //3.清离线 + deviceManager.clearOffline(devCode); + //4.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 Device device = deviceManager.getDeviceByDevCode(devCode); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 2f83956..f59a910 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -67,16 +67,17 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - if(isExist(devCode,upTime)) continue;//去重 +// if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); - //1.清离线 - deviceManager.clearOffline(devCode); - //2.清除设备告警 - alarmRecordManager.clearAlarmByNormalData(devCode, "2"); - //3.存数据 + + //1.存数据 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; + //2.清离线 + deviceManager.clearOffline(devCode); + //3.清除设备告警 + alarmRecordManager.clearAlarmByNormalData(devCode, "2"); String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Dig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); double rankThresh = 0; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index dd4c107..dee4d13 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -68,7 +68,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.format_sql=false -hibernate.generate_statistics=true +hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create diff --git a/src/main/resources/wellSensor/applicationContext-hibernate.xml b/src/main/resources/wellSensor/applicationContext-hibernate.xml index b21f99c..ea3b888 100644 --- a/src/main/resources/wellSensor/applicationContext-hibernate.xml +++ b/src/main/resources/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - true - true + false + false diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index dd4c107..dee4d13 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -68,7 +68,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.format_sql=false -hibernate.generate_statistics=true +hibernate.generate_statistics=false #hibernate.hbm2ddl.auto=create diff --git a/target/classes/wellSensor/applicationContext-hibernate.xml b/target/classes/wellSensor/applicationContext-hibernate.xml index b21f99c..ea3b888 100644 --- a/target/classes/wellSensor/applicationContext-hibernate.xml +++ b/target/classes/wellSensor/applicationContext-hibernate.xml @@ -32,8 +32,8 @@ org.hibernate.dialect.MySQL5Dialect - true - true + false + false