job代码提交

pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ClonePqsOnlineRateJob.java

@@ -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<PqsOnlineRate> result = new ArrayList<>();
-
-        List<String> 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<PqsCommunicateClone> 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<PqsCommunicateClone> 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<String> lineIdsList = l2.stream().map(PqsCommunicateClone::getLineId).collect(Collectors.toList());
-                    List<PqsCommunicateClone> list = getPqsCommunicateClone(lineIdsList,startTime,endTime);
-                    //根据装置的id进行分组
-                    Map<String,List<PqsCommunicateClone>> 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<PqsCommunicateClone> infoList = groupMap.get(key);
-                                if (infoList.size() > 1){
-                                    //获取最早一条记录
-                                    PqsCommunicateClone first = infoList.stream().min(Comparator.comparing(PqsCommunicateClone::getTime)).get();
-                                    //将上线和下线分组
-                                    Map<Integer,List<PqsCommunicateClone>> typeMap = infoList.stream().collect(Collectors.groupingBy(PqsCommunicateClone::getType));
-                                    List<PqsCommunicateClone> off = typeMap.get(0);
-                                    List<PqsCommunicateClone> 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<OnlineLineDTO> lineBaseList  = lineFeignClient.getOnLineDevLine(result.stream().map(PqsOnlineRate::getDevId).collect(Collectors.toList())).getData();
-
-        Map<String, List<OnlineLineDTO>> 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<PqsOnlineRate> 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<PqsCommunicateClone> getPqsCommunicateClone(List<String> list, String startTime, String endTime){
-        SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE);
-        WhereQueryImpl<SelectQueryImpl> 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<String> list, WhereQueryImpl<SelectQueryImpl> whereQuery) {
-        List<Clause> clauses = new ArrayList<>();
-        list.forEach(item->{
-            Clause clause = eq(LINE_ID, item);
-            clauses.add(clause);
-        });
-        WhereNested<WhereQueryImpl<SelectQueryImpl>> andNested = whereQuery.andNested();
-        for (Clause clause : clauses) {
-            andNested.or(clause);
-        }
-        andNested.close();
-    }
-
-    /**
-     * 获取pqs_communicate数据最新一条数据
-     * @param list      装置id集合
-     * @return pqs_communicate数据
-     */
-    private List<PqsCommunicateClone> getData(List<String> list,String endTime){
-        SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE);
-        WhereQueryImpl<SelectQueryImpl> 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<PqsOnlineRate> list){
-        List<String> records = new ArrayList<>();
-        list.forEach(item->{
-            Map<String, String> tags = new HashMap<>();
-            Map<String, Object> 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);
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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<LimitRate> getData(Map<String,List<Overlimit>> limitMap, Map<String,List<DataV>> map1, Map<String,List<DataPlt>> map2, Map<String,List<DataHarmRateV>> map3,Map<String,List<DataI>> map4,Map<String,List<DataInHarmV>> map5,Map<String,List<DataV>> map6,Map<String,List<DataV>> map7,Map<String,List<DataI>> map8,Map<String,List<DataV>> map9,Map<String,List<DataV>> map10,Map<String,List<DataPlt>> map11){
         List<LimitRate> 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<DataHarmRateV> list1, List<DataI> list2, List<DataInHarmV> list3, List<DataV> list4, List<DataV> list8, List<DataPlt> 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<Instant,List<DataHarmRateV>> map1,Map<Instant,List<DataI>> map2, Map<Instant,List<DataInHarmV>> map3,Map<Instant,List<DataV>> map4,Map<Instant,List<DataV>> map5,Map<Instant,List<DataI>> map6,Map<Instant,List<DataV>> map7, Map<Instant,List<DataV>> map8,Map<Instant,List<DataPlt>> 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,6 +946,7 @@ public class LimitRateJob {
         return limitRate;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_v -> 总计算次数(用data_v中phasic_type=A,quality_flag=0来参与统计)
      * @author xy
@@ -945,7 +955,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataV>> getAllTime(List<String> line, String startTime, String endTime){
         Map<String,List<DataV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -968,6 +979,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB ->data_plt -> 闪变总次数(用data_plt中phasic_type=A,quality_flag=0来参与统计)
      * @author xy
@@ -976,7 +988,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataPlt>> getFlickerAllTime(List<String> line, String startTime, String endTime){
         Map<String,List<DataPlt>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -999,6 +1012,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_harmrate_v -> 2-25次谐波电压含有率 -> 日95%概率值
      * @author xy
@@ -1007,7 +1021,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataHarmRateV>> getDataHarmRateV(List<String> line, String startTime, String endTime){
         Map<String,List<DataHarmRateV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1030,6 +1045,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_i -> 2-25次谐波电流 -> 日95%概率值
      * @author xy
@@ -1038,7 +1054,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataI>> getDataI(List<String> line, String startTime, String endTime){
         Map<String,List<DataI>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1061,6 +1078,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_inharm_v -> 0.5-15.5次间谐波电压含有率 -> 日95%概率值
      * @author xy
@@ -1069,7 +1087,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataInHarmV>> getDataInHarmV(List<String> line, String startTime, String endTime){
         Map<String,List<DataInHarmV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1092,6 +1111,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_v -> 电压总谐波畸变率 -> 日95%概率值
      * @author xy
@@ -1100,7 +1120,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataV>> getDataV(List<String> line, String startTime, String endTime){
         Map<String,List<DataV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1124,6 +1145,7 @@ public class LimitRateJob {
     }
 
 
+    */
 /**
      * 功能描述:获取influxDB -> data_v -> 负序电压不平衡度 -> 最大值 && 日95%概率值
      * @author xy
@@ -1132,7 +1154,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataV>> getDataVUnbalance(List<String> line, String startTime, String endTime){
         Map<String,List<DataV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1155,6 +1178,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值
      * @author xy
@@ -1163,7 +1187,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataI>> getDataINeg(List<String> line, String startTime, String endTime){
         Map<String,List<DataI>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1186,6 +1211,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_v -> 频率偏差 -> 最大值 && 最小值
      * @author xy
@@ -1194,7 +1220,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataV>> getDataVFreq(List<String> line, String startTime, String endTime){
         Map<String,List<DataV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1217,6 +1244,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值 && 最小值
      * @author xy
@@ -1225,7 +1253,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataV>> getDataVDev(List<String> line, String startTime, String endTime){
         Map<String,List<DataV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1248,6 +1277,7 @@ public class LimitRateJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> data_plt -> 长时间闪变 -> 最大值
      * @author xy
@@ -1256,7 +1286,8 @@ public class LimitRateJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DataPlt>> getDataPlt(List<String> line, String startTime, String endTime){
         Map<String,List<DataPlt>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -1366,3 +1397,4 @@ public class LimitRateJob {
         influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records);
     }
 }
+*/

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<LimitTarget> getData(Map<String,List<Overlimit>> limitMap, Map<String,List<DayV>> map1, Map<String,List<DayPlt>> map2, Map<String,List<DayHarmrateV>> map3,Map<String,List<DayI>> map4,Map<String,List<DayInharmV>> map5,Map<String,List<DayV>> map6,Map<String,List<DayV>> map7,Map<String,List<DayI>> map8,Map<String,List<DayV>> map9,Map<String,List<DayV>> map10,Map<String,List<DayPlt>> map11){
         List<LimitTarget> 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<DayHarmrateV> list1, List<DayI> list2, List<DayInharmV> list3 ,List<DayV> list4 ,List<DayV> list5, List<DayI> list6, List<DayV> list7, List<DayV> list8, List<DayPlt> 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,6 +561,7 @@ public class LimitTargetJob {
         return limitTarget;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayV -> 总计算次数(用DayV中phasic_type=A,quality_flag=0来参与统计)
      * @author xy
@@ -562,7 +570,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayV>> getAllTime(List<String> line, String startTime, String endTime){
         Map<String,List<DayV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -585,6 +594,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB ->DayPlt -> 闪变总次数(用DayPlt中phasic_type=A,quality_flag=0来参与统计)
      * @author xy
@@ -593,7 +603,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayPlt>> getFlickerAllTime(List<String> line, String startTime, String endTime){
         Map<String,List<DayPlt>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -616,6 +627,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayHarmrateV -> 2-25次谐波电压含有率 -> 日95%概率值
      * @author xy
@@ -624,7 +636,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayHarmrateV>> getDayHarmrateV(List<String> line, String startTime, String endTime){
         Map<String,List<DayHarmrateV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -647,6 +660,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayI -> 2-25次谐波电流 -> 日95%概率值
      * @author xy
@@ -655,7 +669,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayI>> getDayI(List<String> line, String startTime, String endTime){
         Map<String,List<DayI>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -678,6 +693,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayInharmV -> 0.5-15.5次间谐波电压含有率 -> 日95%概率值
      * @author xy
@@ -686,7 +702,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayInharmV>> getDayInharmV(List<String> line, String startTime, String endTime){
         Map<String,List<DayInharmV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -709,6 +726,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayV -> 电压总谐波畸变率 -> 日95%概率值
      * @author xy
@@ -717,7 +735,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayV>> getDayV(List<String> line, String startTime, String endTime){
         Map<String,List<DayV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -741,6 +760,7 @@ public class LimitTargetJob {
     }
 
 
+    */
 /**
      * 功能描述:获取influxDB -> DayV -> 负序电压不平衡度 -> 最大值 && 日95%概率值
      * @author xy
@@ -749,7 +769,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayV>> getDayVUnbalance(List<String> line, String startTime, String endTime){
         Map<String,List<DayV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -772,6 +793,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayI -> 负序电流 -> 最大值 && 日95%概率值
      * @author xy
@@ -780,7 +802,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayI>> getDayINeg(List<String> line, String startTime, String endTime){
         Map<String,List<DayI>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -803,6 +826,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayV -> 频率偏差 -> 最大值 && 最小值
      * @author xy
@@ -811,7 +835,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayV>> getDayVFreq(List<String> line, String startTime, String endTime){
         Map<String,List<DayV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -834,6 +859,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayV -> 电压偏差 -> 最大值 && 最小值
      * @author xy
@@ -842,7 +868,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayV>> getDayVDev(List<String> line, String startTime, String endTime){
         Map<String,List<DayV>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -865,6 +892,7 @@ public class LimitTargetJob {
         return map;
     }
 
+    */
 /**
      * 功能描述:获取influxDB -> DayPlt -> 长时间闪变 -> 最大值
      * @author xy
@@ -873,7 +901,8 @@ public class LimitTargetJob {
      * @param endTime       结束时间
      * @date 2022/5/23 10:51
      * @return
-     */
+     *//*
+
     public Map<String,List<DayPlt>> getDayPlt(List<String> line, String startTime, String endTime){
         Map<String,List<DayPlt>> map = new HashMap<>();
         StringBuilder stringBuilder = new StringBuilder();
@@ -983,3 +1012,4 @@ public class LimitTargetJob {
         influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records);
     }
 }
+*/

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<PublicDTO> list = new ArrayList<>();
@@ -188,9 +193,11 @@ public class PollutionJob {
     }
 
 
+    */
 /**
      * 获取限值表中的所有监测点信息
-     */
+     *//*
+
     private List<Overlimit> getAllLinesLimitData() {
         return lineFeignClient.getAllLineOverLimit("harmonic-boot","").getData();
     }
@@ -203,11 +210,13 @@ public class PollutionJob {
         andNested.close();
     }
 
+    */
 /**
      * 谐波电压 -> 电压总谐波畸变率
      * 各监测点最新的A、B、C三相数据
      * 按照监测点分组，每个监测点取最大
-     */
+     *//*
+
     private Map<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<String, Optional<PublicDTO>> 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<PollutionDTO> list, long time){
         List<String> records = new ArrayList<String>();
         list.forEach(item->{
@@ -562,3 +589,4 @@ public class PollutionJob {
         influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records);
     }
 }
+*/

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<DataV> getDataV(List<String> list, String startTime, String endTime){
         SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), DATA_V);
         WhereQueryImpl<SelectQueryImpl> 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<String> list, WhereQueryImpl<SelectQueryImpl> whereQuery) {
         List<Clause> 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<PqsIntegrity> list){
         List<String> records = new ArrayList<>();
         list.forEach(item->{
@@ -179,3 +188,4 @@ public class PqsIntegrityJob {
     }
 
 }
+*/

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<PqsCommunicate> getPqsCommunicate(List<String> list, String startTime, String endTime){
         SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE);
         WhereQueryImpl<SelectQueryImpl> 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<String> list, WhereQueryImpl<SelectQueryImpl> whereQuery) {
         List<Clause> 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<PqsCommunicate> getData(List<String> list){
         SelectQueryImpl selectQuery = select().from(influxDbConfig.getDatabase(), PQS_COMMUNICATE);
         WhereQueryImpl<SelectQueryImpl> 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<PqsOnlineRate> list){
         List<String> records = new ArrayList<>();
         list.forEach(item->{
@@ -280,3 +291,4 @@ public class PqsOnlineRateJob {
         influxDbUtils.batchInsert(influxDbConfig.getDatabase(),"", InfluxDB.ConsistencyLevel.ALL, records);
     }
 }
+*/