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); } }