From 64fa0931c16d5a7a6c72e56004e0d74cd9c9c34a Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 24 Apr 2023 15:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E7=A8=B3=E6=80=81?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=B6=85=E6=A0=87=E6=98=8E=E7=BB=86=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/HarmonicOverLimitController.java | 25 ++++ .../line/RMpPartHarmonicDetailDMapper.java | 2 +- .../line/RMpPartHarmonicDetailMMapper.java | 9 +- .../line/RMpSurplusHarmonicDetailDMapper.java | 2 +- .../line/RMpSurplusHarmonicDetailMMapper.java | 10 +- .../mapping/RMpPartHarmonicDetailDMapper.xml | 6 + .../mapping/RMpPartHarmonicDetailMMapper.xml | 130 ++++++++++++++++++ .../RMpSurplusHarmonicDetailDMapper.xml | 6 + .../RMpSurplusHarmonicDetailMMapper.xml | 74 ++++++++++ .../RMpPartHarmonicDetailDServiceImpl.java | 27 +++- .../RMpPartHarmonicDetailMServiceImpl.java | 50 +++++++ .../RMpSurplusHarmonicDetailDServiceImpl.java | 21 ++- .../RMpSurplusHarmonicDetailMServiceImpl.java | 54 ++++++++ .../line/IRMpPartHarmonicDetailMService.java | 13 ++ .../IRMpSurplusHarmonicDetailMService.java | 12 ++ 15 files changed, 430 insertions(+), 11 deletions(-) create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailMMapper.xml create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpPartHarmonicDetailMService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpSurplusHarmonicDetailMService.java diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicOverLimitController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicOverLimitController.java index 8c54635aa..d1e2e7cb4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicOverLimitController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicOverLimitController.java @@ -8,7 +8,9 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailDService; +import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailMService; import com.njcn.prepare.harmonic.service.mysql.line.IRMpSurplusHarmonicDetailDService; +import com.njcn.prepare.harmonic.service.mysql.line.IRMpSurplusHarmonicDetailMService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -40,6 +42,10 @@ public class HarmonicOverLimitController extends BaseController { private final IRMpSurplusHarmonicDetailDService mpSurplusHarmonicDetailDService; + private final IRMpPartHarmonicDetailMService mpPartHarmonicDetailMService; + + private final IRMpSurplusHarmonicDetailMService mpSurplusHarmonicDetailMService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) @PostMapping("/harmonicDetailDay1") @ApiOperation("监测点稳态指标超标明细日表1") @@ -60,5 +66,24 @@ public class HarmonicOverLimitController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/harmonicDetailMonth1") + @ApiOperation("监测点稳态指标超标明细月表1") + @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) + public HttpResult harmonicDetailMonth1(@RequestBody @Validated LineParam lineParam) { + String methodDescribe = getMethodDescribe("harmonicDetailMonth1"); + mpPartHarmonicDetailMService.insertHarmonicDetailMonthOne(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/harmonicDetailMonth2") + @ApiOperation("监测点稳态指标超标明细月表2") + @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) + public HttpResult harmonicDetailMonth2(@RequestBody @Validated LineParam lineParam) { + String methodDescribe = getMethodDescribe("harmonicDetailMonth2"); + mpSurplusHarmonicDetailMService.insertHarmonicDetailMonthTwo(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailDMapper.java index 1fff2600f..e738d73af 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailDMapper.java @@ -24,5 +24,5 @@ public interface RMpPartHarmonicDetailDMapper extends MppBaseMapper getHarmonicDetailDayOne(String time); + List getHarmonicDetailDayOne(@Param("time") String time,@Param("lineList") List lineList); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailMMapper.java index a30fafdde..952d86079 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailMMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPartHarmonicDetailMMapper.java @@ -1,7 +1,10 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * RMpPartHarmonicDetailMMapper @@ -10,6 +13,8 @@ import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM; * @version 1.0.0 * @createTime 2022/12/12 - 15:21 */ -public interface RMpPartHarmonicDetailMMapper extends BaseMapper { +public interface RMpPartHarmonicDetailMMapper extends MppBaseMapper { + + List getHarmonicDetailMonthOne(@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("lineList") List lineList); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailDMapper.java index 9e364e605..b37460746 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailDMapper.java @@ -26,5 +26,5 @@ public interface RMpSurplusHarmonicDetailDMapper extends MppBaseMapper getHarmonicDetailDayTwo(String time); + List getHarmonicDetailDayTwo(@Param("time") String time,@Param("lineList") List lineList); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailMMapper.java index e3f824a66..1f238c015 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailMMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpSurplusHarmonicDetailMMapper.java @@ -1,7 +1,11 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM; import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * RMpSurplusHarmonicDetailMMapper @@ -10,6 +14,8 @@ import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM; * @version 1.0.0 * @createTime 2022/12/12 - 15:21 */ -public interface RMpSurplusHarmonicDetailMMapper extends BaseMapper { +public interface RMpSurplusHarmonicDetailMMapper extends MppBaseMapper { + + List getHarmonicDetailMonthTwo(@Param("startTime") String startTime,@Param("endTime") String endTime, @Param("lineList") List lineList); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml index 77265e0b4..1ea9b5045 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailDMapper.xml @@ -409,6 +409,12 @@ where t0.phasic_type = 'T' and t0.time_id = #{time} + + and t0.my_index in + + #{item} + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml new file mode 100644 index 000000000..2fcf9830b --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml @@ -0,0 +1,130 @@ + + + + + + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml index e7c5a29de..bca75f48c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailDMapper.xml @@ -132,6 +132,12 @@ where t0.phasic_type = 'T' and t0.time_id = #{time} + + and t0.my_index in + + #{item} + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailMMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailMMapper.xml new file mode 100644 index 000000000..430a69084 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpSurplusHarmonicDetailMMapper.xml @@ -0,0 +1,74 @@ + + + + + + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java index c1e0ff204..7953cfe58 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java @@ -1,16 +1,22 @@ 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.harmonic.pojo.po.RMpPartHarmonicDetailD; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailDService; +import com.njcn.prepare.harmonic.utils.PublicUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 类的介绍： @@ -19,6 +25,7 @@ import java.util.List; * @version 1.0.0 * @createTime 2023/4/23 15:08 */ +@Slf4j @Service public class RMpPartHarmonicDetailDServiceImpl extends MppServiceImpl implements IRMpPartHarmonicDetailDService { @@ -26,7 +33,23 @@ public class RMpPartHarmonicDetailDServiceImpl extends MppServiceImpl list = this.baseMapper.getHarmonicDetailDayOne(lineParam.getDataDate()); + log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表1开始执行"); + List result = new ArrayList<>(); + if (Objects.equals(lineParam.getType(),5)){ + result = getData(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.addAll(getData(item,lineParam.getLineIds())); + } + } + this.saveOrUpdateBatchByMultiId(result,50); + } + + public List getData(String time,List lineList) { + List list = this.baseMapper.getHarmonicDetailDayOne(time,lineList); if (!CollectionUtils.isEmpty(list)){ list.forEach(item->{ if (item.getIsFreq()>0 || item.getIsVDev()>0 || item.getIsV()>0 || item.getIsI()>0 || item.getIsUnbalance()>0 || item.getIsINeg()>0 || item.getIsFlicker()>0 || item.getIsInuharm()>0){ @@ -35,7 +58,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends MppServiceImpl implements IRMpPartHarmonicDetailMService { + + @Override + @Transactional(rollbackFor = {Exception.class}) + @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]); + String startTime = PublicUtil.getFisrtDayOfMonth(year,month); + String endTime = PublicUtil.getLastDayOfMonth(year,month); + List list = this.baseMapper.getHarmonicDetailMonthOne(startTime,endTime,lineParam.getLineIds()); + if (!CollectionUtils.isEmpty(list)){ + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate date = LocalDate.parse(startTime, df); + list.forEach(item->{ + item.setDataDate(date); + }); + this.saveOrUpdateBatchByMultiId(list,50); + } + } +} 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 8e51181f3..561be8b1c 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 @@ -8,12 +8,17 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapp import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.IRMpPartHarmonicDetailDService; import com.njcn.prepare.harmonic.service.mysql.line.IRMpSurplusHarmonicDetailDService; +import com.njcn.prepare.harmonic.utils.PublicUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 类的介绍： @@ -22,6 +27,7 @@ import java.util.List; * @version 1.0.0 * @createTime 2023/4/23 15:08 */ +@Slf4j @Service public class RMpSurplusHarmonicDetailDServiceImpl extends MppServiceImpl implements IRMpSurplusHarmonicDetailDService { @@ -29,9 +35,18 @@ public class RMpSurplusHarmonicDetailDServiceImpl extends MppServiceImpl list = this.baseMapper.getHarmonicDetailDayTwo(lineParam.getDataDate()); - if (!CollectionUtils.isEmpty(list)){ - this.saveOrUpdateBatchByMultiId(list,50); + log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表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.addAll(this.baseMapper.getHarmonicDetailDayTwo(item,lineParam.getLineIds())); + } } + this.saveOrUpdateBatchByMultiId(result,50); } } 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 new file mode 100644 index 000000000..3ea78605e --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailMServiceImpl.java @@ -0,0 +1,54 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.line; + +import com.alibaba.nacos.client.naming.utils.CollectionUtils; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM; +import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD; +import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailM; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailMMapper; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.service.mysql.line.IRMpSurplusHarmonicDetailMService; +import com.njcn.prepare.harmonic.utils.PublicUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * 类的介绍： + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/4/23 16:15 + */ +@Slf4j +@Service +public class RMpSurplusHarmonicDetailMServiceImpl extends MppServiceImpl implements IRMpSurplusHarmonicDetailMService { + + @Override + @Transactional(rollbackFor = {Exception.class}) + @Async("asyncExecutor") + public void insertHarmonicDetailMonthTwo(LineParam lineParam) { + log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细月表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()); + if (!CollectionUtils.isEmpty(list)){ + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate date = LocalDate.parse(startTime, df); + list.forEach(item->{ + item.setDataDate(date); + }); + this.saveOrUpdateBatchByMultiId(list,50); + } + } +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpPartHarmonicDetailMService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpPartHarmonicDetailMService.java new file mode 100644 index 000000000..4bba33010 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpPartHarmonicDetailMService.java @@ -0,0 +1,13 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.njcn.prepare.harmonic.pojo.param.LineParam; + +public interface IRMpPartHarmonicDetailMService { + + /** + * 计算监测点稳态指标超标明细月表1数据 + * @param lineParam + */ + void insertHarmonicDetailMonthOne(LineParam lineParam); + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpSurplusHarmonicDetailMService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpSurplusHarmonicDetailMService.java new file mode 100644 index 000000000..4d49a4363 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpSurplusHarmonicDetailMService.java @@ -0,0 +1,12 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.njcn.prepare.harmonic.pojo.param.LineParam; + +public interface IRMpSurplusHarmonicDetailMService { + + /** + * 计算监测点稳态指标超标明细月表2数据 + * @param lineParam + */ + void insertHarmonicDetailMonthTwo(LineParam lineParam); +}