diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/common/ServerEnum.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/common/ServerEnum.java index 1a8023b91..be37a84a3 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/common/ServerEnum.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/common/ServerEnum.java @@ -25,6 +25,8 @@ public enum ServerEnum { USER("user-boot", "用户服务模块"), ENERGY("energy-boot", "用能服务模块"), QUALITY("quality-boot", "电能质量服务模块"), + EVENT_PREPARE("event-prepare","暂态模块预处理"), + HARMONIC_PREPARE("harmonic-prepare","谐波模块预处理"), COMMON("pqs-common", "通用服务模块"); private final String name; 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 new file mode 100644 index 000000000..73f8de819 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAlarmDetailJob.java @@ -0,0 +1,25 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.line.NormalLimitFeignClient; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * pqs + * 告警异常 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmAlarmDetailJob { + + private final NormalLimitFeignClient normalLimitFeignClient; + + @XxlJob("harmAlarmDetailJob") + public void harmAlarmDetailJob(){ + normalLimitFeignClient.getNormLimitData(); + } + +} 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 new file mode 100644 index 000000000..3604da5cf --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java @@ -0,0 +1,82 @@ +package com.njcn.executor.handler; + + +import cn.hutool.core.date.DateUtil; +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Calendar; +import java.util.Date; + +/** + * pqs + * 稳态自定义监测点报告定时调度任务 + * @author cdf + * @date 2022/10/24 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmCustomReportJob { + + private final CoustmReportFeignClient coustmReportFeignClient; + + @XxlJob("harmCustomReportHandler") + public void harmCustomReportHandler(){ + long a = System.currentTimeMillis(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + String command = XxlJobHelper.getJobParam(); + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(command)); + + String date = null; + + if(command.equals(BizParamConstant.STAT_BIZ_YEAR)){ + //年 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.YEAR,-1); + date = sdf.format(DateUtil.beginOfDay(calendar.getTime())); + } else if(command.equals(BizParamConstant.STAT_BIZ_MONTH)){ + //月 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MONTH,-1); + date = sdf.format(DateUtil.beginOfDay(calendar.getTime())); + }else if(command.equals(BizParamConstant.STAT_BIZ_QUARTER)){ + //季度 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MONTH,-3); + date = sdf.format(DateUtil.beginOfDay(calendar.getTime())); + }else if(command.equals(BizParamConstant.STAT_BIZ_WEEK)){ + //周 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.WEEK_OF_MONTH,-1); + date = sdf.format(DateUtil.beginOfDay(calendar.getTime())); + }else if(command.equals(BizParamConstant.STAT_BIZ_DAY)){ + //天 + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH,-1); + date = sdf.format(DateUtil.beginOfDay(calendar.getTime())); + } + //date = "2022-10-27"; + lineParam.setDataDate(date); + coustmReportFeignClient.batchReport(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/HarmDateToDayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java new file mode 100644 index 000000000..a3a077307 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java @@ -0,0 +1,52 @@ +package com.njcn.executor.handler; + + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import com.njcn.prepare.harmonic.api.line.DayDataFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Calendar; + +/** + * pqs + * 稳态自定义监测点报告定时调度任务 + * @author cdf + * @date 2022/10/24 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmDateToDayJob { + + private final DayDataFeignClient dayDataFeignClient; + + @XxlJob("harmDateToDayJob") + public void harmDateToDayJob(){ + + long a = System.currentTimeMillis(); + LocalDateTime localDateTime = LocalDateTime.now().minusDays(1); + String startTime = LocalDateTimeUtil.beginOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String endTime = LocalDateTimeUtil.endOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + + //下面两行测试数据部署需删除 + //startTime = "2022-10-27 00:00:00"; + //endTime = "2022-10-27 23:59:59"; + + LimitRateHanlderParam limitRateHanlderParam = new LimitRateHanlderParam(); + limitRateHanlderParam.setStartTime(startTime); + limitRateHanlderParam.setEndTime(endTime); + dayDataFeignClient.dayDataHanlder(limitRateHanlderParam); + long b = System.currentTimeMillis(); + log.info("时间"+endTime+"执行时间"+(b-a)/1000+"\n"); + } + +} 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 new file mode 100644 index 000000000..0312c8943 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmIntegrityJob.java @@ -0,0 +1,42 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +/** + * pqs + * 稳态自定义监测点报告定时调度任务 + * @author cdf + * @date 2022/10/24 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmIntegrityJob { + + private final IntegrityFeignClient integrityFeignClient; + + @XxlJob("harmIntegrityJob") + public void harmIntegrityJob(){ + + + LineParam lineParam = new LineParam(); + lineParam.setType(5); + String date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + + //date = "2022-10-28"; + lineParam.setDataDate(date); + + + integrityFeignClient.computeDataIntegrity(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 new file mode 100644 index 000000000..58ac2cb51 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitRateJob.java @@ -0,0 +1,43 @@ +package com.njcn.executor.handler; + +import cn.hutool.core.date.LocalDateTimeUtil; +import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +/** + * pqs + * 每日监测点超标次数 + * @author cdf + * @date 2022/10/24 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmLimitRateJob { + + private final LimitrateFeignClient limitrateFeignClient; + + @XxlJob("harmLimitRateJob") + public void harmLimitRateJob(){ + LocalDateTime localDateTime = LocalDateTime.now().minusDays(1); + String startTime = LocalDateTimeUtil.beginOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String endTime = LocalDateTimeUtil.endOfDay(localDateTime).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + + //下面两行测试数据部署需删除 + //startTime = "2022-10-27 00:00:00"; + //endTime = "2022-10-27 23:59:59"; + + LimitRateHanlderParam limitRateHanlderParam = new LimitRateHanlderParam(); + limitRateHanlderParam.setStartTime(startTime); + limitRateHanlderParam.setEndTime(endTime); + limitrateFeignClient.limitRateHanlder(limitRateHanlderParam); + } + +} 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 new file mode 100644 index 000000000..dcc70afca --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmLimitTargetJob.java @@ -0,0 +1,37 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +/** + * pqs + * 每日监测点是否超标 + * @author cdf + * @date 2022/10/24 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmLimitTargetJob { + + private final LimitTargetFeignClient limitTargetFeignClient; + + @XxlJob("harmLimitTargetJob") + public void harmLimitTargetJob(){ + String date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + LineParam lineParam = new LineParam(); + lineParam.setType(5); + lineParam.setDataDate(date); + + //lineParam.setDataDate("2022-10-27"); + 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 new file mode 100644 index 000000000..282191118 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOnlineRateJob.java @@ -0,0 +1,30 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * pqs + * 稳态自定义监测点报告定时调度任务 + * @author cdf + * @date 2022/10/24 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmOnlineRateJob { + + private final OnlineRateFeignClient onlineRateFeignClient; + + @XxlJob("harmOnlineRateJob") + public void harmOnlineRateJob(){ + LineParam lineParam = new LineParam(); + lineParam.setType(5); + 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 new file mode 100644 index 000000000..feaed9b39 --- /dev/null +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmPollutionJob.java @@ -0,0 +1,47 @@ +package com.njcn.executor.handler; + +import com.njcn.prepare.harmonic.api.line.PollutionFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +/** + * 污区数据 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class HarmPollutionJob { + + private final PollutionFeignClient pollutionFeignClient; + + @XxlJob("harmPollutionJob") + public void harmPollutionJob(){ + long a = System.currentTimeMillis(); + + String command = XxlJobHelper.getJobParam(); + + LineParam lineParam = new LineParam(); + lineParam.setType(Integer.valueOf(command)); + String date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + + log.info("执行日期harmPollutionJob。。。。。。。。。。"+date); + + /** + * 测试数据部署时注释 + */ + //date = "2022-10-21"; + lineParam.setDataDate(date); + pollutionFeignClient.processPollutionData(lineParam); + + long b = System.currentTimeMillis(); + log.info("+++++++++++harmPollutionJob执行总时间+++++++++++++++"+(b-a)/1000); + } + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml index 3193e7530..976991c0a 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml @@ -2,7 +2,7 @@ - SELECT DISTINCT t1.* FROM