From 056c19195a862a0ef6048ee9063347d9f920629f Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 9 May 2023 09:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/RMpTargetWarnDController.java | 33 ++++--- .../Impl/area/RMpTargetWarnDServiceImpl.java | 65 ++++++++++++++ .../Impl/line/RMpTargetWarnDServiceImpl.java | 90 ------------------- .../mysql/area/RMpTargetWarnDService.java | 23 +++-- .../mysql/line/IRMpTargetWarnDService.java | 19 ---- 5 files changed, 95 insertions(+), 135 deletions(-) delete mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpTargetWarnDServiceImpl.java delete mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpTargetWarnDService.java diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RMpTargetWarnDController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RMpTargetWarnDController.java index 793ccfe79..cd0f5d79c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RMpTargetWarnDController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RMpTargetWarnDController.java @@ -8,7 +8,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; 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.IRMpTargetWarnDService; +import com.njcn.prepare.harmonic.service.mysql.area.RMpTargetWarnDService; +import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -18,9 +19,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; -import com.njcn.web.controller.BaseController; /** *

@@ -38,20 +37,20 @@ import com.njcn.web.controller.BaseController; @AllArgsConstructor public class RMpTargetWarnDController extends BaseController { -// private final IRMpTargetWarnDService irMpTargetWarnDService; -// -// /** -// * @author xuyang -// */ -// @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) -// @PostMapping("/alarmDay") -// @ApiOperation("监测点指标告警日统计") -// @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) -// public HttpResult alarmDay(@RequestBody @Validated LineParam lineParam) { -// String methodDescribe = getMethodDescribe("alarmDay"); -// irMpTargetWarnDService.alarmDay(lineParam); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); -// } + private final RMpTargetWarnDService rMpTargetWarnDService; + + /** + * @author xuyang + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/alarmDay") + @ApiOperation("监测点指标告警日统计") + @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) + public HttpResult alarmDay(@RequestBody @Validated LineParam lineParam) { + String methodDescribe = getMethodDescribe("alarmDay"); + rMpTargetWarnDService.alarmDay(lineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java index b20dcdb6c..334dab1cf 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java @@ -5,12 +5,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO; import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper; +import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper; +import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpTargetDiffDPO; +import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.area.RMpTargetWarnDService; +import com.njcn.prepare.harmonic.service.mysql.line.AlarmDetailService; +import com.njcn.prepare.harmonic.utils.PublicUtil; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * Description: @@ -22,11 +31,17 @@ import java.util.List; */ @Service @DS("master") +@AllArgsConstructor public class RMpTargetWarnDServiceImpl extends MppServiceImpl implements RMpTargetWarnDService { private @Autowired RMpTargetWarnDMapper rMpTargetWarnDMapper; + + private final AlarmDetailService alarmDetailService; + + private final RStatDataVDMapper rStatDataVDMapper; + /** * @param monitorIdList * @param dataDate @@ -51,4 +66,54 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl rlList,uclList; + //本年的rm值 + List rmList = alarmDetailService.getAvgDiffData(lineParam); + //本年的CL值 + List clList = rStatDataVDMapper.getAvgDayData(lineParam.getDataDate(), PublicUtil.getLastYearDay(lineParam.getDataDate())); + //本年的RL值 + if (!CollectionUtils.isEmpty(rmList)){ + rlList = rmList.stream().map(item->{ + AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO(); + alarmDetailDayDTO.setLineId(item.getLineId()); + alarmDetailDayDTO.setVlDev(item.getVlDev()*3.3); + alarmDetailDayDTO.setFreqDev(item.getFreqDev()*3.3); + alarmDetailDayDTO.setVUnbalance(item.getVUnbalance()*3.3); + alarmDetailDayDTO.setVHarmonic(item.getVHarmonic()*3.3); + alarmDetailDayDTO.setSagTimes(item.getSagTimes()*3.3); + alarmDetailDayDTO.setInterruptTimes(item.getInterruptTimes()*3.3); + return alarmDetailDayDTO; + }).collect(Collectors.toList()); + } + //本年的UCL值 + if (!CollectionUtils.isEmpty(rmList) && !CollectionUtils.isEmpty(clList)){ + uclList = rmList.stream().map(map->clList.stream().filter(m-> Objects.equals(m.getLineId(),map.getLineId())).findFirst().map(m->{ + AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO(); + alarmDetailDayDTO.setLineId(map.getLineId()); + alarmDetailDayDTO.setVlDev(m.getVlDev()+map.getVlDev()*3); + alarmDetailDayDTO.setFreqDev(m.getFreqDev()+map.getFreqDev()*3); + alarmDetailDayDTO.setVUnbalance(m.getVUnbalance()+map.getVUnbalance()*3); + alarmDetailDayDTO.setVHarmonic(m.getVHarmonic()+map.getVHarmonic()*3); + alarmDetailDayDTO.setSagTimes(m.getSagTimes()+map.getSagTimes()*3); + alarmDetailDayDTO.setInterruptTimes(m.getInterruptTimes()+map.getInterruptTimes()*3); + return alarmDetailDayDTO; + }).orElse(null)).filter(Objects::nonNull).collect(Collectors.toList()); + } + + String yesterday = PublicUtil.getYesterday(lineParam.getDataDate()); + List todayList = rStatDataVDMapper.getDayData(lineParam.getDataDate()); + List yesterdayList = rStatDataVDMapper.getDayData(yesterday); + List theDayBeforeYesterday = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(yesterday)); + List threeDaysAgo = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(PublicUtil.getYesterday(yesterday))); + + + } + + @Override + public void alarmMonth(LineParam lineParam) { + + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpTargetWarnDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpTargetWarnDServiceImpl.java deleted file mode 100644 index d99161fd8..000000000 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpTargetWarnDServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -//package com.njcn.prepare.harmonic.service.mysql.Impl.line; -// -//import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -//import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO; -//import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper; -//import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper; -//import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO; -//import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpTargetDiffDPO; -//import com.njcn.prepare.harmonic.pojo.param.LineParam; -//import com.njcn.prepare.harmonic.service.mysql.line.AlarmDetailService; -//import com.njcn.prepare.harmonic.service.mysql.line.IRMpTargetWarnDService; -//import com.njcn.prepare.harmonic.utils.PublicUtil; -//import lombok.AllArgsConstructor; -//import org.checkerframework.checker.units.qual.A; -//import org.springframework.stereotype.Service; -//import org.springframework.util.CollectionUtils; -// -//import java.util.ArrayList; -//import java.util.List; -//import java.util.Objects; -//import java.util.stream.Collectors; -// -///** -// *

-// * 服务实现类 -// *

-// * -// * @author xuyang -// * @since 2023-05-08 -// */ -//@Service -//@AllArgsConstructor -//public class RMpTargetWarnDServiceImpl extends MppServiceImpl implements IRMpTargetWarnDService { -// -// private final AlarmDetailService alarmDetailService; -// -// private final RStatDataVDMapper rStatDataVDMapper; -// -// @Override -// public void alarmDay(LineParam lineParam) { -// List rlList,uclList; -// //本年的rm值 -// List rmList = alarmDetailService.getAvgDiffData(lineParam); -// //本年的CL值 -// List clList = rStatDataVDMapper.getAvgDayData(lineParam.getDataDate(), PublicUtil.getLastYearDay(lineParam.getDataDate())); -// //本年的RL值 -// if (!CollectionUtils.isEmpty(rmList)){ -// rlList = rmList.stream().map(item->{ -// AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO(); -// alarmDetailDayDTO.setLineId(item.getLineId()); -// alarmDetailDayDTO.setVlDev(item.getVlDev()*3.3); -// alarmDetailDayDTO.setFreqDev(item.getFreqDev()*3.3); -// alarmDetailDayDTO.setVUnbalance(item.getVUnbalance()*3.3); -// alarmDetailDayDTO.setVHarmonic(item.getVHarmonic()*3.3); -// alarmDetailDayDTO.setSagTimes(item.getSagTimes()*3.3); -// alarmDetailDayDTO.setInterruptTimes(item.getInterruptTimes()*3.3); -// return alarmDetailDayDTO; -// }).collect(Collectors.toList()); -// } -// //本年的UCL值 -// if (!CollectionUtils.isEmpty(rmList) && !CollectionUtils.isEmpty(clList)){ -// uclList = rmList.stream().map(map->clList.stream().filter(m-> Objects.equals(m.getLineId(),map.getLineId())).findFirst().map(m->{ -// AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO(); -// alarmDetailDayDTO.setLineId(map.getLineId()); -// alarmDetailDayDTO.setVlDev(m.getVlDev()+map.getVlDev()*3); -// alarmDetailDayDTO.setFreqDev(m.getFreqDev()+map.getFreqDev()*3); -// alarmDetailDayDTO.setVUnbalance(m.getVUnbalance()+map.getVUnbalance()*3); -// alarmDetailDayDTO.setVHarmonic(m.getVHarmonic()+map.getVHarmonic()*3); -// alarmDetailDayDTO.setSagTimes(m.getSagTimes()+map.getSagTimes()*3); -// alarmDetailDayDTO.setInterruptTimes(m.getInterruptTimes()+map.getInterruptTimes()*3); -// return alarmDetailDayDTO; -// }).orElse(null)).filter(Objects::nonNull).collect(Collectors.toList()); -// } -// -// String yesterday = PublicUtil.getYesterday(lineParam.getDataDate()); -// List todayList = rStatDataVDMapper.getDayData(lineParam.getDataDate()); -// List yesterdayList = rStatDataVDMapper.getDayData(yesterday); -// List theDayBeforeYesterday = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(yesterday)); -// List threeDaysAgo = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(PublicUtil.getYesterday(yesterday))); -// -// -// -// -// } -// -// @Override -// public void alarmMonth(LineParam lineParam) { -// -// } -//} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpTargetWarnDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpTargetWarnDService.java index 63cd4ab49..662ff319a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpTargetWarnDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpTargetWarnDService.java @@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.area; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO; +import com.njcn.prepare.harmonic.pojo.param.LineParam; import java.util.List; @@ -16,12 +17,16 @@ import java.util.List; */ public interface RMpTargetWarnDService extends IMppService { - /** - * @Description: 计算出当前机构累计稳态超标监测点数（当月） - * @Param: [monitorIdList, dataDate] - * @return: java.lang.Integer - * @Author: clam - * @Date: 2022/12/15 - */ - Integer queryHarmonicMeasurementAccrued(List monitorIdList, String dataDate); - } + /** + * @Description: 计算出当前机构累计稳态超标监测点数（当月） + * @Param: [monitorIdList, dataDate] + * @return: java.lang.Integer + * @Author: clam + * @Date: 2022/12/15 + */ + Integer queryHarmonicMeasurementAccrued(List monitorIdList, String dataDate); + + void alarmDay(LineParam lineParam); + + void alarmMonth(LineParam lineParam); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpTargetWarnDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpTargetWarnDService.java deleted file mode 100644 index ae5b4b080..000000000 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpTargetWarnDService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.njcn.prepare.harmonic.service.mysql.line; - -import com.njcn.prepare.harmonic.pojo.param.LineParam; - -/** - *

- * 服务类 - *

- * - * @author xuyang - * @since 2023-05-08 - */ -public interface IRMpTargetWarnDService { - - void alarmDay(LineParam lineParam); - - void alarmMonth(LineParam lineParam); - -}