添加算法

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusStationEventStartisMPOServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
@@ -49,11 +50,11 @@ public class RDimBusStationEventStartisMPOServiceImpl extends MppServiceImpl<RDi
     @Override
     public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimBusStationEventStartisMPO> poList = new ArrayList<>();
-        LocalDate date = LocalDate.parse(calculatedParam.getDataDate());
         //获取日期
         DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         List<DictData> eventStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        LocalDate localDate = LocalDateTimeUtil.parseDate( DateUtil.format(begin, DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATE_PATTERN);
 
 
         for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
@@ -76,7 +77,7 @@ public class RDimBusStationEventStartisMPOServiceImpl extends MppServiceImpl<RDi
                 }
                 RDimBusStationEventStartisMPO rDimBusStationEventStartisMPO = new RDimBusStationEventStartisMPO();
                 rDimBusStationEventStartisMPO.setOrgId(deptGetChildrenMoreDTO.getUnitId());
-                rDimBusStationEventStartisMPO.setStatisDate(date);
+                rDimBusStationEventStartisMPO.setStatisDate(localDate);
                 rDimBusStationEventStartisMPO.setStartisType(dictData.getId());
 
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusStationEventStartisYPOServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
@@ -49,11 +50,11 @@ public class RDimBusStationEventStartisYPOServiceImpl extends MppServiceImpl<RDi
     @Override
     public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimBusStationEventStartisYPO> poList = new ArrayList<>();
-        LocalDate date = LocalDate.parse(calculatedParam.getDataDate());
         //获取日期
         DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         List<DictData> eventStatis = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
+        LocalDate localDate = LocalDateTimeUtil.parseDate( DateUtil.format(begin, DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATE_PATTERN);
 
 
         for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
@@ -76,7 +77,7 @@ public class RDimBusStationEventStartisYPOServiceImpl extends MppServiceImpl<RDi
                 }
                 RDimBusStationEventStartisYPO rDimBusStationEventStartisYPO = new RDimBusStationEventStartisYPO();
                 rDimBusStationEventStartisYPO.setOrgId(deptGetChildrenMoreDTO.getUnitId());
-                rDimBusStationEventStartisYPO.setStatisDate(date);
+                rDimBusStationEventStartisYPO.setStatisDate(localDate);
                 rDimBusStationEventStartisYPO.setStartisType(dictData.getId());
 
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusTargetMPOServiceImpl.java

@@ -4,13 +4,12 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.harmonic.pojo.po.dim.RDimBusTargetDPO;
+import com.njcn.harmonic.pojo.po.dim.RDimBusTargetMPO;
 import com.njcn.harmonic.pojo.po.dim.RDimBusbarHarmnicDPO;
+import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimBusTargetMPOMapper;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.service.mysql.dim.RDimBusTargetDPOService;
 import com.njcn.prepare.harmonic.service.mysql.dim.RDimBusTargetMPOService;
 import com.njcn.prepare.harmonic.service.mysql.dim.RDimBusbarHarmnicDPOService;
 import com.njcn.system.api.DicDataFeignClient;
@@ -19,8 +18,6 @@ import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimBusTargetMPOMapper;
-import com.njcn.harmonic.pojo.po.dim.RDimBusTargetMPO;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
@@ -48,10 +45,11 @@ public class RDimBusTargetMPOServiceImpl extends MppServiceImpl<RDimBusTargetMPO
         //指标对象类型
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
         //获取日期
         DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
+        LocalDate localDate = LocalDateTimeUtil.parseDate( DateUtil.format(begin, DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATE_PATTERN);
+
         List<String> collect = indicatorTypeDate.stream().filter(temp -> Objects.equals(temp.getCode(), DicDataEnum.VOLTAGE_DEV.getCode()) ||
                 Objects.equals(temp.getCode(), DicDataEnum.FLICKER.getCode()) ||
                 Objects.equals(temp.getCode(), DicDataEnum.PHASE_VOLTAGE.getCode()) ||

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusTargetYPOServiceImpl.java

@@ -4,13 +4,12 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
-import com.njcn.harmonic.pojo.po.dim.RDimBusTargetMPO;
+import com.njcn.harmonic.pojo.po.dim.RDimBusTargetYPO;
 import com.njcn.harmonic.pojo.po.dim.RDimBusbarHarmnicDPO;
+import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimBusTargetYPOMapper;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.service.mysql.dim.RDimBusTargetDPOService;
 import com.njcn.prepare.harmonic.service.mysql.dim.RDimBusTargetYPOService;
 import com.njcn.prepare.harmonic.service.mysql.dim.RDimBusbarHarmnicDPOService;
 import com.njcn.system.api.DicDataFeignClient;
@@ -19,9 +18,6 @@ import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.harmonic.pojo.po.dim.RDimBusTargetYPO;
-import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimBusTargetYPOMapper;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
@@ -48,10 +44,11 @@ public class RDimBusTargetYPOServiceImpl extends MppServiceImpl<RDimBusTargetYPO
         //指标对象类型
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
-        LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
         //获取日期
         DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
+        LocalDate localDate = LocalDateTimeUtil.parseDate( DateUtil.format(begin, DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATE_PATTERN);
+
         List<String> collect = indicatorTypeDate.stream().filter(temp -> Objects.equals(temp.getCode(), DicDataEnum.VOLTAGE_DEV.getCode()) ||
                 Objects.equals(temp.getCode(), DicDataEnum.FLICKER.getCode()) ||
                 Objects.equals(temp.getCode(), DicDataEnum.PHASE_VOLTAGE.getCode()) ||

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalMServiceImpl.java

@@ -52,9 +52,10 @@ public class RDimObjGlobalMServiceImpl extends MppServiceImpl<RDimObjGlobalMMapp
     public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjGlobalM> rDimObjGlobalMS = new ArrayList<>();
 
-        LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
         String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
         String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
+
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
         //过滤电压总谐波畸变率、2-50次谐波电流、三相不平衡、负序电流、闪变

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjGlobalYServiceImpl.java

@@ -52,9 +52,10 @@ public class RDimObjGlobalYServiceImpl extends MppServiceImpl<RDimObjGlobalYMapp
     public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjGlobalY> rDimObjGlobalYS = new ArrayList<>();
 
-        LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
         String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
         String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
+
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
         //过滤电压总谐波畸变率、2-50次谐波电流、三相不平衡、负序电流、闪变

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetMServiceImpl.java

@@ -52,9 +52,10 @@ public class RDimObjTargetMServiceImpl extends MppServiceImpl<RDimObjTargetMMapp
     public void handleMonth(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjTargetM> rdiObjTargetMs = new ArrayList<>();
 
-        LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
         String begin = LocalDateTimeUtil.format(DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
         String end = LocalDateTimeUtil.format(DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
+
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
         //过滤电压总谐波畸变率、2-50次谐波电流、三相不平衡、负序电流、闪变

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjTargetYServiceImpl.java

@@ -52,9 +52,10 @@ public class RDimObjTargetYServiceImpl extends MppServiceImpl<RDimObjTargetYMapp
     public void handleYear(CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam) {
         List<RDimObjTargetY> rdiObjTargetys = new ArrayList<>();
 
-        LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN);
         String begin = LocalDateTimeUtil.format(DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
         String end = LocalDateTimeUtil.format(DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toLocalDateTime(),DatePattern.NORM_DATETIME_PATTERN);
+        LocalDate localDate = LocalDateTimeUtil.parseDate(begin, DatePattern.NORM_DATE_PATTERN);
+
         List<DictData> indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.STEADY_STATIS.getCode()).getData();
         //过滤电压总谐波畸变率、2-50次谐波电流、三相不平衡、负序电流、闪变