算法改造:合格率统计日表(是否越限)(r_stat_limit_target_d)

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 @Data
@@ -33,7 +34,7 @@ public class RStatLimitTargetDPO{
      */
     @MppMultiId
     @TableField(value = "time_id")
-    private Date time;
+    private LocalDate time;
 
     /**
      * 总计算次数

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

@@ -1,7 +1,9 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.harmonic.pojo.po.LimitRate;
@@ -15,6 +17,7 @@ import com.njcn.prepare.harmonic.service.mysql.day.IRStatLimitRateDService;
 import com.njcn.prepare.harmonic.service.mysql.line.LimitTargetService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.influxdb.InfluxDB;
 import org.influxdb.dto.BatchPoints;
 import org.influxdb.dto.Point;
@@ -24,6 +27,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -68,7 +72,7 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
     public void limitTargetData(List<String> indexLists,String startTime,String endTime) {
         log.info(LocalDateTime.now()+"r_stat_limit_target_d开始执行=======》");
         List<RStatLimitTargetDPO> list = new ArrayList<>();
-        Date dateOut = DateUtil.parse(startTime);
+        LocalDate dateOut = LocalDate.parse(startTime,DatePattern.NORM_DATE_FORMATTER);
         List<RStatLimitRateDPO> limitRateData = new ArrayList<>();
 
         if (CollUtil.isEmpty(indexLists)){
@@ -90,11 +94,45 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
         log.info(LocalDateTime.now()+"r_stat_limit_target_d开始执行=======》");
     }
 
+    /***********************************************新算法*******************************************************************/
     @Override
     public void limitTargetData(CalculatedParam calculatedParam) {
         log.info(LocalDateTime.now()+"r_stat_limit_target_d开始执行=======》");
-
+        List<RStatLimitTargetDPO> list = new ArrayList<>();
+        List<RStatLimitRateDPO> limitRateData = new ArrayList<>();
+        String startTime = LocalDateTimeUtil.format(
+                LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)),
+                DatePattern.NORM_DATETIME_PATTERN
+        );
+        String endTime = LocalDateTimeUtil.format(
+                LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)),
+                DatePattern.NORM_DATETIME_PATTERN
+        );
+        List<String> lineIds = calculatedParam.getIdList();
+        LocalDate dateOut = LocalDate.parse(calculatedParam.getDataDate(),DatePattern.NORM_DATE_FORMATTER);
+        //以尺寸100分片,查询数据
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        for (List<String> pendingId : pendingIds) {
+            limitRateData.addAll(getLimitRateDataFromMysql(pendingId,startTime,endTime));
         }
+        if (!CollectionUtils.isEmpty(limitRateData)){
+            for (RStatLimitRateDPO limitRate : limitRateData){
+                RStatLimitTargetDPO limitTarget = new RStatLimitTargetDPO();
+                limitTarget.setTime(dateOut);
+                limitTarget.setLineId(limitRate.getLineId());
+                limitTarget.setPhasicType(limitRate.getPhasicType());
+                chanelData(limitRate,limitTarget);
+                list.add(limitTarget);
+            }
+        }
+        this.saveOrUpdateBatchByMultiId(list,100);
+    }
+
+    private List<RStatLimitRateDPO> getLimitRateDataFromMysql(List<String> lineList,String startTime,String endTime){
+        return statLimitRateDService.findList(lineList,startTime,endTime);
+    }
+
+    /***********************************************新算法结束*******************************************************************/
 
     private List<LimitRate> getLimitRateData(String lineId,String date){
         StringBuilder sql = new StringBuilder();
@@ -109,11 +147,6 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
         return resultMapper.toPOJO(sqlResult, LimitRate.class);
     }
 
-    private List<RStatLimitRateDPO> getLimitRateDataFromMysql(List<String> lineList,String startTime,String endTime){
-        return statLimitRateDService.findList(lineList,startTime,endTime);
-    }
-
-
     private List<String> processOutData(List<LimitRate> limitRateData,Date dateOut){
         List<String> records = new ArrayList<>();
         for (LimitRate limitRate : limitRateData){