From 714c82c45e860199a9c6587ddf210132a333d4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Sun, 4 Feb 2024 11:31:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0pms=E6=9A=82=E6=80=81?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=AD=A3=E8=A1=A8=202.=E6=B7=BB=E5=8A=A0pms?= =?UTF-8?q?=E6=9A=82=E6=80=81=E7=AE=97=E6=B3=95=E5=B9=B4=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prepare/executor/MeasurementExecutor.java | 15 ++++++++++ .../mysql/line/RMpEventDetailQMapper.java | 15 ++++++++-- .../mysql/line/RMpEventDetailYMapper.java | 12 ++++++-- .../line/mapping/RMpEventDetailQMapper.xml | 26 ++++++++++++++++- .../line/mapping/RMpEventDetailYMapper.xml | 24 ++++++++++++++- .../Impl/line/RMpEventDetailQServiceImpl.java | 28 +++++++++++++++++- .../Impl/line/RMpEventDetailYServiceImpl.java | 29 ++++++++++++++++++- .../mysql/line/RMpEventDetailQService.java | 6 +++- .../mysql/line/RMpEventDetailYService.java | 5 ++-- 9 files changed, 149 insertions(+), 11 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java index fb82e1565..6e6ff685d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java @@ -39,6 +39,9 @@ public class MeasurementExecutor extends BaseExecutor { private final RMpMonitorEvaluateDService rMpMonitorEvaluateDService; private final RMpEventDetailService rMpEventDetailService; private final RMpEventDetailDService rMpEventDetailDService; + private final RMpEventDetailQService rMpEventDetailQService; + + private final RMpEventDetailYService rMpEventDetailYService; private final DayDataService dayDataService; private final RStatAbnormalDService rStatAbnormalDService; private final ROperatingMonitorService rOperatingMonitorService; @@ -105,6 +108,18 @@ public class MeasurementExecutor extends BaseExecutor { //月表 rMpEventDetailDService.handleMonth(calculatedParam); } + } else if (tag.equalsIgnoreCase("r_mp_event_detail_q")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //季表 + rMpEventDetailQService.handleQuarter(calculatedParam); + } + } else if (tag.equalsIgnoreCase("r_mp_event_detail_y")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //年表 + rMpEventDetailYService.handleYear(calculatedParam); + } } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java index 7994bfa33..ca4643131 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java @@ -1,11 +1,16 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; +import cn.hutool.core.date.DateTime; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.RMpEventDetailMPO; import com.njcn.harmonic.pojo.po.RMpEventDetailQPO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -15,4 +20,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface RMpEventDetailQMapper extends MppBaseMapper { -} \ No newline at end of file + + + List handleQuarter(@Param("lineIds") List lineIds, @Param("dataDate") String dataDate, @Param("beginQuarter") DateTime beginQuarter, @Param("endQuarter") DateTime endQuarter); + + + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailYMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailYMapper.java index cdecfa6ee..b1c6738a6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailYMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailYMapper.java @@ -1,11 +1,16 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; +import cn.hutool.core.date.DateTime; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.RMpEventDetailQPO; import com.njcn.harmonic.pojo.po.RMpEventDetailYPO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -15,4 +20,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface RMpEventDetailYMapper extends MppBaseMapper { -} \ No newline at end of file + + List handleYear(@Param("lineIds") List lineIds, @Param("dataDate") String dataDate, @Param("beginYear") DateTime beginYear, @Param("endYear") DateTime endYear); + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailQMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailQMapper.xml index f34b25fd5..6db43ce79 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailQMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailQMapper.xml @@ -14,4 +14,28 @@ measurement_point_id, data_date, swell_times, sag_times, interrupt_times - \ No newline at end of file + + + + + + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailYMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailYMapper.xml index bd396a6d3..c3ac73a66 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailYMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailYMapper.xml @@ -14,4 +14,26 @@ measurement_point_id, data_date, swell_times, sag_times, interrupt_times - \ No newline at end of file + + + + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailQServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailQServiceImpl.java index aa6621e84..0f308cfb7 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailQServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailQServiceImpl.java @@ -1,12 +1,22 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.harmonic.pojo.po.RMpEventDetailMPO; import com.njcn.harmonic.pojo.po.RMpEventDetailQPO; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailQMapper; +import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailQService; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; + +import java.util.List; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -15,6 +25,22 @@ import org.springframework.stereotype.Service; * @version V1.0.0 */ @Service +@RequiredArgsConstructor public class RMpEventDetailQServiceImpl extends MppServiceImpl implements RMpEventDetailQService{ + + private final RMpEventDetailQMapper rMpEventDetailQMapper; + + @Override + public void handleQuarter(CalculatedParam calculatedParam) { + List lineIds = calculatedParam.getIdList(); + //以尺寸1000分片 + List> pendingIds = ListUtils.partition(lineIds, 1000); + DateTime beginQuarter = DateUtil.beginOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)); + DateTime endQuarter = DateUtil.endOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)); + for (List pendingId : pendingIds) { + List rMpEventDetailQPOList = rMpEventDetailQMapper.handleQuarter(pendingId, DateUtil.format(beginQuarter, DatePattern.NORM_DATE_PATTERN), beginQuarter, endQuarter); + this.saveOrUpdateBatchByMultiId(rMpEventDetailQPOList); + } + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailYServiceImpl.java index c3aeb4987..1c7ccfcbf 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailYServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpEventDetailYServiceImpl.java @@ -1,12 +1,23 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.harmonic.pojo.po.RMpEventDetailQPO; import com.njcn.harmonic.pojo.po.RMpEventDetailYPO; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailQMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailYMapper; +import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.service.mysql.line.RMpEventDetailYService; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; + +import java.util.List; + /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -15,6 +26,22 @@ import org.springframework.stereotype.Service; * @version V1.0.0 */ @Service +@RequiredArgsConstructor public class RMpEventDetailYServiceImpl extends MppServiceImpl implements RMpEventDetailYService{ + private final RMpEventDetailYMapper rMpEventDetailYMapper; + + + @Override + public void handleYear(CalculatedParam calculatedParam) { + List lineIds = calculatedParam.getIdList(); + //以尺寸1000分片 + List> pendingIds = ListUtils.partition(lineIds, 1000); + DateTime beginYear = DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)); + DateTime endYear = DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)); + for (List pendingId : pendingIds) { + List rMpEventDetailYPOList = rMpEventDetailYMapper.handleYear(pendingId, DateUtil.format(beginYear, DatePattern.NORM_DATE_PATTERN), beginYear, endYear); + this.saveOrUpdateBatchByMultiId(rMpEventDetailYPOList); + } + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailQService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailQService.java index 7ad7adae7..491df1d3a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailQService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailQService.java @@ -2,9 +2,10 @@ package com.njcn.prepare.harmonic.service.mysql.line; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.RMpEventDetailQPO; +import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -15,4 +16,7 @@ import com.njcn.harmonic.pojo.po.RMpEventDetailQPO; public interface RMpEventDetailQService extends IMppService { + void handleQuarter(CalculatedParam calculatedParam); + + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailYService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailYService.java index b267d00cf..2dd85f090 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailYService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpEventDetailYService.java @@ -2,9 +2,10 @@ package com.njcn.prepare.harmonic.service.mysql.line; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.RMpEventDetailYPO; +import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/12/28 14:58【需求编号】 @@ -14,5 +15,5 @@ import com.njcn.harmonic.pojo.po.RMpEventDetailYPO; */ public interface RMpEventDetailYService extends IMppService { - + void handleYear(CalculatedParam calculatedParam); }