预处理兼容pq/pms处理

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<DeptGetChildrenMoreDTO> deptGetLine(DeptGetLineParam deptGetLineParam);
 
-    List<DeptGetChildrenMoreDTO> deptGetLineByIdList(List<String> monitorIds);
+    List<LineDevGetDTO> deptGetLineByIdList(List<String> monitorIds);
 
 
 

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<DeptGetChildrenMoreDTO> deptGetLineByIdList(List<String> monitorIds) {
+    public List<LineDevGetDTO> deptGetLineByIdList(List<String> monitorIds) {
-        List<DeptGetChildrenMoreDTO> result = new ArrayList<>();
+        return lineMapper.getMonitorListDetail(monitorIds);
-
-        lineMapper.getMonitorListDetail(monitorIds);
-        return null;
     }
 
 

pqs-job/job-executor/pom.xml

@@ -27,12 +27,12 @@
             <groupId>com.njcn</groupId>
             <artifactId>common-core</artifactId>
             <version>${project.version}</version>
-            <exclusions>
+          <!--  <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
                 </exclusion>
-            </exclusions>
+            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>

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

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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //lineParam.setDataSource(2);
+        CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_DAY,lineParam);
+        log.info("任务：harmonicThdDayJob"+lineParam.getBeginTime()+"-------》"+lineParam.getEndTime());
+
         harmOverLimitFeignClient.harmonicThdDay(lineParam);
     }
 }

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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
-        lineParam.setDataSource(2);
+        //lineParam.setDataSource(2);
+        CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
         rMpPassrateFeignClient.passRateHandler(lineParam);
     }
 

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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));
-        lineParam.setDataSource(2);
+        //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.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_MONTH));
-        lineParam.setDataSource(2);
+        //lineParam.setDataSource(2);
+        CommonExecutorUtils.commDefineDate(BizParamConstant.STAT_BIZ_MONTH,lineParam);
         targetWarnFeignClient.alarmMonth(lineParam);
     }
 }

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

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 = "时间日期")
+    @ApiModelProperty(name = "dataDate",value = "时间日期,存的是起始时间的日期类型，去除时分秒")
-    @NotBlank(message = "时间不可为空")
     @Deprecated
     private String dataDate;
 

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<Boolean> alarmDetailAlarm(@RequestBody @Validated LineParam lineParam) {
         String methodDescribe = getMethodDescribe("alarmDetailAlarm");
-        boolean res = alarmDetailService.alarmDetailAlarm(lineParam);
+        alarmDetailService.alarmDetailAlarm(lineParam);
-        if(res){
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
-        }else {
+    }*/
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
-        }
-    }
 
     /**
      * @author xuyang

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,7 +55,7 @@ public class RMpPassRateController extends BaseController {
         String methodDescribe = getMethodDescribe("passRateHandler");
         List<String> indexLists = new ArrayList<> ();
         if(CollectionUtils.isEmpty (lineParam.getLineIds ())){
-            indexLists = lineFeignClient.getLineList ( ).getData ( );
+            indexLists = commTerminalGeneralClient.getRunMonitorIds ().getData ();
         }else{
             indexLists = lineParam.getLineIds ();
         }

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<RMpTargetWarnDMapp
     public void alarmDay(LineParam lineParam) {
         List<RMpTargetWarnDPO> list = new ArrayList<>();
         //月处理
-        if (lineParam.getType() == 3){
+        if (Objects.equals(true,lineParam.getRepairFlag())){
-            int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
+
-            int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
+            List<String> dayList = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
-            List<String> dayList = PublicUtil.getDayByMonth(year,month);
             for (String item : dayList) {
                 log.info(item+"-->开始执行");
                 List<RMpTargetWarnDPO> day = getData(item,lineParam.getLineIds());
@@ -99,11 +99,7 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapp
 
     @Override
     public List<RMpMonitorAlarmCountMDTO> getDate(LineParam lineParam) {
-        int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
+        return this.baseMapper.getDate(lineParam.getBeginTime(),lineParam.getEndTime(),lineParam.getLineIds());
-        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());
     }
 
     public List<RMpTargetWarnDPO> getData(String time, List<String> list){

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<AlarmMapper, RMpTarge
      * @date 2022/12/28
      * @return
      */
-    @Override
+  /*  @Override
     @Async("asyncExecutor")
-    public boolean alarmDetailAlarm(LineParam lineParam) {
+    public void alarmDetailAlarm(LineParam lineParam) {
         //初始化
         String date = lineParam.getDataDate();
         List<String> lineIds = lineParam.getLineIds();
@@ -111,8 +112,7 @@ public class AlarmDetailServiceImpl extends MppServiceImpl<AlarmMapper, RMpTarge
                 processInterruptTimesAlarm(date,type, lineId);
             }
         }
-        return true;
+    }*/
-    }
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -120,11 +120,9 @@ public class AlarmDetailServiceImpl extends MppServiceImpl<AlarmMapper, RMpTarge
     public void targetDiff(LineParam lineParam) {
         String startTime,endTime;
         //月处理
-        if (lineParam.getType() == 3){
+        if (Objects.equals(true,lineParam.getRepairFlag())){
-            int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
+            List<String> rangeDate = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
-            int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
+            for (String item : rangeDate) {
-            List<String> dayList = PublicUtil.getDayByMonth(year,month);
-            for (String item : dayList) {
                 log.info(item+"-->开始执行");
                 startTime = item + " 00:00:00";
                 endTime = PublicUtil.getYesterday(item) +  " 00:00:00";
@@ -133,7 +131,7 @@ public class AlarmDetailServiceImpl extends MppServiceImpl<AlarmMapper, RMpTarge
         }
         //日处理
         else {
-            startTime = lineParam.getDataDate() + " 00:00:00";
+            startTime = lineParam.getBeginTime();
             endTime = PublicUtil.getYesterday(lineParam.getDataDate()) +  " 00:00:00";
             diffData(startTime,endTime,lineParam.getLineIds());
         }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java

@@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.common.utils.NjcnDateUtils;
 import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
@@ -20,7 +21,7 @@ import java.util.Objects;
 
 /**
  * 类的介绍：
- *
+ * r_mp_part_harmonic_detail_d算法
  * @author xuyang
  * @version 1.0.0
  * @createTime 2023/4/23 15:08
@@ -36,14 +37,13 @@ public class RMpPartHarmonicDetailDServiceImpl extends MppServiceImpl<RMpPartHar
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表1开始执行");
         List<RMpPartHarmonicDetailD> 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<String> rangeDate = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
-            List<String> dayList = PublicUtil.getDayByMonth(year,month);
+            for (String item : rangeDate) {
-            for (String item : dayList) {
                 result.addAll(getData(item,lineParam.getLineIds()));
             }
         }

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<RMpPartHar
     @Async("asyncExecutor")
     public void insertHarmonicDetailMonthOne(LineParam lineParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细月表1开始执行");
-        int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
+
-        int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
+        List<RMpPartHarmonicDetailM> list = this.baseMapper.getHarmonicDetailMonthOne(lineParam.getBeginTime(),lineParam.getEndTime(),lineParam.getLineIds());
-        String startTime = PublicUtil.getFisrtDayOfMonth(year,month);
-        String endTime = PublicUtil.getLastDayOfMonth(year,month);
-        List<RMpPartHarmonicDetailM> list = this.baseMapper.getHarmonicDetailMonthOne(startTime,endTime,lineParam.getLineIds());
         if (!CollectionUtils.isEmpty(list)){
-            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDate date = LocalDate.parse(startTime, df);
+            LocalDate date = LocalDate.parse(lineParam.getBeginTime(), df);
             list.forEach(item->{
                 item.setDataDate(date);
             });

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<RMpPassRateDMapper, RMpPassRateDPO> 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<RMpPassRateDMapper,
 
 
 
-    @DS("process")
-    @Override
-    public List<RMpPassRateDPO> getAll() {
-        return this.list ( );
-    }
-
-
     public void passRateHandlerD(LineParam lineParam) {
         List<String> lineIds = lineParam.getLineIds ( );
         String dataDate = lineParam.getDataDate ();
         Date date = DateUtil.parse (dataDate);
         List<RMpPassRateDPO> rMpPassRateDPOList = new ArrayList<> ( );
-        QueryWrapper<RMpMonitorEvaluateDPO> rMpMonitorEvaluateDPOQueryWrapper = new QueryWrapper ( );
+        QueryWrapper<RMpMonitorEvaluateDPO> rMpMonitorEvaluateDPOQueryWrapper = new QueryWrapper<>( );
 
-        QueryWrapper<RMpPartHarmonicDetailD> queryWrapper = new QueryWrapper ( );
+        QueryWrapper<RMpPartHarmonicDetailD> queryWrapper = new QueryWrapper<>( );
-        QueryWrapper<RMpSurplusHarmonicDetailD> surplusHarmonicDetailDQueryWrapper = new QueryWrapper ( );
+        QueryWrapper<RMpSurplusHarmonicDetailD> surplusHarmonicDetailDQueryWrapper = new QueryWrapper<>( );
 
         lineIds.forEach (temp -> {
-            LineDetailDataVO data = lineFeignClient.getLineDetailData (temp).getData ( );
+            LineDevGetDTO data = commTerminalGeneralClient.getMonitorDetail (temp).getData ( );
-            Integer statisticalInterval = data.getTimeInterval ( );
+            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<RMpPassRateDMapper,
 
     private void passRateHandlerY(LineParam lineParam) {
         List<String> lineIds = lineParam.getLineIds ( );
-        String dataDate = lineParam.getDataDate ( );
+        String dataDate = lineParam.getBeginTime ();
         Date date = DateUtil.parse (dataDate);
         List<RMpPassRateYPO> rMpPassRateYPOList = new ArrayList<> ( );
 
@@ -158,7 +153,7 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl<RMpPassRateDMapper,
     private void passRateHandlerQ(LineParam lineParam) {
 
         List<String> lineIds = lineParam.getLineIds ( );
-        String dataDate = lineParam.getDataDate ( );
+        String dataDate = lineParam.getBeginTime ();
         Date date = DateUtil.parse (dataDate);
         List<RMpPassRateQPO> rMpPassRateQPOList = new ArrayList<> ( );
 
@@ -186,7 +181,7 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl<RMpPassRateDMapper,
     private void passRateHandlerM(LineParam lineParam) {
 
         List<String> lineIds = lineParam.getLineIds ( );
-        String dataDate = lineParam.getDataDate ( );
+        String dataDate = lineParam.getBeginTime ();
         Date date = DateUtil.parse (dataDate);
         List<RMpPassRateMPO> rMpPassRateMPOList = new ArrayList<> ( );
 

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<RMpSurp
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表2开始执行");
         List<RMpSurplusHarmonicDetailD> result = new ArrayList<>();
         if (Objects.equals(lineParam.getType(),5)){
-            result = this.baseMapper.getHarmonicDetailDayTwo(lineParam.getDataDate(),lineParam.getLineIds());
+            result = this.baseMapper.getHarmonicDetailDayTwo(lineParam.getBeginTime(),lineParam.getLineIds());
-        } else if (Objects.equals(lineParam.getType(),3)){
+        } else if (lineParam.getRepairFlag()){
-            int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
+            List<String> rangeDate = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
-            int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
+            for (String item : rangeDate) {
-            List<String> dayList = PublicUtil.getDayByMonth(year,month);
-            for (String item : dayList) {
                 result.addAll(this.baseMapper.getHarmonicDetailDayTwo(item,lineParam.getLineIds()));
             }
         }

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<RMpSurp
     @Async("asyncExecutor")
     public void insertHarmonicDetailMonthTwo(LineParam lineParam) {
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细月表2开始执行");
-        int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
+        //int year = Integer.parseInt(lineParam.getDataDate().split("-")[0]);
-        int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
+        //int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
-        String startTime = PublicUtil.getFisrtDayOfMonth(year,month);
+        //String startTime = PublicUtil.getFisrtDayOfMonth(year,month);
-        String endTime = PublicUtil.getLastDayOfMonth(year,month);
+        //String endTime = PublicUtil.getLastDayOfMonth(year,month);
-        List<RMpSurplusHarmonicDetailM> list = this.baseMapper.getHarmonicDetailMonthTwo(startTime,endTime,lineParam.getLineIds());
+        List<RMpSurplusHarmonicDetailM> list = this.baseMapper.getHarmonicDetailMonthTwo(lineParam.getBeginTime(),lineParam.getEndTime(),lineParam.getLineIds());
         if (!CollectionUtils.isEmpty(list)){
-            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDate date = LocalDate.parse(startTime, df);
+            LocalDate date = LocalDate.parse(lineParam.getBeginTime(), df);
             list.forEach(item->{
                 item.setDataDate(date);
             });

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

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java

@@ -17,7 +17,6 @@ import java.util.List;
  */
 public interface RMpPassRateDService extends IMppService<RMpPassRateDPO> {
 
-    List<RMpPassRateDPO> getAll();
 
     void passRateHandler(LineParam lineParam);
 }