From a3e782cb360d37953438114f5dbd4d55fa25157c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 12 Jan 2023 16:57:31 +0800 Subject: [PATCH] =?UTF-8?q?job=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/ClonePqsOnlineRateJob.java | 310 ------------------ .../handler/HarmAberrationRateJob.java | 5 +- .../executor/handler/HarmAlarmDetailJob.java | 1 + .../handler/HarmComprehensiveAssessJob.java | 1 + .../executor/handler/HarmCustomReportJob.java | 1 + .../executor/handler/HarmDateToDayJob.java | 1 + .../executor/handler/HarmIntegrityJob.java | 1 + .../executor/handler/HarmKpiAssessJob.java | 1 + .../executor/handler/HarmLimitRateJob.java | 1 + .../executor/handler/HarmLimitTargetJob.java | 1 + .../executor/handler/HarmOnlineRateJob.java | 1 + .../executor/handler/HarmPollutionJob.java | 2 +- .../njcn/executor/handler/LimitRateJob.java | 90 +++-- .../njcn/executor/handler/LimitTargetJob.java | 84 +++-- .../njcn/executor/handler/PollutionJob.java | 78 +++-- .../executor/handler/PqsIntegrityJob.java | 24 +- .../executor/handler/PqsOnlineRateJob.java | 30 +- 17 files changed, 221 insertions(+), 411 deletions(-) delete mode 100644 pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ClonePqsOnlineRateJob.java diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ClonePqsOnlineRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ClonePqsOnlineRateJob.java deleted file mode 100644 index 3d1b18c32..000000000 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ClonePqsOnlineRateJob.java +++ /dev/null @@ -1,310 +0,0 @@ -package com.njcn.executor.handler; - -import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.dto.OnlineLineDTO; -import com.njcn.energy.pojo.constant.ModelState; -import com.njcn.executor.pojo.vo.PqsCommunicateClone; -import com.njcn.executor.pojo.vo.PqsOnlineRate; -import com.njcn.influxdb.config.InfluxDbConfig; -import com.njcn.influxdb.utils.InfluxDbUtils; -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.influxdb.InfluxDB; -import org.influxdb.dto.BatchPoints; -import org.influxdb.dto.Point; -import org.influxdb.dto.QueryResult; -import org.influxdb.impl.InfluxDBResultMapper; -import org.influxdb.querybuilder.SelectQueryImpl; -import org.influxdb.querybuilder.WhereNested; -import org.influxdb.querybuilder.WhereQueryImpl; -import org.influxdb.querybuilder.clauses.Clause; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.*; -import java.util.concurrent.TimeUnit; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import static com.njcn.influxdb.param.InfluxDBPublicParam.*; -import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.*; - -/** - * 类的介绍：复制终端在线率代码 (通讯表录入监测点情况) - * - * @author xuyang - * @version 1.0.0 - * @createTime 2022/7/8 13:43 - */ -@Slf4j -@Component -@AllArgsConstructor -public class ClonePqsOnlineRateJob { - - private final InfluxDbUtils influxDbUtils; - - private final LineFeignClient lineFeignClient; - - private final InfluxDbConfig influxDbConfig; - - @XxlJob("clonePqsOnlineRateJobHandler") - public void clonePqsOnlineRateJobHandler() throws ParseException { - List result = new ArrayList<>(); - - List paramList = new ArrayList<>(),lineList = new ArrayList<>(); - String command = XxlJobHelper.getJobParam(); - - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - Calendar calendar = Calendar.getInstance(); - calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)-1, 0, 0, 0); - calendar.set(Calendar.MILLISECOND, 0); - - Calendar calendar2 = Calendar.getInstance(); - calendar2.set(calendar2.get(Calendar.YEAR), calendar2.get(Calendar.MONTH), calendar2.get(Calendar.DAY_OF_MONTH)-1, 23, 59, 59); - calendar2.set(Calendar.MILLISECOND, 0); - - String startTime = format.format(calendar.getTime()); - String endTime = format.format(calendar2.getTime()); - - if (!StringUtils.isEmpty(command)){ - paramList = Arrays.asList(command.split(",")); - startTime = paramList.get(0); - endTime = paramList.get(1); - lineList = paramList.subList(2,paramList.size()); - boolean s1 = Pattern.matches(PatternRegex.TIME_FORMAT,startTime); - boolean e1 = Pattern.matches(PatternRegex.TIME_FORMAT,endTime); - if (!s1 || !e1){ - log.error("补招时间格式错误"); - return; - } else { - startTime = startTime + START_TIME; - endTime = endTime + END_TIME; - } - } - - - if (CollectionUtils.isEmpty(lineList)){ - lineList = lineFeignClient.getRunLineIdsList().getData(); - } - - if (!CollectionUtils.isEmpty(lineList)){ - long diff,diffDays,a,b = 0; - List l1 = new ArrayList<>(),l2 = new ArrayList<>(); - Date d1 = format.parse(startTime); - Date d2 = format.parse(endTime); - diff = d2.getTime() - d1.getTime(); - diffDays = diff / (24 * 60 * 60 * 1000-1000); - int days = (int) diffDays; - for (int i = 1; i <= days; i++) { - a = d1.getTime() + (long)(i-1)*(24 * 60 * 60) * 1000; - b = d1.getTime() + (long)i*(24 * 60 * 60) * 1000-1000; - startTime = format.format(a); - endTime = format.format(b); - //获取装置的最新的一条数据 - List latestList = getData(lineList,endTime); - if (!CollectionUtils.isEmpty(latestList)){ - for (PqsCommunicateClone item : latestList) { - if (item.getTime().toEpochMilli() < a){ - l1.add(item); - } else if (a <= item.getTime().toEpochMilli() && item.getTime().toEpochMilli() < b){ - l2.add(item); - } - } - } - if (!CollectionUtils.isEmpty(l1)){ - for (PqsCommunicateClone item : l1) { - PqsOnlineRate onlineRate = new PqsOnlineRate(); - if (Objects.equals(item.getType(), ModelState.offline)){ - onlineRate.setOfflineMin(DAY_MINUTE); - onlineRate.setOnlineMin(0); - onlineRate.setOnlineRate(0.0); - } else { - onlineRate.setOfflineMin(0); - onlineRate.setOnlineMin(DAY_MINUTE); - onlineRate.setOnlineRate(100.0); - } - onlineRate.setTime(Instant.ofEpochMilli(a)); - onlineRate.setDevId(item.getLineId()); - result.add(onlineRate); - } - } - if (!CollectionUtils.isEmpty(l2)){ - List lineIdsList = l2.stream().map(PqsCommunicateClone::getLineId).collect(Collectors.toList()); - List list = getPqsCommunicateClone(lineIdsList,startTime,endTime); - //根据装置的id进行分组 - Map> groupMap = list.stream().collect(Collectors.groupingBy(PqsCommunicateClone::getLineId)); - try { - if (!CollectionUtils.isEmpty(groupMap)){ - for (String key : groupMap.keySet()) { - int offTime = 0; - int onTime = 0; - PqsOnlineRate onlineRate = new PqsOnlineRate(); - List infoList = groupMap.get(key); - if (infoList.size() > 1){ - //获取最早一条记录 - PqsCommunicateClone first = infoList.stream().min(Comparator.comparing(PqsCommunicateClone::getTime)).get(); - //将上线和下线分组 - Map> typeMap = infoList.stream().collect(Collectors.groupingBy(PqsCommunicateClone::getType)); - List off = typeMap.get(0); - List on = typeMap.get(1); - if (first.getType() == 0){ - if (off.size() == on.size()){ - for (int j = 0; j < off.size(); j++) { - offTime = offTime + (int) (on.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + 1000L - off.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } - } else { - for (int j = 0; j < off.size(); j++) { - if (j == off.size() - 1){ - offTime = offTime + (int) (format.parse(endTime).getTime() + 1000L - off.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } else { - offTime = offTime + (int) (on.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + 1000L - off.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } - } - } - onTime = DAY_MINUTE-offTime; - } else { - if (off.size() == on.size()){ - for (int j = 0; j < on.size(); j++) { - onTime = onTime + (int) (off.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + 1000L - on.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } - } else { - for (int j = 0; j < on.size(); j++) { - if (j == on.size() - 1){ - onTime = onTime + (int) (format.parse(endTime).getTime() + 1000L - on.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } else { - onTime = onTime + (int) (off.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + 1000L - on.get(j).getTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } - } - } - offTime = DAY_MINUTE-onTime; - } - } else { - LocalDateTime updateTime = LocalDateTime.ofInstant(infoList.get(0).getTime(), ZoneId.systemDefault()); - if (Objects.equals(infoList.get(0).getType(),0)) { - onTime = (int) (updateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - a) / (1000*60); - offTime = (int) (format.parse(endTime).getTime() + 1000L - updateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } else { - //如果只有一条且当天在线说明在此时刻钱该装置都掉线 - offTime =(int) (updateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - a) / (1000*60); - onTime = (int) (format.parse(endTime).getTime() + 1000L - updateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()) / (1000*60); - } - } - onlineRate.setDevId(infoList.get(0).getLineId()); - onlineRate.setOnlineMin(onTime); - onlineRate.setOfflineMin(offTime); - onlineRate.setOnlineRate(Double.parseDouble(String.format("%.2f",onTime*1.0/DAY_MINUTE*100))); - onlineRate.setTime(Instant.ofEpochMilli(a)); - result.add(onlineRate); - } - } - } catch (ParseException e) { - e.getMessage(); - log.error("终端在线率调度任务执行出错,错误信息:"+e.getMessage()); - } - } - } - } - - //获取所有监测点装置id - List lineBaseList = lineFeignClient.getOnLineDevLine(result.stream().map(PqsOnlineRate::getDevId).collect(Collectors.toList())).getData(); - - Map> hashMap = lineBaseList.stream().collect(Collectors.groupingBy(OnlineLineDTO::getLineId)); - - result = result.stream().peek(item->item.setDevId(hashMap.get(item.getDevId()).get(0).getDevId())).collect(Collectors.toList()); - - /*增加相同装置过滤*/ - List list = result.stream().collect(Collectors - .collectingAndThen(Collectors.toCollection(() -> new TreeSet<> - (Comparator.comparing(PqsOnlineRate::getDevId))), ArrayList::new)); - - insertData(list); - } - - /** - * 获取pqs_communicate数据 - * @param list 装置集合 - * @param startTime 开始时间 - * @param endTime 结束时间 - * @return pqs_communicate数据 - */ - private List getPqsCommunicateClone(List list, String startTime, String endTime){ - SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE); - WhereQueryImpl where = selectQuery.where(); - whereAndNested(list, where); - - where.and(gte(TIME, startTime)).and(lte(TIME, endTime)); - where.tz(TZ); - QueryResult queryResult = influxDbUtils.query(selectQuery.getCommand()); - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); - return resultMapper.toPOJO(queryResult, PqsCommunicateClone.class); - } - - /** - * 拼接装置条件 - * @param list 装置集合 - * @param whereQuery WhereQueryImpl - */ - private void whereAndNested(List list, WhereQueryImpl whereQuery) { - List clauses = new ArrayList<>(); - list.forEach(item->{ - Clause clause = eq(LINE_ID, item); - clauses.add(clause); - }); - WhereNested> andNested = whereQuery.andNested(); - for (Clause clause : clauses) { - andNested.or(clause); - } - andNested.close(); - } - - /** - * 获取pqs_communicate数据最新一条数据 - * @param list 装置id集合 - * @return pqs_communicate数据 - */ - private List getData(List list,String endTime){ - SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE); - WhereQueryImpl where = selectQuery.where(); - whereAndNested(list, where); - where.and(lte(TIME,endTime)); - where.groupBy(LINE_ID).orderBy(desc()).limit(1); - where.tz(TZ); - String sql = selectQuery.getCommand(); - QueryResult queryResult = influxDbUtils.query(sql); - InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); - return resultMapper.toPOJO(queryResult, PqsCommunicateClone.class); - } - - /** - * 功能描述:插入pqs_integrity表数据 - * @author xy - * @param list 数据集合 - * @date 2022/5/12 8:55 - */ - private void insertData(List list){ - List records = new ArrayList<>(); - list.forEach(item->{ - Map tags = new HashMap<>(); - Map fields = new HashMap<>(); - tags.put(DEV_ID,item.getDevId()); - fields.put(ONLINE_MIN,item.getOnlineMin()); - fields.put(OFFLINE_MIN,item.getOfflineMin()); - fields.put(ONLINE_RATE,item.getOnlineRate()); - Point point = influxDbUtils.pointBuilder(PQS_ONLINERATE, item.getTime().toEpochMilli(), TimeUnit.MILLISECONDS, tags, fields); - BatchPoints batchPoints = BatchPoints.database(influxDbConfig.getDatabase()).tag(DEV_ID, item.getDevId()).retentionPolicy("").consistency(InfluxDB.ConsistencyLevel.ALL).build(); - batchPoints.point(point); - records.add(batchPoints.lineProtocol()); - }); - influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records); - } -} diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java index f219ea9b7..c7c1bbeea 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java @@ -26,7 +26,6 @@ public class HarmAberrationRateJob { @XxlJob("harmAberrationRateHandler") public void harmAberrationRateHandler(){ - long a = System.currentTimeMillis(); String command = XxlJobHelper.getJobParam(); LineParam lineParam = new LineParam(); @@ -35,9 +34,9 @@ public class HarmAberrationRateJob { String date = CommonExecutorUtils.prepareTimeDeal(command); //date = "2022-10-26"; lineParam.setDataDate(date); + lineParam.setDataSource(1); distortionRateFeignClient.distortionRate(lineParam); - long b = System.currentTimeMillis(); - System.out.println("时间"+(b-a)/1000); + } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAlarmDetailJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAlarmDetailJob.java index 525dd97f0..562502b7f 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAlarmDetailJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAlarmDetailJob.java @@ -30,6 +30,7 @@ public class HarmAlarmDetailJob { String date = CommonExecutorUtils.prepareTimeDeal(command); //date = "2022-10-26"; lineParam.setDataDate(date); + lineParam.setDataSource(1); normalLimitFeignClient.getNormLimitData(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java index df72dda48..80992e2fb 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmComprehensiveAssessJob.java @@ -31,6 +31,7 @@ public class HarmComprehensiveAssessJob { //下面测试数据部署需删除 //lineParam.setDataDate("2022-10-27"); + lineParam.setDataSource(1); harmonicGeneralFeignClient.generalData(lineParam); } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java index 913068739..210242bda 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java @@ -36,6 +36,7 @@ public class HarmCustomReportJob { String date = CommonExecutorUtils.prepareTimeDeal(command); //date = "2022-10-26"; lineParam.setDataDate(date); + lineParam.setDataSource(1); coustmReportFeignClient.batchReport(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java index 3cb7b6646..50a8550e5 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java @@ -41,6 +41,7 @@ public class HarmDateToDayJob { //下面测试数据部署需删除 //lineParam.setDataDate("2022-10-27"); + lineParam.setDataSource(1); dayDataFeignClient.dayDataHanlder(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java index 3d62228d8..5811388fd 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java @@ -31,6 +31,7 @@ public class HarmIntegrityJob { LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataSource(1); integrityFeignClient.computeDataIntegrity(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java index f6e366fe6..fab9f91d0 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmKpiAssessJob.java @@ -32,6 +32,7 @@ public class HarmKpiAssessJob { //下面测试数据部署需删除 //lineParam.setDataDate("2022-10-27"); + lineParam.setDataSource(1); harmonicMetricFeignClient.metricData(lineParam); } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java index 3efd265d2..65b8af3ea 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java @@ -37,6 +37,7 @@ public class HarmLimitRateJob { //下面测试数据部署需删除 //lineParam.setDataDate("2022-10-26"); + lineParam.setDataSource(1); limitrateFeignClient.limitRateHanlder(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java index 034755354..d701179c1 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java @@ -32,6 +32,7 @@ public class HarmLimitTargetJob { lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); //lineParam.setDataDate("2022-10-27"); + lineParam.setDataSource(1); limitTargetFeignClient.getLimitTargetData(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java index ebe308ecc..5904a89b7 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java @@ -27,6 +27,7 @@ public class HarmOnlineRateJob { LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + lineParam.setDataSource(1); onlineRateFeignClient.getOnlineRateData(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmPollutionJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmPollutionJob.java index 0b7cfedd5..01b904781 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmPollutionJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmPollutionJob.java @@ -31,7 +31,7 @@ public class HarmPollutionJob { String command = XxlJobHelper.getJobParam(); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(command)); - + lineParam.setDataSource(1); String date = CommonExecutorUtils.prepareTimeDeal(command); log.info("执行日期harmPollutionJob。。。。。。。。。。"+date); 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 c5d06e180..1b8ba0dd4 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 @@ -1,3 +1,4 @@ +/* package com.njcn.executor.handler; import com.njcn.common.pojo.constant.PatternRegex; @@ -29,13 +30,15 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import java.util.stream.Collectors; +*/ /** * 类的介绍： * * @author xuyang * @version 1.0.0 * @createTime 2022/5/17 14:34 - */ + *//* + @Slf4j @Component @AllArgsConstructor @@ -121,9 +124,11 @@ public class LimitRateJob { } - /** + */ +/** * 组装A、B、C、T数据 - */ + *//* + private List getData(Map> limitMap, Map> map1, Map> map2, Map> map3,Map> map4,Map> map5,Map> map6,Map> map7,Map> map8,Map> map9,Map> map10,Map> map11){ List result = new ArrayList<>(); for (String item:limitMap.keySet()){ @@ -206,9 +211,11 @@ public class LimitRateJob { } - /** + */ +/** * A、B、C三项指标统计 - */ + *//* + public LimitRate limitRateData(Overlimit overlimit, Integer allTime, Integer flickerAllTime, String phasicType, String lineId, List list1, List list2, List list3, List list4, List list8, List list9){ LimitRate limitRate = new LimitRate(); int v2 = 0,v3 = 0,v4 = 0,v5 = 0,v6 = 0,v7 = 0,v8 = 0,v9 = 0,v10 = 0,v11 = 0,v12 = 0,v13 = 0,v14 = 0,v15 = 0,v16 = 0,v17 = 0,v18 = 0,v19 = 0,v20 = 0,v21 = 0,v22 = 0,v23 = 0,v24 = 0,v25 = 0; @@ -531,9 +538,11 @@ public class LimitRateJob { return limitRate; } - /** + */ +/** * T三项指标统计 - */ + *//* + public LimitRate limitRateDataT(Overlimit overlimit, Integer allTime, Integer flickerAllTime, String lineId, Map> map1,Map> map2, Map> map3,Map> map4,Map> map5,Map> map6,Map> map7, Map> map8,Map> map9){ LimitRate limitRate = new LimitRate(); int v2 = 0,v3 = 0,v4 = 0,v5 = 0,v6 = 0,v7 = 0,v8 = 0,v9 = 0,v10 = 0,v11 = 0,v12 = 0,v13 = 0,v14 = 0,v15 = 0,v16 = 0,v17 = 0,v18 = 0,v19 = 0,v20 = 0,v21 = 0,v22 = 0,v23 = 0,v24 = 0,v25 = 0; @@ -937,7 +946,8 @@ public class LimitRateJob { return limitRate; } - /** + */ +/** * 功能描述:获取influxDB -> data_v -> 总计算次数(用data_v中phasic_type=A,quality_flag=0来参与统计) * @author xy * @param line 监测点集合 @@ -945,7 +955,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getAllTime(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -968,7 +979,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB ->data_plt -> 闪变总次数(用data_plt中phasic_type=A,quality_flag=0来参与统计) * @author xy * @param line 监测点集合 @@ -976,7 +988,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getFlickerAllTime(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -999,7 +1012,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_harmrate_v -> 2-25次谐波电压含有率 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -1007,7 +1021,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataHarmRateV(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1030,7 +1045,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_i -> 2-25次谐波电流 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -1038,7 +1054,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataI(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1061,7 +1078,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_inharm_v -> 0.5-15.5次间谐波电压含有率 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -1069,7 +1087,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataInHarmV(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1092,7 +1111,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_v -> 电压总谐波畸变率 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -1100,7 +1120,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataV(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1124,7 +1145,8 @@ public class LimitRateJob { } - /** + */ +/** * 功能描述:获取influxDB -> data_v -> 负序电压不平衡度 -> 最大值 && 日95%概率值 * @author xy * @param line 监测点集合 @@ -1132,7 +1154,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataVUnbalance(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1155,7 +1178,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值 * @author xy * @param line 监测点集合 @@ -1163,7 +1187,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataINeg(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1186,7 +1211,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_v -> 频率偏差 -> 最大值 && 最小值 * @author xy * @param line 监测点集合 @@ -1194,7 +1220,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataVFreq(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1217,7 +1244,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值 && 最小值 * @author xy * @param line 监测点集合 @@ -1225,7 +1253,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataVDev(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1248,7 +1277,8 @@ public class LimitRateJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> data_plt -> 长时间闪变 -> 最大值 * @author xy * @param line 监测点集合 @@ -1256,7 +1286,8 @@ public class LimitRateJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDataPlt(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -1366,3 +1397,4 @@ public class LimitRateJob { influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", 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 a100057ae..18c24592b 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 @@ -1,3 +1,4 @@ +/* package com.njcn.executor.handler; import com.njcn.common.pojo.constant.PatternRegex; @@ -29,13 +30,15 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import java.util.stream.Collectors; +*/ /** * 类的介绍： * * @author xuyang * @version 1.0.0 * @createTime 2022/5/17 14:34 - */ + *//* + @Slf4j @Component @AllArgsConstructor @@ -121,9 +124,11 @@ public class LimitTargetJob { } - /** + */ +/** * 组装T项数据 - */ + *//* + private List getData(Map> limitMap, Map> map1, Map> map2, Map> map3,Map> map4,Map> map5,Map> map6,Map> map7,Map> map8,Map> map9,Map> map10,Map> map11){ List result = new ArrayList<>(); for (String item:limitMap.keySet()){ @@ -157,9 +162,11 @@ public class LimitTargetJob { return result; } - /** + */ +/** * T项指标统计 - */ + *//* + public LimitTarget limitTargetDataT(Overlimit overlimit, Integer allTime, Integer flickerAllTime, String lineId, List list1, List list2, List list3 ,List list4 ,List list5, List list6, List list7, List list8, List list9){ LimitTarget limitTarget = new LimitTarget(); int v2 = 0,v3 = 0,v4 = 0,v5 = 0,v6 = 0,v7 = 0,v8 = 0,v9 = 0,v10 = 0,v11 = 0,v12 = 0,v13 = 0,v14 = 0,v15 = 0,v16 = 0,v17 = 0,v18 = 0,v19 = 0,v20 = 0,v21 = 0,v22 = 0,v23 = 0,v24 = 0,v25 = 0; @@ -554,7 +561,8 @@ public class LimitTargetJob { return limitTarget; } - /** + */ +/** * 功能描述:获取influxDB -> DayV -> 总计算次数(用DayV中phasic_type=A,quality_flag=0来参与统计) * @author xy * @param line 监测点集合 @@ -562,7 +570,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getAllTime(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -585,7 +594,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB ->DayPlt -> 闪变总次数(用DayPlt中phasic_type=A,quality_flag=0来参与统计) * @author xy * @param line 监测点集合 @@ -593,7 +603,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getFlickerAllTime(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -616,7 +627,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayHarmrateV -> 2-25次谐波电压含有率 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -624,7 +636,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayHarmrateV(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -647,7 +660,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayI -> 2-25次谐波电流 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -655,7 +669,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayI(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -678,7 +693,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayInharmV -> 0.5-15.5次间谐波电压含有率 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -686,7 +702,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayInharmV(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -709,7 +726,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayV -> 电压总谐波畸变率 -> 日95%概率值 * @author xy * @param line 监测点集合 @@ -717,7 +735,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayV(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -741,7 +760,8 @@ public class LimitTargetJob { } - /** + */ +/** * 功能描述:获取influxDB -> DayV -> 负序电压不平衡度 -> 最大值 && 日95%概率值 * @author xy * @param line 监测点集合 @@ -749,7 +769,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayVUnbalance(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -772,7 +793,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayI -> 负序电流 -> 最大值 && 日95%概率值 * @author xy * @param line 监测点集合 @@ -780,7 +802,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayINeg(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -803,7 +826,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayV -> 频率偏差 -> 最大值 && 最小值 * @author xy * @param line 监测点集合 @@ -811,7 +835,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayVFreq(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -834,7 +859,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayV -> 电压偏差 -> 最大值 && 最小值 * @author xy * @param line 监测点集合 @@ -842,7 +868,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayVDev(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -865,7 +892,8 @@ public class LimitTargetJob { return map; } - /** + */ +/** * 功能描述:获取influxDB -> DayPlt -> 长时间闪变 -> 最大值 * @author xy * @param line 监测点集合 @@ -873,7 +901,8 @@ public class LimitTargetJob { * @param endTime 结束时间 * @date 2022/5/23 10:51 * @return - */ + *//* + public Map> getDayPlt(List line, String startTime, String endTime){ Map> map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); @@ -983,3 +1012,4 @@ public class LimitTargetJob { influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records); } } +*/ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java index 52a8b2417..a15902dcc 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java @@ -1,3 +1,4 @@ +/* package com.njcn.executor.handler; import com.njcn.device.pq.api.LineFeignClient; @@ -29,11 +30,13 @@ import java.util.function.BinaryOperator; import java.util.stream.Collectors; import java.util.stream.Stream; +*/ /** * @author xuy * @version 1.0.0 * @date 2022年04月07日 09:54 - */ + *//* + @Slf4j @Component @AllArgsConstructor @@ -45,9 +48,11 @@ public class PollutionJob { private final LineFeignClient lineFeignClient; - /** + */ +/** * 监测点污染指标 - */ + *//* + @XxlJob("pollutionJobHandler") public void pollutionJobHandler() { List list = new ArrayList<>(); @@ -188,9 +193,11 @@ public class PollutionJob { } - /** + */ +/** * 获取限值表中的所有监测点信息 - */ + *//* + private List getAllLinesLimitData() { return lineFeignClient.getAllLineOverLimit("harmonic-boot","").getData(); } @@ -203,11 +210,13 @@ public class PollutionJob { andNested.close(); } - /** + */ +/** * 谐波电压 -> 电压总谐波畸变率 * 各监测点最新的A、B、C三相数据 * 按照监测点分组，每个监测点取最大 - */ + *//* + private Map> getDistortionData(){ String sql = "SELECT * FROM day_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -234,10 +243,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 谐波电压 -> 各次谐波电压含有率（2~25次） * 各监测点最新的A、B、C三相数据 - */ + *//* + private Map> getContentData(){ String sql = "SELECT * FROM day_harmrate_v where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -287,10 +298,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 谐波电流 -> 各次谐波电流（2~25次） * 各监测点最新的A、B、C三相数据 - */ + *//* + private Map> getIharm(){ String sql = "SELECT * FROM day_i where value_type = 'CP95' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -340,10 +353,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 频率偏差 -> 绝对值 * 各监测点最新的T相数据 - */ + *//* + private Map> getFreq(){ String sql = "SELECT line_id,abs(freq_dev) AS freq_dev FROM day_v where phasic_type = 'T' and (value_type = 'MIN' or value_type = 'MAX') group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -370,10 +385,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 电压偏差 -> 绝对值 * 各监测点最新的A、B、C三相数据 - */ + *//* + private Map> getDev(){ String sql = "SELECT line_id,vu_dev,vl_dev,value_type FROM day_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') group by line_id order by time desc limit 6 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -401,10 +418,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 三相电压不平衡度 * 各监测点最新的T相数据 - */ + *//* + private Map> getUbalance(){ String sql = "SELECT line_id,v_unbalance,value_type FROM day_v where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -431,10 +450,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 负序电流 * 各监测点最新的T相数据 - */ + *//* + private Map> getIneg(){ String sql = "SELECT line_id,i_neg,value_type FROM day_i where phasic_type = 'T' and (value_type = 'CP95' or value_type = 'MAX') group by line_id order by time desc limit 2 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -461,10 +482,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 间谐波电压含有率 * 各监测点最新的A、B、C三相数据 - */ + *//* + private Map> getInuharm(){ String sql = "SELECT * FROM day_inharm_v where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -506,10 +529,12 @@ public class PollutionJob { return lineData.stream().collect(Collectors.groupingBy(PublicDTO::getId,Collectors.reducing(BinaryOperator.maxBy(comparator)))); } - /** + */ +/** * 长时电压闪变 * 各监测点最新的A、B、C三相数据 - */ + *//* + private Map> getFlicker(){ String sql = "SELECT * FROM day_plt where (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'CP95' group by line_id order by time desc limit 3 tz('Asia/Shanghai')"; QueryResult sqlResult = influxDbUtils.query(sql); @@ -537,9 +562,11 @@ public class PollutionJob { } - /** + */ +/** * 生成谐波污区图污染指标表 - */ + *//* + private void createMeasurement(List list, long time){ List records = new ArrayList(); list.forEach(item->{ @@ -562,3 +589,4 @@ public class PollutionJob { influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records); } } +*/ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsIntegrityJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsIntegrityJob.java index c827f5c51..21970e7c2 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsIntegrityJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsIntegrityJob.java @@ -1,3 +1,4 @@ +/* package com.njcn.executor.handler; import com.njcn.common.pojo.constant.PatternRegex; @@ -37,13 +38,15 @@ import static com.njcn.influxdb.param.InfluxDBPublicParam.LINE_ID; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.*; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.eq; +*/ /** * 类的介绍： * * @author xuyang * @version 1.0.0 * @createTime 2022/7/8 13:44 - */ + *//* + @Slf4j @Component @AllArgsConstructor @@ -122,11 +125,13 @@ public class PqsIntegrityJob { } - /** + */ +/** * 获取dataV数据 * @param list 监测点集合 * @return dataV数据 - */ + *//* + private List getDataV(List list, String startTime, String endTime){ SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), DATA_V); WhereQueryImpl where = selectQuery.where(); @@ -138,11 +143,13 @@ public class PqsIntegrityJob { return resultMapper.toPOJO(queryResult, DataV.class); } - /** + */ +/** * 拼接监测点条件 * @param list 监测点集合 * @param whereQuery WhereQueryImpl - */ + *//* + private void whereAndNested(List list, WhereQueryImpl whereQuery) { List clauses = new ArrayList<>(); list.forEach(item->{ @@ -156,12 +163,14 @@ public class PqsIntegrityJob { andNested.close(); } - /** + */ +/** * 功能描述:插入pqs_integrity表数据 * @author xy * @param list 数据集合 * @date 2022/5/12 8:55 - */ + *//* + private void insertData(List list){ List records = new ArrayList<>(); list.forEach(item->{ @@ -179,3 +188,4 @@ public class PqsIntegrityJob { } } +*/ diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsOnlineRateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsOnlineRateJob.java index 2cacb3624..d3d7bdc65 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsOnlineRateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsOnlineRateJob.java @@ -1,3 +1,4 @@ +/* package com.njcn.executor.handler; import com.njcn.common.pojo.constant.PatternRegex; @@ -37,13 +38,15 @@ import java.util.stream.Collectors; import static com.njcn.influxdb.param.InfluxDBPublicParam.*; import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.*; +*/ /** * 类的介绍： * * @author xuyang * @version 1.0.0 * @createTime 2022/7/8 13:43 - */ + *//* + @Slf4j @Component @AllArgsConstructor @@ -205,13 +208,15 @@ public class PqsOnlineRateJob { insertData(result); } - /** + */ +/** * 获取pqs_communicate数据 * @param list 装置集合 * @param startTime 开始时间 * @param endTime 结束时间 * @return pqs_communicate数据 - */ + *//* + private List getPqsCommunicate(List list, String startTime, String endTime){ SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE); WhereQueryImpl where = selectQuery.where(); @@ -223,11 +228,13 @@ public class PqsOnlineRateJob { return resultMapper.toPOJO(queryResult, PqsCommunicate.class); } - /** + */ +/** * 拼接装置条件 * @param list 装置集合 * @param whereQuery WhereQueryImpl - */ + *//* + private void whereAndNested(List list, WhereQueryImpl whereQuery) { List clauses = new ArrayList<>(); list.forEach(item->{ @@ -241,11 +248,13 @@ public class PqsOnlineRateJob { andNested.close(); } - /** + */ +/** * 获取pqs_communicate数据最新一条数据 * @param list 装置id集合 * @return pqs_communicate数据 - */ + *//* + private List getData(List list){ SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE); WhereQueryImpl where = selectQuery.where(); @@ -257,12 +266,14 @@ public class PqsOnlineRateJob { return resultMapper.toPOJO(queryResult, PqsCommunicate.class); } - /** + */ +/** * 功能描述:插入pqs_integrity表数据 * @author xy * @param list 数据集合 * @date 2022/5/12 8:55 - */ + *//* + private void insertData(List list){ List records = new ArrayList<>(); list.forEach(item->{ @@ -280,3 +291,4 @@ public class PqsOnlineRateJob { influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records); } } +*/