From 7327d661ac9bd72a06f0d9d494df62244acb743c Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 24 Jun 2022 14:55:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E2=80=94=E2=80=94data=E8=A1=A8=E5=A4=84=E7=90=86=E6=88=90day?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/executor/handler/DayJob.java | 133 ++++++++++++++---- .../njcn/executor/handler/LimitRateJob.java | 22 +-- .../njcn/executor/handler/LimitTargetJob.java | 22 +-- .../njcn/executor/handler/PollutionJob.java | 2 +- 4 files changed, 130 insertions(+), 49 deletions(-) diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java index 5e4e13499..ed026ede7 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java @@ -1,6 +1,7 @@ package com.njcn.executor.handler; import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.device.api.LineFeignClient; import com.njcn.executor.pojo.vo.*; import com.njcn.harmonic.constant.Param; import com.njcn.influxdb.utils.InfluxDbUtils; @@ -39,6 +40,8 @@ public class DayJob { private final InfluxDbUtils influxDbUtils; + private final LineFeignClient lineFeignClient; + @XxlJob("dayJobHandler") public void getDayData() throws ParseException { List paramList = new ArrayList<>(); @@ -59,7 +62,8 @@ public class DayJob { endTime = paramList.get(1); lineList = paramList.subList(2,paramList.size()); if (CollectionUtils.isEmpty(lineList)){ - log.info("补招传入的参数有误，未传监测点id"); + log.info("补招传入的参数，未传监测点id"); + lineList = lineFeignClient.getLineList().getData(); } boolean s1 = Pattern.matches(PatternRegex.TIME_FORMAT,startTime); boolean e1 = Pattern.matches(PatternRegex.TIME_FORMAT,endTime); @@ -70,6 +74,8 @@ public class DayJob { startTime = startTime + " 00:00:00"; endTime = endTime + " 23:59:59"; } + } else { + lineList = lineFeignClient.getLineList().getData(); } long diff,diffDays,a,b = 0; Date d1 = format.parse(startTime); @@ -236,11 +242,14 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_v where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataV.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -405,11 +414,14 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_i where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataI.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -510,25 +522,37 @@ public class DayJob { List result = new ArrayList<>(); StringBuilder stringBuilder = lineStringBuilder(lineList); //最小值 - String sql1 = "select min(fluc) AS fluc,min(plt) AS plt,min(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql1 = "select min(fluc) AS fluc,min(plt) AS plt,min(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataFlicker.class); + list1.forEach(item->{ + item.setValueType("MIN"); + }); //最大值 - String sql2 = "select max(fluc) AS fluc,max(plt) AS plt,max(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql2 = "select max(fluc) AS fluc,max(plt) AS plt,max(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataFlicker.class); + list2.forEach(item->{ + item.setValueType("MAX"); + }); //平均值 - String sql3 = "select mean(fluc) AS fluc,mean(plt) AS plt,mean(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql3 = "select mean(fluc) AS fluc,mean(plt) AS plt,mean(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataFlicker.class); + list3.forEach(item->{ + item.setValueType("AVG"); + }); //CP95值 - String sql4 = "select percentile(fluc,95) AS fluc,percentile(plt,95) AS plt,percentile(pst,95) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql4 = "select percentile(fluc,95) AS fluc,percentile(plt,95) AS plt,percentile(pst,95) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataFlicker.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -576,25 +600,37 @@ public class DayJob { List result = new ArrayList<>(); StringBuilder stringBuilder = lineStringBuilder(lineList); //最小值 - String sql1 = "select min(fluc) AS fluc,min(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql1 = "select min(fluc) AS fluc,min(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataFluc.class); + list1.forEach(item->{ + item.setValueType("MIN"); + }); //最大值 - String sql2 = "select max(fluc) AS fluc,max(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql2 = "select max(fluc) AS fluc,max(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataFluc.class); + list2.forEach(item->{ + item.setValueType("MAX"); + }); //平均值 - String sql3 = "select mean(fluc) AS fluc,mean(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql3 = "select mean(fluc) AS fluc,mean(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataFluc.class); + list3.forEach(item->{ + item.setValueType("AVG"); + }); //CP95值 - String sql4 = "select percentile(fluc,95) AS fluc,percentile(fluccf,95) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql4 = "select percentile(fluc,95) AS fluc,percentile(fluccf,95) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataFluc.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -695,11 +731,14 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmphasic_i where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPhasicI.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -847,11 +886,14 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmphasic_v where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPhasicV.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1003,11 +1045,14 @@ public class DayJob { stringBuilder7.append("percentile(p_").append(i).append(",95) AS p_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmpower_p where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerP.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1163,11 +1208,14 @@ public class DayJob { stringBuilder7.append("percentile(q_").append(i).append(",95) AS q_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmpower_q where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerQ.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1320,11 +1368,14 @@ public class DayJob { stringBuilder7.append("percentile(s_").append(i).append(",95) AS s_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmpower_s where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerS.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1473,11 +1524,14 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmrate_i where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmRateI.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1625,11 +1679,14 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_harmrate_v where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmRateV.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1777,11 +1834,14 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_inharm_i where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmI.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -1929,11 +1989,14 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_inharm_v where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmV.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -2082,11 +2145,14 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_inharmrate_i where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmRateI.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -2234,11 +2300,14 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); + stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); String sql4 = "select "+stringBuilder7+" from data_inharmrate_v where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmRateV.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); @@ -2332,25 +2401,37 @@ public class DayJob { List result = new ArrayList<>(); StringBuilder stringBuilder = lineStringBuilder(lineList); //最小值 - String sql1 = "select min(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql1 = "select min(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataPlt.class); + list1.forEach(item->{ + item.setValueType("MIN"); + }); //最大值 - String sql2 = "select max(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql2 = "select max(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataPlt.class); + list2.forEach(item->{ + item.setValueType("MAX"); + }); //平均值 - String sql3 = "select mean(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql3 = "select mean(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataPlt.class); + list3.forEach(item->{ + item.setValueType("AVG"); + }); //CP95值 - String sql4 = "select percentile(plt,95) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' and value_type = 'CP95' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"; + String sql4 = "select percentile(plt,95) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataPlt.class); + list4.forEach(item->{ + item.setValueType("CP95"); + }); result.addAll(list1); result.addAll(list2); result.addAll(list3); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java index 3bbe2e90d..204fbbfb2 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java @@ -956,7 +956,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '1' group by line_id tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); String sql = "SELECT count(freq) AS all_time FROM data_v where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -987,7 +987,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '1' group by line_id tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); String sql = "SELECT count(plt) AS flicker_all_time FROM data_plt where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1018,7 +1018,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_harmrate_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1049,7 +1049,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_i WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1080,7 +1080,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_inharm_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1111,7 +1111,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1143,7 +1143,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1174,7 +1174,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_i WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1205,7 +1205,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1236,7 +1236,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -1267,7 +1267,7 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'MAX' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM data_plt WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java index 3c4abddca..b42be99f0 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java @@ -573,7 +573,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '1' group by line_id tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); String sql = "SELECT count(freq) AS all_time FROM day_v where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -604,7 +604,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '1' group by line_id tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); String sql = "SELECT count(plt) AS flicker_all_time FROM day_plt where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -635,7 +635,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_harmrate_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -666,7 +666,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_i WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -697,7 +697,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_inharm_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -728,7 +728,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -760,7 +760,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -791,7 +791,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_i WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -822,7 +822,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -853,7 +853,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_v WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); @@ -884,7 +884,7 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'MAX' and quality_flag = '1' tz('Asia/Shanghai')"); + stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' tz('Asia/Shanghai')"); String sql = "SELECT * FROM day_plt WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java index 8eb2d9550..006daf56b 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java @@ -116,7 +116,7 @@ public class PollutionJob { //长时电压闪变 Map> map9 = getFlicker(); for (String key : map9.keySet()) { - flickerList.add(map8.get(key).get()); + flickerList.add(map9.get(key).get()); } //组装数据 for (PollutionDTO item1 : pollutionList) { From 79ad3ddd83804b550e4ab7d4a28e115a39e71eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com> Date: Mon, 27 Jun 2022 11:16:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/constant/DeviceValidMessage.java | 2 + .../device/pojo/param/AlarmStrategyParam.java | 38 ++++++++ .../device/pojo/param/DeviceLogParam.java | 18 +++- .../njcn/device/pojo/po/AlarmStrategy.java | 36 ++++++++ .../com/njcn/device/pojo/po/TerminalLogs.java | 33 +++++++ .../njcn/device/pojo/vo/AlarmStrategyVO.java | 60 +++++++++++++ .../com/njcn/device/pojo/vo/DeviceLogVO.java | 5 -- .../njcn/device/pojo/vo/ShowVersionVO.java | 7 +- .../device/controller/AlarmController.java | 89 +++++++++++++++++++ .../controller/LogManageController.java | 6 +- .../controller/ProgramVersionController.java | 15 ++-- .../device/mapper/AlarmStrategyMapper.java | 28 ++++++ .../njcn/device/mapper/LogManageMapper.java | 7 +- .../device/mapper/ProgramVersionMapper.java | 9 +- .../mapper/mapping/AlarmStrategyMapper.xml | 42 +++++++++ .../device/mapper/mapping/LogManageMapper.xml | 50 ++++++----- .../mapper/mapping/ProgramVersionMapper.xml | 13 +-- .../device/service/AlarmStrategyService.java | 33 +++++++ .../njcn/device/service/LogManageService.java | 4 +- .../device/service/ProgramVersionService.java | 5 +- .../impl/AlarmStrategyServiceImpl.java | 73 +++++++++++++++ .../service/impl/LogManageServiceImpl.java | 68 ++++++++++++-- .../impl/ProgramVersionServiceImpl.java | 50 +---------- 23 files changed, 578 insertions(+), 113 deletions(-) create mode 100644 pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/AlarmStrategyParam.java create mode 100644 pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/AlarmStrategy.java create mode 100644 pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/TerminalLogs.java create mode 100644 pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AlarmStrategyVO.java create mode 100644 pqs-device/device-boot/src/main/java/com/njcn/device/controller/AlarmController.java create mode 100644 pqs-device/device-boot/src/main/java/com/njcn/device/mapper/AlarmStrategyMapper.java create mode 100644 pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml create mode 100644 pqs-device/device-boot/src/main/java/com/njcn/device/service/AlarmStrategyService.java create mode 100644 pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AlarmStrategyServiceImpl.java diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/constant/DeviceValidMessage.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/constant/DeviceValidMessage.java index 93a9d924c..208488f46 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/constant/DeviceValidMessage.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/constant/DeviceValidMessage.java @@ -8,6 +8,8 @@ package com.njcn.device.pojo.constant; */ public interface DeviceValidMessage { + String ID_NOT_BLANK = "id不能为空，请检查id参数"; + String PROJECT_NAME_NOT = "项目名称不能为空"; String PROJECT_NAME_RULE = "项目名称违规"; String PROVINCE_NAME_NOT = "省份不可为空"; diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/AlarmStrategyParam.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/AlarmStrategyParam.java new file mode 100644 index 000000000..ab6e0d030 --- /dev/null +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/AlarmStrategyParam.java @@ -0,0 +1,38 @@ +package com.njcn.device.pojo.param; + +import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.device.pojo.constant.DeviceValidMessage; +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 14:54 + */ +@Data +public class AlarmStrategyParam { + + @ApiModelProperty(value = "告警策略Id", required = true) + @NotBlank(message = DeviceValidMessage.ID_NOT_BLANK) + @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR) + private String id; + + @ApiModelProperty(value = "数据完整性标准", required = true) + private Integer integrityValue; + + @ApiModelProperty(value = "在线率标准", required = true) + private Integer onlineValue; + + @ApiModelProperty(value = "离线持续时间", required = true) + private Integer offTimeValue; + + @ApiModelProperty(value = "告警次数", required = true) + private Integer warnValue; + + +} diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/DeviceLogParam.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/DeviceLogParam.java index 965c05206..970365ddc 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/DeviceLogParam.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/DeviceLogParam.java @@ -4,7 +4,9 @@ import com.njcn.common.pojo.constant.PatternRegex; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Range; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; /** @@ -19,7 +21,7 @@ public class DeviceLogParam { /** * 套餐类型 */ - @ApiModelProperty("套餐类型") + @ApiModelProperty("套餐类型,为空表示查询所有") private String type; /** * 开始时间 @@ -33,6 +35,20 @@ public class DeviceLogParam { @ApiModelProperty("结束时间") @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") private String searchEndTime; + /** + * 页码 + */ + @ApiModelProperty("页码") + @NotNull(message = "页码不可为空") + @Range(min = 1,message = "页码必须大于0") + private Integer pageNum; + /** + * 条数 + */ + @ApiModelProperty("条数") + @NotNull(message = "条数不可为空") + @Range(min = 1,message = "条数必须大于0") + private Integer pageSize; } diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/AlarmStrategy.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/AlarmStrategy.java new file mode 100644 index 000000000..25f3f0105 --- /dev/null +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/AlarmStrategy.java @@ -0,0 +1,36 @@ +package com.njcn.device.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 16:43 + */ +@Data +@TableName("pqs_alarm_strategy") +public class AlarmStrategy { + + private static final long serialVersionUID = 1L; + + private String id; + + private Integer integrityValue; + + private Integer onlineValue; + + private Integer offtimeValue; + + private Integer warnValue; + + private String updateBy; + + private LocalDateTime updateTime; + + private Integer state; + + +} diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/TerminalLogs.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/TerminalLogs.java new file mode 100644 index 000000000..4c2d7d245 --- /dev/null +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/TerminalLogs.java @@ -0,0 +1,33 @@ +package com.njcn.device.pojo.po; + +import lombok.Data; +import org.influxdb.annotation.Column; +import org.influxdb.annotation.Measurement; + +import java.time.Instant; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/22 19:03 + */ +@Data +@Measurement(name = "pqs_terminal_logs") +public class TerminalLogs { + + @Column(name = "time") + private Instant timeId; + + @Column(name = "line_id") + private String lineId; + + @Column(name = "terminal_type") + private String terminalType; + + @Column(name = "update_by") + private String updateBy; + + @Column(name = "terminal_describe") + private String terminalDescribe; + +} diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AlarmStrategyVO.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AlarmStrategyVO.java new file mode 100644 index 000000000..2369fa3a5 --- /dev/null +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AlarmStrategyVO.java @@ -0,0 +1,60 @@ +package com.njcn.device.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 11:39 + */ +@Data +public class AlarmStrategyVO implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * id + */ + @ApiModelProperty("id") + private String id; + /** + * 等级 + */ + @ApiModelProperty("等级") + private String name; + /** + * 数据完整性标准 + */ + @ApiModelProperty("数据完整性标准") + private Integer integrityValue; + /** + * 在线率标准 + */ + @ApiModelProperty("在线率标准") + private Integer onlineValue; + /** + * 离线持续时间 + */ + @ApiModelProperty("离线持续时间") + private Integer offTimeValue; + /** + * 告警次数 + */ + @ApiModelProperty("告警次数") + private Integer warnValue; + /** + * 更新日期 + */ + @ApiModelProperty("更新日期") + private LocalDateTime updateTime; + /** + * 更新用户 + */ + @ApiModelProperty("更新用户") + private String updateBy; + + +} diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/DeviceLogVO.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/DeviceLogVO.java index b5f5bb4de..c01929564 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/DeviceLogVO.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/DeviceLogVO.java @@ -14,11 +14,6 @@ import java.io.Serializable; public class DeviceLogVO implements Serializable { private static final long serialVersionUID = 1L; - /** - * id - */ - @ApiModelProperty("id") - private String id; /** * 装置、监测点名称 */ diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/ShowVersionVO.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/ShowVersionVO.java index 6b3f97687..70110bb55 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/ShowVersionVO.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/ShowVersionVO.java @@ -15,9 +15,10 @@ public class ShowVersionVO extends VersionVO { private static final long serialVersionUID = 1L; /** - * 终端版本文件状态（0-不存在 1-存在） + * 终端版本文件 */ - @ApiModelProperty("终端版本文件状态（0-不存在 1-存在）") - private Integer fileFlag; + @ApiModelProperty("终端版本文件") + // private MultipartFile file; + private byte[] file; } diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/AlarmController.java b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/AlarmController.java new file mode 100644 index 000000000..c86caa137 --- /dev/null +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/AlarmController.java @@ -0,0 +1,89 @@ +package com.njcn.device.controller; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pojo.param.AlarmStrategyParam; +import com.njcn.device.pojo.vo.AlarmStrategyVO; +import com.njcn.device.service.AlarmStrategyService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 11:36 + */ +@Validated +@Slf4j +@RestController +@RequestMapping("/Alarm") +@Api(tags = "告警管理") +@AllArgsConstructor +public class AlarmController extends BaseController { + + private final AlarmStrategyService alarmStrategyService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getAlarmStrategyData") + @ApiOperation("告警策略管理") + public HttpResult> getAlarmStrategyData(){ + String methodDescribe = getMethodDescribe("getAlarmStrategyData"); + List list = alarmStrategyService.getAlarmStrategyData(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/updateAlarmStrategyById") + @ApiOperation("修改告警策略") + @ApiImplicitParam(name = "alarmStrategyParam", value = "修改策略参数", required = true) + public HttpResult> updateAlarmStrategyById(@RequestBody AlarmStrategyParam alarmStrategyParam){ + String methodDescribe = getMethodDescribe("getAlarmStrategyData"); + boolean res = alarmStrategyService.updateAlarmStrategyById(alarmStrategyParam); + if (res) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + throw new BusinessException(CommonResponseEnum.FAIL); + } + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/addAlarmStrategyById") + @ApiOperation("新增告警策略") + @ApiImplicitParam(name = "alarmStrategyParam", value = "新增策略参数", required = true) + public HttpResult> addAlarmStrategyById(@RequestBody AlarmStrategyParam alarmStrategyParam){ + String methodDescribe = getMethodDescribe("addAlarmStrategyById"); + boolean res = alarmStrategyService.addAlarmStrategyById(alarmStrategyParam); + if (res) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + throw new BusinessException(CommonResponseEnum.FAIL); + } + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/removeAlarmStrategyData") + @ApiOperation("删除告警策略") + @ApiImplicitParam(name = "id", value = "策略id", required = true) + public HttpResult> removeAlarmStrategyData(@RequestParam("id") String id){ + String methodDescribe = getMethodDescribe("removeAlarmStrategyData"); + boolean res = alarmStrategyService.removeAlarmStrategyData(id); + if (res) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + throw new BusinessException(CommonResponseEnum.FAIL); + } + } + +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LogManageController.java b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LogManageController.java index ab81dabf5..c1a612a6c 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LogManageController.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LogManageController.java @@ -23,8 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @version 1.0.0 * @author: chenchao @@ -44,9 +42,9 @@ public class LogManageController extends BaseController { @PostMapping("/getDeviceLogData") @ApiOperation("终端运维日志") @ApiImplicitParam(name = "deviceLogParam", value = "查询终端日志信息", required = true) - public HttpResult> getDeviceLogData(@RequestBody @Validated DeviceLogParam deviceLogParam){ + public HttpResult> getDeviceLogData(@RequestBody @Validated DeviceLogParam deviceLogParam){ String methodDescribe = getMethodDescribe("getDeviceLogData"); - List list = deviceLogService.getDeviceLogData(deviceLogParam); + Page list = deviceLogService.getDeviceLogData(deviceLogParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/ProgramVersionController.java b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/ProgramVersionController.java index e43ab9700..0c3cdcd8e 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/ProgramVersionController.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/ProgramVersionController.java @@ -7,7 +7,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pojo.vo.ShowVersionVO; import com.njcn.device.pojo.vo.VersionVO; import com.njcn.device.service.ProgramVersionService; import com.njcn.web.controller.BaseController; @@ -70,12 +69,16 @@ public class ProgramVersionController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getProgramVersionById") - @ApiOperation("修改版本回显") + @ApiOperation("版本文件是否存在") @ApiImplicitParam(name = "id", value = "终端版本id", required = true) - public HttpResult getProgramVersionById(@RequestParam("id") String id) { + public HttpResult getProgramVersionById(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("getProgramVersionById"); - ShowVersionVO result = programService.getProgramVersionById(id); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + boolean res = programService.getProgramVersionById(id); + if (res) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + throw new BusinessException(CommonResponseEnum.NO_DATA); + } } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -101,6 +104,7 @@ public class ProgramVersionController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateVersionFlag") @ApiOperation("修改程序版本状态") + @ApiImplicitParam(name = "id", value = "终端版本id", required = true) public HttpResult updateVersionFlag(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("updateVersionFlag"); boolean res = programService.updateVersionFlag(id); @@ -114,6 +118,7 @@ public class ProgramVersionController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/delProgramVersion") @ApiOperation("删除程序版本") + @ApiImplicitParam(name = "id", value = "终端版本id", required = true) public HttpResult delProgramVersion(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("delProgramVersion"); boolean res = programService.delProgramVersion(id); diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/AlarmStrategyMapper.java b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/AlarmStrategyMapper.java new file mode 100644 index 000000000..8b7b4a58c --- /dev/null +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/AlarmStrategyMapper.java @@ -0,0 +1,28 @@ +package com.njcn.device.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pojo.po.AlarmStrategy; +import com.njcn.device.pojo.vo.AlarmStrategyVO; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 13:39 + */ +public interface AlarmStrategyMapper extends BaseMapper { + + /** + * 获取告警策略列表 + */ + List getAlarmStrategyData(); + /** + * 查询告警策略是否已存在 + */ + Integer getAlarmStrategyById(String id); + /** + * 删除告警策略 + */ + void updateAlarmStrategyState(String id); +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LogManageMapper.java b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LogManageMapper.java index 14f5bd58e..1c113206c 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LogManageMapper.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LogManageMapper.java @@ -1,12 +1,9 @@ package com.njcn.device.mapper; -import com.njcn.device.pojo.param.DeviceLogParam; import com.njcn.device.pojo.vo.DeviceLogVO; import com.njcn.device.pojo.vo.EventLogVO; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @version 1.0.0 * @author: chenchao @@ -17,9 +14,9 @@ public interface LogManageMapper { /** * 查询终端日志信息 */ - List getDeviceLogData(@Param("deviceLogParam")DeviceLogParam deviceLogParam); + DeviceLogVO getDeviceLogData(@Param("lineIds") String lineIds,@Param("terminalTypes") String terminalTypes,@Param("updateBys") String updateBys); /** * 查询暂降推送日志信息 */ - EventLogVO getEventLogData(@Param("lineId") String lineId); + EventLogVO getEventLogData(String lineId); } diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/ProgramVersionMapper.java b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/ProgramVersionMapper.java index b282fdeed..aa1b8be37 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/ProgramVersionMapper.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/ProgramVersionMapper.java @@ -1,5 +1,6 @@ package com.njcn.device.mapper; +import com.njcn.device.pojo.vo.ShowVersionVO; import com.njcn.device.pojo.vo.VersionVO; import java.util.List; @@ -15,10 +16,10 @@ public interface ProgramVersionMapper { * 获取终端版本信息，根据装置型号查询 */ List getVersion(String devType); - // /** - // * 修改版本回显 - // */ - // ShowVersionVO getProgramVersionById(String id); + /** + * 根据id获取终端版本信息 + */ + ShowVersionVO getProgramVersionById(String id); /** * 修改程序版本状态 */ diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml new file mode 100644 index 000000000..0ece0c697 --- /dev/null +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/AlarmStrategyMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + UPDATE + pqs_alarm_strategy + SET + State = 0 + WHERE Id = #{id} + + + \ No newline at end of file diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml index fea2dc3f8..68c340125 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LogManageMapper.xml @@ -5,30 +5,38 @@ + + + + + + + + + + + + + + + + + + + + - - - - - + UPDATE diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/AlarmStrategyService.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/AlarmStrategyService.java new file mode 100644 index 000000000..0b9cc0948 --- /dev/null +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/AlarmStrategyService.java @@ -0,0 +1,33 @@ +package com.njcn.device.service; + +import com.njcn.device.pojo.param.AlarmStrategyParam; +import com.njcn.device.pojo.vo.AlarmStrategyVO; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 11:37 + */ +public interface AlarmStrategyService { + + /** + * 获取告警策略列表 + */ + List getAlarmStrategyData(); + + /** + * 修改告警策略 + */ + boolean updateAlarmStrategyById(AlarmStrategyParam alarmStrategyParam); + + /** + * 新增告警策略 + */ + boolean addAlarmStrategyById(AlarmStrategyParam alarmStrategyParam); + /** + * 删除告警策略 + */ + boolean removeAlarmStrategyData(String id); +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/LogManageService.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/LogManageService.java index f40e57caf..a58e893dd 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/LogManageService.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/LogManageService.java @@ -6,8 +6,6 @@ import com.njcn.device.pojo.param.EventLogParam; import com.njcn.device.pojo.vo.DeviceLogVO; import com.njcn.device.pojo.vo.EventLogVO; -import java.util.List; - /** * @version 1.0.0 * @author: chenchao @@ -20,7 +18,7 @@ public interface LogManageService { * @param deviceLogParam * @return */ - List getDeviceLogData(DeviceLogParam deviceLogParam); + Page getDeviceLogData(DeviceLogParam deviceLogParam); /** * 获取暂降推送日志列表 * @param eventLogParam diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/ProgramVersionService.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/ProgramVersionService.java index 757ac4665..ce3d79472 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/ProgramVersionService.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/ProgramVersionService.java @@ -1,7 +1,6 @@ package com.njcn.device.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.device.pojo.vo.ShowVersionVO; import com.njcn.device.pojo.vo.VersionVO; import org.springframework.web.multipart.MultipartFile; @@ -25,10 +24,10 @@ public interface ProgramVersionService { */ boolean addProgramVersion(String name, String protocol, LocalDate date, String devType, String remark, String versionType, MultipartFile file); /** - * 修改版本回显 + * 版本文件是否存在 * @return */ - ShowVersionVO getProgramVersionById(String id); + boolean getProgramVersionById(String id); /** * 修改程序版本管理信息 * @return diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AlarmStrategyServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AlarmStrategyServiceImpl.java new file mode 100644 index 000000000..64f0c22eb --- /dev/null +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AlarmStrategyServiceImpl.java @@ -0,0 +1,73 @@ +package com.njcn.device.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.mapper.AlarmStrategyMapper; +import com.njcn.device.pojo.param.AlarmStrategyParam; +import com.njcn.device.pojo.po.AlarmStrategy; +import com.njcn.device.pojo.vo.AlarmStrategyVO; +import com.njcn.device.service.AlarmStrategyService; +import com.njcn.web.utils.RequestUtil; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @version 1.0.0 + * @author: chenchao + * @date: 2022/06/23 13:24 + */ +@Service +@AllArgsConstructor +public class AlarmStrategyServiceImpl extends ServiceImpl implements AlarmStrategyService { + + private final AlarmStrategyMapper alarmStrategyMapper; + + @Override + public List getAlarmStrategyData() { + List alarmStrategyVOS = alarmStrategyMapper.getAlarmStrategyData(); + return alarmStrategyVOS; + } + + @Override + public boolean updateAlarmStrategyById(AlarmStrategyParam alarmStrategyParam) { + AlarmStrategy alarmStrategy = new AlarmStrategy(); + alarmStrategy.setId(alarmStrategyParam.getId()); + alarmStrategy.setIntegrityValue(alarmStrategyParam.getIntegrityValue()); + alarmStrategy.setOnlineValue(alarmStrategyParam.getOnlineValue()); + alarmStrategy.setOfftimeValue(alarmStrategyParam.getOffTimeValue()); + alarmStrategy.setWarnValue(alarmStrategyParam.getWarnValue()); + alarmStrategy.setUpdateBy(RequestUtil.getUserIndex()); + alarmStrategy.setUpdateTime(LocalDateTime.now()); + alarmStrategyMapper.updateById(alarmStrategy); + return true; + } + + @Override + public boolean addAlarmStrategyById(AlarmStrategyParam alarmStrategyParam) { + Integer result = alarmStrategyMapper.getAlarmStrategyById(alarmStrategyParam.getId()); + if (result==0) { + AlarmStrategy alarmStrategy = new AlarmStrategy(); + alarmStrategy.setId(alarmStrategyParam.getId()); + alarmStrategy.setIntegrityValue(alarmStrategyParam.getIntegrityValue()); + alarmStrategy.setOnlineValue(alarmStrategyParam.getOnlineValue()); + alarmStrategy.setOfftimeValue(alarmStrategyParam.getOffTimeValue()); + alarmStrategy.setWarnValue(alarmStrategyParam.getWarnValue()); + alarmStrategy.setUpdateBy(RequestUtil.getUserIndex()); + alarmStrategy.setUpdateTime(LocalDateTime.now()); + alarmStrategy.setState(1); + alarmStrategyMapper.insert(alarmStrategy); + return true; + } else { + return false; + } + } + + @Override + public boolean removeAlarmStrategyData(String id) { + alarmStrategyMapper.updateAlarmStrategyState(id); + return true; + } + +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java index 98c60347c..097c365bf 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java @@ -1,11 +1,13 @@ package com.njcn.device.service.impl; +import com.alibaba.nacos.shaded.com.google.common.collect.Lists; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.mapper.LogManageMapper; import com.njcn.device.pojo.constant.DeviceValidMessage; import com.njcn.device.pojo.param.DeviceLogParam; import com.njcn.device.pojo.param.EventLogParam; import com.njcn.device.pojo.po.EventPushLogs; +import com.njcn.device.pojo.po.TerminalLogs; import com.njcn.device.pojo.vo.DeviceLogVO; import com.njcn.device.pojo.vo.EventLogVO; import com.njcn.device.service.LogManageService; @@ -42,14 +44,38 @@ public class LogManageServiceImpl implements LogManageService { private final InfluxDbUtils influxDbUtils; @Override - public List getDeviceLogData(DeviceLogParam deviceLogParam) { - if (deviceLogParam.getType().isEmpty()) { - deviceLogParam.setType(null); + public Page getDeviceLogData(DeviceLogParam deviceLogParam) { + Page page = new Page<>(); + page.setSize(deviceLogParam.getPageSize()); + page.setCurrent(deviceLogParam.getPageNum()); + + List logData = new ArrayList<>(); + List terminalLogs = getTerminalLogs(deviceLogParam.getSearchBeginTime(), deviceLogParam.getSearchEndTime(), deviceLogParam.getType()); + //待分页数据总量 + page.setTotal(terminalLogs.size()); + //分页总页数 + int pages = (int)Math.ceil(terminalLogs.size()*1.0/deviceLogParam.getPageSize()); + page.setPages(pages); + + if (!CollectionUtils.isEmpty(terminalLogs)) { + List> partition = Lists.partition(terminalLogs, deviceLogParam.getPageSize()); + List pageLogs = partition.get(deviceLogParam.getPageNum() - 1); + + if (!CollectionUtils.isEmpty(pageLogs)) { + for (TerminalLogs logs: pageLogs) { + DeviceLogVO deviceLogVO = logManageMapper.getDeviceLogData(logs.getLineId(), logs.getTerminalType(), logs.getUpdateBy()); + LocalDateTime localDateTime = LocalDateTime.ofInstant(logs.getTimeId(), ZoneId.systemDefault()); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); + String time = dateTimeFormatter.format(localDateTime); + deviceLogVO.setUpdateTime(time); + deviceLogVO.setRemark(logs.getTerminalDescribe()); + logData.add(deviceLogVO); + } + //当前页数据 + page.setRecords(logData); + } } - deviceLogParam.setSearchBeginTime(deviceLogParam.getSearchBeginTime()+" 00:00:00"); - deviceLogParam.setSearchEndTime(deviceLogParam.getSearchEndTime()+" 23:59:59"); - List logData = logManageMapper.getDeviceLogData(deviceLogParam); - return logData; + return page; } @@ -115,6 +141,32 @@ public class LogManageServiceImpl implements LogManageService { return page; } + /** + * influxDB查询终端运维日志相关信息 + * @param startTime + * @param endTime + * @param type + */ + private List getTerminalLogs(String startTime, String endTime, String type) { + List terminalLogs; + //组装sql语句 + StringBuilder string = new StringBuilder(); + string.append(DeviceValidMessage.TIME + " >= '" + startTime + DeviceValidMessage.START_TIME + "' and " + DeviceValidMessage.TIME + " <= '" + endTime + DeviceValidMessage.END_TIME + "'"); + if (!type.isEmpty()) { + string.append(" and terminal_type = '" + type +"'").append(" tz('Asia/Shanghai')"); + } + //sql语句 + String sql = "SELECT * FROM pqs_terminal_logs WHERE " + string; + System.out.println("sql==========="+sql); + //结果集 + QueryResult results = influxDbUtils.query(sql); + //结果集映射到对象中 + InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + terminalLogs = resultMapper.toPOJO(results, TerminalLogs.class); + + return terminalLogs; + } + /** * influxDB查询暂降事件相关信息 * @param startTime @@ -127,7 +179,7 @@ public class LogManageServiceImpl implements LogManageService { StringBuilder string = new StringBuilder(); string.append(DeviceValidMessage.TIME + " >= '" + startTime + DeviceValidMessage.START_TIME + "' and " + DeviceValidMessage.TIME + " <= '" + endTime + DeviceValidMessage.END_TIME + "'"); if (result==1 || result==2) { - string.append(" and result=" + result); + string.append(" and result=" + result).append(" tz('Asia/Shanghai')"); } //sql语句 String sql = "SELECT * FROM pqs_event_push_logs WHERE " + string; diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java index e80e9ea1a..c963a7e37 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** * @version 1.0.0 @@ -99,14 +100,11 @@ public class ProgramVersionServiceImpl extends ServiceImpl Date: Mon, 27 Jun 2022 14:15:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9EinfluxDB=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=AD=97=E6=AE=B5=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../influxdb/param/InfluxDBPublicParam.java | 212 +++++++++++ .../com/njcn/executor/handler/DayJob.java | 332 +++++++++--------- .../njcn/executor/handler/LimitRateJob.java | 54 ++- .../njcn/executor/handler/LimitTargetJob.java | 54 ++- 4 files changed, 429 insertions(+), 223 deletions(-) create mode 100644 pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java new file mode 100644 index 000000000..ae4f9c963 --- /dev/null +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java @@ -0,0 +1,212 @@ +package com.njcn.influxdb.param; + +/** + * 类的介绍：使用influxDB查询时的公共参数 + * + * @author xuyang + * @version 1.0.0 + * @createTime 2022/6/24 15:02 + */ +public interface InfluxDBPublicParam { + + /** + * influxDB数据库名称 + */ + String DATABASE = "pqsbase"; + + /** + * 暂态事件汇总表 + */ + String PQS_EVENT_DETAIL = "pqs_eventdetail"; + + /** + * 电压波动闪变表 + */ + String DATA_FLICKER = "data_flicker"; + + /** + * 电压波动表 + */ + String DATA_FLUC = "data_fluc"; + + /** + * 谐波电流角度表 + */ + String DATA_HARM_PHASIC_I = "data_harmphasic_i"; + + /** + * 谐波电压角度表 + */ + String DATA_HARM_PHASIC_V = "data_harmphasic_v"; + + /** + * 有功功率表 + */ + String DATA_HARM_POWER_P = "data_harmpower_p"; + + /** + * 无功功率表 + */ + String DATA_HARM_POWER_Q = "data_harmpower_q"; + + /** + * 视在功率表 + */ + String DATA_HARM_POWER_S = "data_harmpower_s"; + + /** + * 谐波电流含有率表 + */ + String DATA_HARM_RATE_I = "data_harmrate_i"; + + /** + * 谐波电压含有率表 + */ + String DATA_HARM_RATE_V = "data_harmrate_v"; + + /** + * 电流表 + */ + String DATA_I = "data_i"; + + /** + * 电流间谐波幅值表 + */ + String DATA_IN_HARM_I = "data_inharm_i"; + + /** + * 电压间谐波幅值表 + */ + String DATA_IN_HARM_V = "data_inharm_v"; + + /** + * 长时闪变表 + */ + String DATA_PLT = "data_plt"; + + /** + * 电压表 + */ + String DATA_V = "data_v"; + + /** + * 日统计-电压波动闪变表 + */ + String DAY_FLICKER = "day_flicker"; + + /** + * 日统计-电压波动表 + */ + String DAY_FLUC = "day_fluc"; + + /** + * 日统计-谐波电流角度表 + */ + String DAY_HARM_PHASIC_I = "day_harmphasic_i"; + + /** + * 日统计-谐波电压角度表 + */ + String DAY_HARM_PHASIC_V = "day_harmphasic_v"; + + /** + * 日统计-有功功率表 + */ + String DAY_HARM_POWER_P = "day_harmpower_p"; + + /** + * 日统计-无功功率表 + */ + String DAY_HARM_POWER_Q = "day_harmpower_q"; + + /** + * 日统计-视在功率表 + */ + String DAY_HARM_POWER_S = "day_harmpower_s"; + + /** + * 日统计-谐波电流含有率表 + */ + String DAY_HARM_RATE_I = "day_harmrate_i"; + + /** + * 日统计-谐波电压含有率表 + */ + String DAY_HARM_RATE_V = "day_harmrate_v"; + + /** + * 日统计-电流表 + */ + String DAY_I = "day_i"; + + /** + * 日统计-电流间谐波幅值表 + */ + String DAY_IN_HARM_I = "day_inharm_i"; + + /** + * 日统计-电压间谐波幅值表 + */ + String DAY_IN_HARM_V = "day_inharm_v"; + + /** + * 日统计-长时闪变表 + */ + String DAY_PLT = "day_plt"; + + /** + * 日统计-电压表 + */ + String DAY_V = "day_v"; + + /** + * 时区 + */ + String TIME_ZONE = "tz('Asia/Shanghai')"; + + /** + * 日起始时间 + */ + String START_TIME = " 00:00:00"; + + /** + * 日结束时间 + */ + String END_TIME = " 23:59:59"; + + /** + * 时间 + */ + String TIME = "time"; + + /** + * 数据线路号 + */ + String LINE_ID = "line_id"; + + /** + * 数据类型 + */ + String PHASIC_TYPE = "phasic_type"; + + /** + * 指标类型 + */ + String VALUE_TYPE = "value_type"; + + /** + * 数据质量标志 + */ + String QUALITY_FLAG = "quality_flag"; + + /** + * limit_rate + */ + String LIMIT_RATE = "limit_rate"; + + /** + * limit_target + */ + String LIMIT_TARGET = "limit_target"; + +} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java index ed026ede7..e73e69ebe 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java @@ -3,7 +3,7 @@ package com.njcn.executor.handler; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.device.api.LineFeignClient; import com.njcn.executor.pojo.vo.*; -import com.njcn.harmonic.constant.Param; +import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; @@ -36,8 +36,6 @@ import java.util.regex.Pattern; @AllArgsConstructor public class DayJob { - private final String DATABASE = "pqsbase"; - private final InfluxDbUtils influxDbUtils; private final LineFeignClient lineFeignClient; @@ -194,8 +192,8 @@ public class DayJob { stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_v where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataV.class); @@ -210,8 +208,8 @@ public class DayJob { stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_v where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataV.class); @@ -226,8 +224,8 @@ public class DayJob { stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_v where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataV.class); @@ -242,8 +240,8 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_v where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_V+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataV.class); @@ -334,12 +332,12 @@ public class DayJob { fields.put("v_48",item.getV48()); fields.put("v_49",item.getV49()); fields.put("v_50",item.getV50()); - Point point = influxDbUtils.pointBuilder("day_v", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_V, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } @@ -366,8 +364,8 @@ public class DayJob { stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_i where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataI.class); @@ -382,8 +380,8 @@ public class DayJob { stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_i where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataI.class); @@ -398,8 +396,8 @@ public class DayJob { stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_i where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataI.class); @@ -414,8 +412,8 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_i where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_I+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataI.class); @@ -501,12 +499,12 @@ public class DayJob { fields.put("i_48",item.getI48()); fields.put("i_49",item.getI49()); fields.put("i_50",item.getI50()); - Point point = influxDbUtils.pointBuilder("day_i", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_I, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } @@ -522,7 +520,7 @@ public class DayJob { List result = new ArrayList<>(); StringBuilder stringBuilder = lineStringBuilder(lineList); //最小值 - String sql1 = "select min(fluc) AS fluc,min(plt) AS plt,min(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql1 = "select min(fluc) AS fluc,min(plt) AS plt,min(pst) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataFlicker.class); @@ -530,7 +528,7 @@ public class DayJob { item.setValueType("MIN"); }); //最大值 - String sql2 = "select max(fluc) AS fluc,max(plt) AS plt,max(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql2 = "select max(fluc) AS fluc,max(plt) AS plt,max(pst) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataFlicker.class); @@ -538,7 +536,7 @@ public class DayJob { item.setValueType("MAX"); }); //平均值 - String sql3 = "select mean(fluc) AS fluc,mean(plt) AS plt,mean(pst) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql3 = "select mean(fluc) AS fluc,mean(plt) AS plt,mean(pst) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataFlicker.class); @@ -546,7 +544,7 @@ public class DayJob { item.setValueType("AVG"); }); //CP95值 - String sql4 = "select percentile(fluc,95) AS fluc,percentile(plt,95) AS plt,percentile(pst,95) AS pst from data_flicker where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql4 = "select percentile(fluc,95) AS fluc,percentile(plt,95) AS plt,percentile(pst,95) AS pst from "+ InfluxDBPublicParam.DATA_FLICKER+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE;; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataFlicker.class); @@ -579,12 +577,12 @@ public class DayJob { fields.put("fluc",item.getFluc()); fields.put("plt",item.getPlt()); fields.put("pst",item.getPst()); - Point point = influxDbUtils.pointBuilder("day_flicker", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_FLICKER, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } @@ -600,7 +598,7 @@ public class DayJob { List result = new ArrayList<>(); StringBuilder stringBuilder = lineStringBuilder(lineList); //最小值 - String sql1 = "select min(fluc) AS fluc,min(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql1 = "select min(fluc) AS fluc,min(fluccf) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataFluc.class); @@ -608,7 +606,7 @@ public class DayJob { item.setValueType("MIN"); }); //最大值 - String sql2 = "select max(fluc) AS fluc,max(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql2 = "select max(fluc) AS fluc,max(fluccf) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataFluc.class); @@ -616,7 +614,7 @@ public class DayJob { item.setValueType("MAX"); }); //平均值 - String sql3 = "select mean(fluc) AS fluc,mean(fluccf) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql3 = "select mean(fluc) AS fluc,mean(fluccf) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataFluc.class); @@ -624,7 +622,7 @@ public class DayJob { item.setValueType("AVG"); }); //CP95值 - String sql4 = "select percentile(fluc,95) AS fluc,percentile(fluccf,95) AS fluccf from data_fluc where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql4 = "select percentile(fluc,95) AS fluc,percentile(fluccf,95) AS fluccf from "+ InfluxDBPublicParam.DATA_FLUC+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataFluc.class); @@ -656,12 +654,12 @@ public class DayJob { tags.put("value_type",item.getValueType()); fields.put("fluc",item.getFluc()); fields.put("fluccf",item.getFluccf()); - Point point = influxDbUtils.pointBuilder("day_fluc", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_FLUC, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } @@ -686,8 +684,8 @@ public class DayJob { stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmphasic_i where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPhasicI.class); @@ -701,8 +699,8 @@ public class DayJob { stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmphasic_i where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPhasicI.class); @@ -716,8 +714,8 @@ public class DayJob { stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmphasic_i where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPhasicI.class); @@ -731,8 +729,8 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmphasic_i where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_I+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPhasicI.class); @@ -812,12 +810,12 @@ public class DayJob { fields.put("i_48",item.getI48()); fields.put("i_49",item.getI49()); fields.put("i_50",item.getI50()); - Point point = influxDbUtils.pointBuilder("day_harmphasic_i", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_PHASIC_I, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -841,8 +839,8 @@ public class DayJob { stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmphasic_v where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPhasicV.class); @@ -856,8 +854,8 @@ public class DayJob { stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmphasic_v where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPhasicV.class); @@ -871,8 +869,8 @@ public class DayJob { stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmphasic_v where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPhasicV.class); @@ -886,8 +884,8 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmphasic_v where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_PHASIC_V+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPhasicV.class); @@ -967,12 +965,12 @@ public class DayJob { fields.put("v_48",item.getV48()); fields.put("v_49",item.getV49()); fields.put("v_50",item.getV50()); - Point point = influxDbUtils.pointBuilder("day_harmphasic_v", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_PHASIC_V, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -997,8 +995,8 @@ public class DayJob { stringBuilder1.append("min(p_").append(i).append(") AS p_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmpower_p where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPowerP.class); @@ -1013,8 +1011,8 @@ public class DayJob { stringBuilder3.append("max(p_").append(i).append(") AS p_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmpower_p where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPowerP.class); @@ -1029,8 +1027,8 @@ public class DayJob { stringBuilder5.append("mean(p_").append(i).append(") AS p_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmpower_p where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPowerP.class); @@ -1045,8 +1043,8 @@ public class DayJob { stringBuilder7.append("percentile(p_").append(i).append(",95) AS p_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmpower_p where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_P+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerP.class); @@ -1129,12 +1127,12 @@ public class DayJob { fields.put("p_48",item.getP48()); fields.put("p_49",item.getP49()); fields.put("p_50",item.getP50()); - Point point = influxDbUtils.pointBuilder("day_harmpower_p", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_POWER_P, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } @@ -1160,8 +1158,8 @@ public class DayJob { stringBuilder1.append("min(q_").append(i).append(") AS q_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmpower_q where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPowerQ.class); @@ -1176,8 +1174,8 @@ public class DayJob { stringBuilder3.append("max(q_").append(i).append(") AS q_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmpower_q where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPowerQ.class); @@ -1192,8 +1190,8 @@ public class DayJob { stringBuilder5.append("mean(q_").append(i).append(") AS q_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmpower_q where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPowerQ.class); @@ -1208,8 +1206,8 @@ public class DayJob { stringBuilder7.append("percentile(q_").append(i).append(",95) AS q_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmpower_q where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_Q+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerQ.class); @@ -1290,12 +1288,12 @@ public class DayJob { fields.put("q_48",item.getQ48()); fields.put("q_49",item.getQ49()); fields.put("q_50",item.getQ50()); - Point point = influxDbUtils.pointBuilder("day_harmpower_q", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_POWER_Q, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -1320,8 +1318,8 @@ public class DayJob { stringBuilder1.append("min(s_").append(i).append(") AS s_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmpower_s where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmPowerS.class); @@ -1336,8 +1334,8 @@ public class DayJob { stringBuilder3.append("max(s_").append(i).append(") AS s_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmpower_s where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmPowerS.class); @@ -1352,8 +1350,8 @@ public class DayJob { stringBuilder5.append("mean(s_").append(i).append(") AS s_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmpower_s where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmPowerS.class); @@ -1368,8 +1366,8 @@ public class DayJob { stringBuilder7.append("percentile(s_").append(i).append(",95) AS s_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmpower_s where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_POWER_S+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmPowerS.class); @@ -1450,12 +1448,12 @@ public class DayJob { fields.put("s_48",item.getS48()); fields.put("s_49",item.getS49()); fields.put("s_50",item.getS50()); - Point point = influxDbUtils.pointBuilder("day_harmpower_s", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_POWER_S, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -1479,8 +1477,8 @@ public class DayJob { stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmrate_i where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmRateI.class); @@ -1494,8 +1492,8 @@ public class DayJob { stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmrate_i where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmRateI.class); @@ -1509,8 +1507,8 @@ public class DayJob { stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmrate_i where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmRateI.class); @@ -1524,8 +1522,8 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmrate_i where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_I+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmRateI.class); @@ -1605,12 +1603,12 @@ public class DayJob { fields.put("i_48",item.getI48()); fields.put("i_49",item.getI49()); fields.put("i_50",item.getI50()); - Point point = influxDbUtils.pointBuilder("day_harmrate_i", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_RATE_I, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -1634,8 +1632,8 @@ public class DayJob { stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_harmrate_v where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataHarmRateV.class); @@ -1649,8 +1647,8 @@ public class DayJob { stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_harmrate_v where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataHarmRateV.class); @@ -1664,8 +1662,8 @@ public class DayJob { stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_harmrate_v where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataHarmRateV.class); @@ -1679,8 +1677,8 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_harmrate_v where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataHarmRateV.class); @@ -1760,12 +1758,12 @@ public class DayJob { fields.put("v_48",item.getV48()); fields.put("v_49",item.getV49()); fields.put("v_50",item.getV50()); - Point point = influxDbUtils.pointBuilder("day_harmrate_v", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_HARM_RATE_V, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -1789,8 +1787,8 @@ public class DayJob { stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_inharm_i where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmI.class); @@ -1804,8 +1802,8 @@ public class DayJob { stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_inharm_i where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmI.class); @@ -1819,8 +1817,8 @@ public class DayJob { stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_inharm_i where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmI.class); @@ -1834,8 +1832,8 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_inharm_i where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmI.class); @@ -1915,12 +1913,12 @@ public class DayJob { fields.put("i_48",item.getI48()); fields.put("i_49",item.getI49()); fields.put("i_50",item.getI50()); - Point point = influxDbUtils.pointBuilder("day_inharm_i", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_IN_HARM_I, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -1944,8 +1942,8 @@ public class DayJob { stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_inharm_v where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmV.class); @@ -1959,8 +1957,8 @@ public class DayJob { stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_inharm_v where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmV.class); @@ -1974,8 +1972,8 @@ public class DayJob { stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_inharm_v where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmV.class); @@ -1989,8 +1987,8 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_inharm_v where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmV.class); @@ -2070,12 +2068,12 @@ public class DayJob { fields.put("v_48",item.getV48()); fields.put("v_49",item.getV49()); fields.put("v_50",item.getV50()); - Point point = influxDbUtils.pointBuilder("day_inharm_v", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_IN_HARM_V, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } @@ -2100,8 +2098,8 @@ public class DayJob { stringBuilder1.append("min(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_inharmrate_i where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmRateI.class); @@ -2115,8 +2113,8 @@ public class DayJob { stringBuilder3.append("max(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_inharmrate_i where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmRateI.class); @@ -2130,8 +2128,8 @@ public class DayJob { stringBuilder5.append("mean(i_").append(i).append(") AS i_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_inharmrate_i where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmRateI.class); @@ -2145,8 +2143,8 @@ public class DayJob { stringBuilder7.append("percentile(i_").append(i).append(",95) AS i_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_inharmrate_i where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_I+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmRateI.class); @@ -2226,12 +2224,12 @@ public class DayJob { fields.put("i_48",item.getI48()); fields.put("i_49",item.getI49()); fields.put("i_50",item.getI50()); - Point point = influxDbUtils.pointBuilder("day_inharmrate_i", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_IN_HARM_I, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -2255,8 +2253,8 @@ public class DayJob { stringBuilder1.append("min(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder2.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql1 = "select "+stringBuilder1+" from data_inharmrate_v where "+stringBuilder+stringBuilder2; + stringBuilder2.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MIN' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql1 = "select "+stringBuilder1+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder2; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataInHarmRateV.class); @@ -2270,8 +2268,8 @@ public class DayJob { stringBuilder3.append("max(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder4.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql2 = "select "+stringBuilder3+" from data_inharmrate_v where "+stringBuilder+stringBuilder4; + stringBuilder4.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'MAX' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql2 = "select "+stringBuilder3+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder4; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataInHarmRateV.class); @@ -2285,8 +2283,8 @@ public class DayJob { stringBuilder5.append("mean(v_").append(i).append(") AS v_").append(i).append(","); } } - stringBuilder6.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql3 = "select "+stringBuilder5+" from data_inharmrate_v where "+stringBuilder+stringBuilder6; + stringBuilder6.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql3 = "select "+stringBuilder5+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder6; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3 = new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataInHarmRateV.class); @@ -2300,8 +2298,8 @@ public class DayJob { stringBuilder7.append("percentile(v_").append(i).append(",95) AS v_").append(i).append(","); } } - stringBuilder8.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag tz('Asia/Shanghai')"); - String sql4 = "select "+stringBuilder7+" from data_inharmrate_v where "+stringBuilder+stringBuilder8; + stringBuilder8.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and value_type = 'AVG' group by line_id,phasic_type,value_type,quality_flag ").append(InfluxDBPublicParam.TIME_ZONE); + String sql4 = "select "+stringBuilder7+" from "+ InfluxDBPublicParam.DATA_IN_HARM_V+" where "+stringBuilder+stringBuilder8; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4 = new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataInHarmRateV.class); @@ -2381,12 +2379,12 @@ public class DayJob { fields.put("v_48",item.getV48()); fields.put("v_49",item.getV49()); fields.put("v_50",item.getV50()); - Point point = influxDbUtils.pointBuilder("day_inharmrate_v", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DATA_IN_HARM_V, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } /** @@ -2401,7 +2399,7 @@ public class DayJob { List result = new ArrayList<>(); StringBuilder stringBuilder = lineStringBuilder(lineList); //最小值 - String sql1 = "select min(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql1 = "select min(plt) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult1 = influxDbUtils.query(sql1); InfluxDBResultMapper resultMapper1 = new InfluxDBResultMapper(); List list1 = resultMapper1.toPOJO(sqlResult1, DataPlt.class); @@ -2409,7 +2407,7 @@ public class DayJob { item.setValueType("MIN"); }); //最大值 - String sql2 = "select max(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql2 = "select max(plt) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult2 = influxDbUtils.query(sql2); InfluxDBResultMapper resultMapper2 = new InfluxDBResultMapper(); List list2 = resultMapper2.toPOJO(sqlResult2, DataPlt.class); @@ -2417,7 +2415,7 @@ public class DayJob { item.setValueType("MAX"); }); //平均值 - String sql3 = "select mean(plt) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql3 = "select mean(plt) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult3 = influxDbUtils.query(sql3); InfluxDBResultMapper resultMapper3= new InfluxDBResultMapper(); List list3 = resultMapper3.toPOJO(sqlResult3, DataPlt.class); @@ -2425,7 +2423,7 @@ public class DayJob { item.setValueType("AVG"); }); //CP95值 - String sql4 = "select percentile(plt,95) AS plt from data_plt where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag tz('Asia/Shanghai')"; + String sql4 = "select percentile(plt,95) AS plt from "+ InfluxDBPublicParam.DATA_PLT+" where "+stringBuilder+" time >= '" + startTime + "' and time <= '" + endTime + "' group by line_id,phasic_type,quality_flag "+ InfluxDBPublicParam.TIME_ZONE; QueryResult sqlResult4 = influxDbUtils.query(sql4); InfluxDBResultMapper resultMapper4= new InfluxDBResultMapper(); List list4 = resultMapper4.toPOJO(sqlResult4, DataPlt.class); @@ -2456,12 +2454,12 @@ public class DayJob { tags.put("quality_flag",item.getQualityFlag()); tags.put("value_type",item.getValueType()); fields.put("plt",item.getPlt()); - Point point = influxDbUtils.pointBuilder("day_plt", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhaseType()).tag("quality_flag",item.getQualityFlag()).tag("value_type",item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.DAY_PLT, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhaseType()).tag(InfluxDBPublicParam.QUALITY_FLAG,item.getQualityFlag()).tag(InfluxDBPublicParam.VALUE_TYPE,item.getValueType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } public StringBuilder lineStringBuilder(List list) { diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java index 204fbbfb2..5aa4052a0 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java @@ -5,7 +5,7 @@ import com.njcn.device.api.LineFeignClient; import com.njcn.device.pojo.dto.PollutionParamDTO; import com.njcn.device.pojo.po.Overlimit; import com.njcn.executor.pojo.vo.*; -import com.njcn.harmonic.constant.Param; +import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; @@ -40,8 +40,6 @@ import java.util.stream.Collectors; @AllArgsConstructor public class LimitRateJob { - private final String DATABASE = "pqsbase"; - private final InfluxDbUtils influxDbUtils; private final LineFeignClient lineFeignClient; @@ -956,8 +954,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); - String sql = "SELECT count(freq) AS all_time FROM data_v where " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' group by line_id ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT count(freq) AS all_time FROM "+ InfluxDBPublicParam.DATA_V+" where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataV.class); @@ -987,8 +985,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); - String sql = "SELECT count(plt) AS flicker_all_time FROM data_plt where " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and quality_flag = '0' group by line_id ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT count(plt) AS flicker_all_time FROM "+ InfluxDBPublicParam.DATA_PLT+" where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataPlt.class); @@ -1018,8 +1016,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_harmrate_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_HARM_RATE_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataHarmRateV.class); @@ -1049,8 +1047,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_i WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_I+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataI.class); @@ -1080,8 +1078,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_inharm_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_IN_HARM_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataInHarmV.class); @@ -1111,8 +1109,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataV.class); @@ -1143,8 +1141,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataV.class); @@ -1174,8 +1172,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_i WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_I+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataI.class); @@ -1205,8 +1203,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataV.class); @@ -1236,8 +1234,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataV.class); @@ -1267,8 +1265,8 @@ public class LimitRateJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM data_plt WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_PLT+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DataPlt.class); @@ -1357,11 +1355,11 @@ public class LimitRateJob { fields.put("inuharm_14_overtime",item.getInuHarm14OverTime()); fields.put("inuharm_15_overtime",item.getInuHarm15OverTime()); fields.put("inuharm_16_overtime",item.getInuHarm16OverTime()); - Point point = influxDbUtils.pointBuilder("limit_rate", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhasicType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.LIMIT_RATE, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhasicType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java index b42be99f0..bbd5e401d 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java @@ -5,8 +5,8 @@ import com.njcn.device.api.LineFeignClient; import com.njcn.device.pojo.dto.PollutionParamDTO; import com.njcn.device.pojo.po.Overlimit; import com.njcn.executor.pojo.vo.*; -import com.njcn.harmonic.constant.Param; import com.njcn.harmonic.pojo.po.LimitTarget; +import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; @@ -40,8 +40,6 @@ import java.util.stream.Collectors; @AllArgsConstructor public class LimitTargetJob { - private final String DATABASE = "pqsbase"; - private final InfluxDbUtils influxDbUtils; private final LineFeignClient lineFeignClient; @@ -573,8 +571,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); - String sql = "SELECT count(freq) AS all_time FROM day_v where " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and value_type = 'AVG' and quality_flag = '0' group by line_id ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT count(freq) AS all_time FROM "+ InfluxDBPublicParam.DAY_V+" where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayV.class); @@ -604,8 +602,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and quality_flag = '0' group by line_id tz('Asia/Shanghai')"); - String sql = "SELECT count(plt) AS flicker_all_time FROM day_plt where " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'A' and quality_flag = '0' group by line_id ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT count(plt) AS flicker_all_time FROM "+ InfluxDBPublicParam.DAY_PLT+" where " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayPlt.class); @@ -635,8 +633,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_harmrate_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_HARM_RATE_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayHarmrateV.class); @@ -666,8 +664,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_i WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_I+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayI.class); @@ -697,8 +695,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_inharm_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DATA_IN_HARM_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayInharmV.class); @@ -728,8 +726,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayV.class); @@ -760,8 +758,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayV.class); @@ -791,8 +789,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_i WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_I+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayI.class); @@ -822,8 +820,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayV.class); @@ -853,8 +851,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_v WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_V+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayV.class); @@ -884,8 +882,8 @@ public class LimitTargetJob { stringBuilder.append("line_id='").append(line.get(i)).append("') and "); } } - stringBuilder.append(Param.TIME + " >= '").append(startTime).append("' and ").append(Param.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' tz('Asia/Shanghai')"); - String sql = "SELECT * FROM day_plt WHERE " + stringBuilder; + stringBuilder.append(InfluxDBPublicParam.TIME + " >= '").append(startTime).append("' and ").append(InfluxDBPublicParam.TIME).append(" <= '").append(endTime).append("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and quality_flag = '0' ").append(InfluxDBPublicParam.TIME_ZONE); + String sql = "SELECT * FROM "+ InfluxDBPublicParam.DAY_PLT+" WHERE " + stringBuilder; QueryResult sqlResult = influxDbUtils.query(sql); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); List list = resultMapper.toPOJO(sqlResult, DayPlt.class); @@ -974,11 +972,11 @@ public class LimitTargetJob { fields.put("inuharm_14_overtime",item.getInuHarm14OverTime()); fields.put("inuharm_15_overtime",item.getInuHarm15OverTime()); fields.put("inuharm_16_overtime",item.getInuHarm16OverTime()); - Point point = influxDbUtils.pointBuilder("limit_target", time, TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(DATABASE).tag("line_id", item.getLineId()).tag("phasic_type",item.getPhasicType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); + Point point = influxDbUtils.pointBuilder(InfluxDBPublicParam.LIMIT_TARGET, time, TimeUnit.MILLISECONDS, tags, fields); + BatchPoints batchPoints = BatchPoints.database(InfluxDBPublicParam.DATABASE).tag(InfluxDBPublicParam.LINE_ID, item.getLineId()).tag(InfluxDBPublicParam.PHASIC_TYPE,item.getPhasicType()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); batchPoints.point(point); records.add(batchPoints.lineProtocol()); }); - influxDbUtils.batchInsert(DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); + influxDbUtils.batchInsert(InfluxDBPublicParam.DATABASE,"", InfluxDB.ConsistencyLevel.ALL, records); } }