From a76c98cde64afa0e41ebc503d0015ca750b77125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 25 Sep 2023 15:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=A4=84=E7=90=86=E5=85=BC=E5=AE=B9pq?= =?UTF-8?q?/pms=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/CommTerminalService.java | 2 +- .../service/impl/CommTerminalServiceImpl.java | 7 ++-- pqs-job/job-executor/pom.xml | 4 +-- .../executor/handler/HarmAlarmDetailJob.java | 2 +- .../executor/handler/HarmOverLimitJob.java | 33 +++++++++++++------ .../njcn/executor/handler/RMpPassrateJob.java | 10 +++--- .../njcn/executor/handler/TargetWarnJob.java | 15 +++++---- .../executor/utils/CommonExecutorUtils.java | 1 + .../harmonic/pojo/param/LineParam.java | 3 +- .../line/AlarmDetailController.java | 12 +++---- .../newalgorithm/RMpPassRateController.java | 7 ++-- .../Impl/area/RMpTargetWarnDServiceImpl.java | 14 +++----- .../Impl/line/AlarmDetailServiceImpl.java | 18 +++++----- .../RMpPartHarmonicDetailDServiceImpl.java | 14 ++++---- .../RMpPartHarmonicDetailMServiceImpl.java | 11 +++---- .../Impl/line/RMpPassRateDServiceImpl.java | 29 +++++++--------- .../RMpSurplusHarmonicDetailDServiceImpl.java | 11 +++---- .../RMpSurplusHarmonicDetailMServiceImpl.java | 14 ++++---- .../mysql/line/AlarmDetailService.java | 2 +- .../mysql/line/RMpPassRateDService.java | 3 +- 20 files changed, 105 insertions(+), 107 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java index 1ee14f709..dac5dd5ce 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java @@ -36,7 +36,7 @@ public interface CommTerminalService { */ List deptGetLine(DeptGetLineParam deptGetLineParam); - List deptGetLineByIdList(List monitorIds); + List deptGetLineByIdList(List monitorIds); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java index bdf254063..edcb2a2da 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java @@ -106,11 +106,8 @@ public class CommTerminalServiceImpl implements CommTerminalService { } @Override - public List deptGetLineByIdList(List monitorIds) { - List result = new ArrayList<>(); - - lineMapper.getMonitorListDetail(monitorIds); - return null; + public List deptGetLineByIdList(List monitorIds) { + return lineMapper.getMonitorListDetail(monitorIds); } diff --git a/pqs-job/job-executor/pom.xml b/pqs-job/job-executor/pom.xml index adf27a5dd..d6fe1628e 100644 --- a/pqs-job/job-executor/pom.xml +++ b/pqs-job/job-executor/pom.xml @@ -27,12 +27,12 @@ com.njcn common-core ${project.version} - + com.njcn 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 562502b7f..6fb57dd9e 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 @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; /** * pqs - * 告警异常 + * 数据中心告警异常 */ @Slf4j @Component diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOverLimitJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOverLimitJob.java index b141584b6..2e1d38ac0 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOverLimitJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmOverLimitJob.java @@ -28,8 +28,10 @@ public class HarmOverLimitJob { public void harmonicDetailDay1Job(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam); + log.info("任务：harmonicDetailDay1Job"+lineParam.getBeginTime()+"-------》"+lineParam.getEndTime()); harmOverLimitFeignClient.harmonicDetailDay1(lineParam); } @@ -37,8 +39,10 @@ public class HarmOverLimitJob { public void harmonicDetailDay2Job(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam); + log.info("任务：harmonicDetailDay2Job"+lineParam.getBeginTime()+"-------》"+lineParam.getEndTime()); harmOverLimitFeignClient.harmonicDetailDay2(lineParam); } @@ -46,8 +50,11 @@ public class HarmOverLimitJob { public void harmonicDetailMonth1Job(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam); + log.info("任务：harmonicDetailMonth1Job"+lineParam.getBeginTime()+"-------》"+lineParam.getEndTime()); + harmOverLimitFeignClient.harmonicDetailMonth1(lineParam); } @@ -55,8 +62,11 @@ public class HarmOverLimitJob { public void harmonicDetailMonth2Job(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam); + log.info("任务：harmonicDetailMonth2Job"+lineParam.getBeginTime()+"-------》"+lineParam.getEndTime()); + harmOverLimitFeignClient.harmonicDetailMonth2(lineParam); } @@ -64,8 +74,11 @@ public class HarmOverLimitJob { public void harmonicThdDayJob(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam); + log.info("任务：harmonicThdDayJob"+lineParam.getBeginTime()+"-------》"+lineParam.getEndTime()); + harmOverLimitFeignClient.harmonicThdDay(lineParam); } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpPassrateJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpPassrateJob.java index 24e9f56c6..08a5589ab 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpPassrateJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/RMpPassrateJob.java @@ -31,8 +31,9 @@ public class RMpPassrateJob { log.info(LocalDateTime.now()+"监测点稳态指标合格率_日统计调度开始------------------------"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam); rMpPassrateFeignClient.passRateHandler(lineParam); } @@ -41,8 +42,9 @@ public class RMpPassrateJob { log.info(LocalDateTime.now()+"监测点稳态指标合格率_月统计调度开始------------------------"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam); rMpPassrateFeignClient.passRateHandler(lineParam); } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java index 9eb1640b5..b85d549b7 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/TargetWarnJob.java @@ -28,8 +28,9 @@ public class TargetWarnJob { public void targetDiffJob(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam); targetWarnFeignClient.targetDiff(lineParam); } @@ -37,8 +38,9 @@ public class TargetWarnJob { public void alarmDayJob(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam); targetWarnFeignClient.alarmDay(lineParam); } @@ -46,8 +48,9 @@ public class TargetWarnJob { public void alarmMonthJob(){ LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH)); - lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); - lineParam.setDataSource(2); + //lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH)); + //lineParam.setDataSource(2); + CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam); targetWarnFeignClient.alarmMonth(lineParam); } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java index da1d8cb53..b6b266f89 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java @@ -79,6 +79,7 @@ public class CommonExecutorUtils { } lineParam.setBeginTime(begin); lineParam.setEndTime(end); + lineParam.setDataDate(begin.substring(0,10)); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java index 4eaa3dcdb..97ffe8709 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java @@ -31,8 +31,7 @@ public class LineParam { @NotNull(message = "时间类型不可为空") private Integer type; - @ApiModelProperty(name = "dataDate",value = "时间日期") - @NotBlank(message = "时间不可为空") + @ApiModelProperty(name = "dataDate",value = "时间日期,存的是起始时间的日期类型，去除时分秒") @Deprecated private String dataDate; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/AlarmDetailController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/AlarmDetailController.java index fed8adbd4..413b8df9f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/AlarmDetailController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/AlarmDetailController.java @@ -41,19 +41,15 @@ public class AlarmDetailController extends BaseController { private final IRMpMonitorAlarmCountMService rMpMonitorAlarmCountMService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + /* @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) @PostMapping("/alarmDetailAlarm") @ApiOperation("监测点指标告警日统计") @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) public HttpResult alarmDetailAlarm(@RequestBody @Validated LineParam lineParam) { String methodDescribe = getMethodDescribe("alarmDetailAlarm"); - boolean res = alarmDetailService.alarmDetailAlarm(lineParam); - if(res){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - }else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } + alarmDetailService.alarmDetailAlarm(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }*/ /** * @author xuyang diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpPassRateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpPassRateController.java index 40d68a835..fc0a36262 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpPassRateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RMpPassRateController.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateDService; @@ -43,6 +44,8 @@ public class RMpPassRateController extends BaseController { private final LineFeignClient lineFeignClient; private final RMpPassRateDService rMpPassRateDService; + + private final CommTerminalGeneralClient commTerminalGeneralClient; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/passRateHandler") @ApiOperation("监测点稳态指标合格率统计") @@ -52,13 +55,13 @@ public class RMpPassRateController extends BaseController { String methodDescribe = getMethodDescribe("passRateHandler"); List indexLists = new ArrayList<> (); if(CollectionUtils.isEmpty (lineParam.getLineIds ())){ - indexLists = lineFeignClient.getLineList ( ).getData ( ); + indexLists = commTerminalGeneralClient.getRunMonitorIds ().getData (); }else{ indexLists = lineParam.getLineIds (); } lineParam.setLineIds (indexLists); - rMpPassRateDService.passRateHandler (lineParam); + rMpPassRateDService.passRateHandler(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java index a3ec53a31..7d6dc2b0c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java @@ -3,6 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.area; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.utils.NjcnDateUtils; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.harmonic.pojo.dto.RMpMonitorAlarmCountMDTO; import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO; @@ -76,10 +77,9 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl list = new ArrayList<>(); //月处理 - if (lineParam.getType() == 3){ - int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); - int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); - List dayList = PublicUtil.getDayByMonth(year,month); + if (Objects.equals(true,lineParam.getRepairFlag())){ + + List dayList = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); for (String item : dayList) { log.info(item+"-->开始执行"); List day = getData(item,lineParam.getLineIds()); @@ -99,11 +99,7 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl getDate(LineParam lineParam) { - int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); - int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); - String startTime = PublicUtil.getFisrtDayOfMonth(year,month); - String endTime = PublicUtil.getLastDayOfMonth(year,month); - return this.baseMapper.getDate(startTime,endTime,lineParam.getLineIds()); + return this.baseMapper.getDate(lineParam.getBeginTime(),lineParam.getEndTime(),lineParam.getLineIds()); } public List getData(String time, List list){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java index 2ef8295db..73dc7e3f5 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.utils.NjcnDateUtils; import com.njcn.device.pms.api.DistributionMonitorClient; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.pojo.po.DistributionMonitor; @@ -68,9 +69,9 @@ public class AlarmDetailServiceImpl extends MppServiceImpl lineIds = lineParam.getLineIds(); @@ -111,8 +112,7 @@ public class AlarmDetailServiceImpl extends MppServiceImpl dayList = PublicUtil.getDayByMonth(year,month); - for (String item : dayList) { + if (Objects.equals(true,lineParam.getRepairFlag())){ + List rangeDate = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); + for (String item : rangeDate) { log.info(item+"-->开始执行"); startTime = item + " 00:00:00"; endTime = PublicUtil.getYesterday(item) + " 00:00:00"; @@ -133,7 +131,7 @@ public class AlarmDetailServiceImpl extends MppServiceImpl监测点稳态指标超标明细日表1开始执行"); List result = new ArrayList<>(); if (Objects.equals(lineParam.getType(),5)){ - System.out.println(lineParam.getDataDate()); + System.out.println(lineParam.getLineIds()); - result = getData(lineParam.getDataDate(),lineParam.getLineIds()); + result = getData(lineParam.getBeginTime(),lineParam.getLineIds()); } else if (Objects.equals(lineParam.getType(),3)){ - int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); - int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); - List dayList = PublicUtil.getDayByMonth(year,month); - for (String item : dayList) { + //补招 + List rangeDate = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); + for (String item : rangeDate) { result.addAll(getData(item,lineParam.getLineIds())); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java index f1fb7c646..dfed8f7c3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java @@ -33,14 +33,11 @@ public class RMpPartHarmonicDetailMServiceImpl extends MppServiceImpl监测点稳态指标超标明细月表1开始执行"); - int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); - int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); - String startTime = PublicUtil.getFisrtDayOfMonth(year,month); - String endTime = PublicUtil.getLastDayOfMonth(year,month); - List list = this.baseMapper.getHarmonicDetailMonthOne(startTime,endTime,lineParam.getLineIds()); + + List list = this.baseMapper.getHarmonicDetailMonthOne(lineParam.getBeginTime(),lineParam.getEndTime(),lineParam.getLineIds()); if (!CollectionUtils.isEmpty(list)){ - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate date = LocalDate.parse(startTime, df); + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDate date = LocalDate.parse(lineParam.getBeginTime(), df); list.forEach(item->{ item.setDataDate(date); }); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java index f2f095e09..564630de2 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; +import com.njcn.device.biz.pojo.dto.LineDevGetDTO; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD; @@ -39,7 +41,7 @@ import java.util.Objects; @RequiredArgsConstructor public class RMpPassRateDServiceImpl extends MppServiceImpl implements RMpPassRateDService { - private final LineFeignClient lineFeignClient; + private final CommTerminalGeneralClient commTerminalGeneralClient; private final RMpMonitorEvaluateDService rMpMonitorEvaluateDService; private final RMpPartHarmonicDetailDMapper rMpPartHarmonicDetailDMapper; private final RMpSurplusHarmonicDetailDMapper rMpSurplusHarmonicDetailDMapper; @@ -50,26 +52,19 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl getAll() { - return this.list ( ); - } - - public void passRateHandlerD(LineParam lineParam) { List lineIds = lineParam.getLineIds ( ); - String dataDate = lineParam.getDataDate ( ); + String dataDate = lineParam.getDataDate (); Date date = DateUtil.parse (dataDate); List rMpPassRateDPOList = new ArrayList<> ( ); - QueryWrapper rMpMonitorEvaluateDPOQueryWrapper = new QueryWrapper ( ); + QueryWrapper rMpMonitorEvaluateDPOQueryWrapper = new QueryWrapper<>( ); - QueryWrapper queryWrapper = new QueryWrapper ( ); - QueryWrapper surplusHarmonicDetailDQueryWrapper = new QueryWrapper ( ); + QueryWrapper queryWrapper = new QueryWrapper<>( ); + QueryWrapper surplusHarmonicDetailDQueryWrapper = new QueryWrapper<>( ); lineIds.forEach (temp -> { - LineDetailDataVO data = lineFeignClient.getLineDetailData (temp).getData ( ); - Integer statisticalInterval = data.getTimeInterval ( ); + LineDevGetDTO data = commTerminalGeneralClient.getMonitorDetail (temp).getData ( ); + Integer statisticalInterval = data.getInterval (); rMpMonitorEvaluateDPOQueryWrapper.clear (); rMpMonitorEvaluateDPOQueryWrapper.select ("effective_minute_count"). eq ("measurement_point_id", temp). @@ -130,7 +125,7 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl lineIds = lineParam.getLineIds ( ); - String dataDate = lineParam.getDataDate ( ); + String dataDate = lineParam.getBeginTime (); Date date = DateUtil.parse (dataDate); List rMpPassRateYPOList = new ArrayList<> ( ); @@ -158,7 +153,7 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl lineIds = lineParam.getLineIds ( ); - String dataDate = lineParam.getDataDate ( ); + String dataDate = lineParam.getBeginTime (); Date date = DateUtil.parse (dataDate); List rMpPassRateQPOList = new ArrayList<> ( ); @@ -186,7 +181,7 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl lineIds = lineParam.getLineIds ( ); - String dataDate = lineParam.getDataDate ( ); + String dataDate = lineParam.getBeginTime (); Date date = DateUtil.parse (dataDate); List rMpPassRateMPOList = new ArrayList<> ( ); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java index 561be8b1c..c9e25febf 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.utils.NjcnDateUtils; import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD; import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper; @@ -38,12 +39,10 @@ public class RMpSurplusHarmonicDetailDServiceImpl extends MppServiceImpl监测点稳态指标超标明细日表2开始执行"); List result = new ArrayList<>(); if (Objects.equals(lineParam.getType(),5)){ - result = this.baseMapper.getHarmonicDetailDayTwo(lineParam.getDataDate(),lineParam.getLineIds()); - } else if (Objects.equals(lineParam.getType(),3)){ - int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); - int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); - List dayList = PublicUtil.getDayByMonth(year,month); - for (String item : dayList) { + result = this.baseMapper.getHarmonicDetailDayTwo(lineParam.getBeginTime(),lineParam.getLineIds()); + } else if (lineParam.getRepairFlag()){ + List rangeDate = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); + for (String item : rangeDate) { result.addAll(this.baseMapper.getHarmonicDetailDayTwo(item,lineParam.getLineIds())); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java index 3ea78605e..9c60a467f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java @@ -37,14 +37,14 @@ public class RMpSurplusHarmonicDetailMServiceImpl extends MppServiceImpl监测点稳态指标超标明细月表2开始执行"); - int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); - int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); - String startTime = PublicUtil.getFisrtDayOfMonth(year,month); - String endTime = PublicUtil.getLastDayOfMonth(year,month); - List list = this.baseMapper.getHarmonicDetailMonthTwo(startTime,endTime,lineParam.getLineIds()); + //int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]); + //int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]); + //String startTime = PublicUtil.getFisrtDayOfMonth(year,month); + //String endTime = PublicUtil.getLastDayOfMonth(year,month); + List list = this.baseMapper.getHarmonicDetailMonthTwo(lineParam.getBeginTime(),lineParam.getEndTime(),lineParam.getLineIds()); if (!CollectionUtils.isEmpty(list)){ - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDate date = LocalDate.parse(startTime, df); + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDate date = LocalDate.parse(lineParam.getBeginTime(), df); list.forEach(item->{ item.setDataDate(date); }); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/AlarmDetailService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/AlarmDetailService.java index f20c19184..765dcb705 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/AlarmDetailService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/AlarmDetailService.java @@ -20,7 +20,7 @@ public interface AlarmDetailService { * @date 2022/12/28 * @return */ - boolean alarmDetailAlarm(LineParam lineParam); + //void alarmDetailAlarm(LineParam lineParam); void targetDiff(LineParam lineParam); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java index bc65ab1f9..fef66c1c1 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java @@ -7,7 +7,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import java.util.List; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2023/2/28 15:39【需求编号】 @@ -17,7 +17,6 @@ import java.util.List; */ public interface RMpPassRateDService extends IMppService { - List getAll(); void passRateHandler(LineParam lineParam); }