From 39fe78f94832fcae8a6f31d3d15986c02d3ec51c Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 9 May 2023 09:22:49 +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 | 28 +-- .../Impl/line/RMpTargetWarnDServiceImpl.java | 166 ++++++++++-------- 2 files changed, 104 insertions(+), 90 deletions(-) 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 f396ad81e..793ccfe79 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 @@ -38,20 +38,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 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); +// } } 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 index 45fb1ba5c..d99161fd8 100644 --- 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 @@ -1,76 +1,90 @@ -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 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) { - //本年的rm值 - List rmList = alarmDetailService.getAvgDiffData(lineParam); - //本年的CL值 - List clList = rStatDataVDMapper.getAvgDayData(lineParam.getDataDate(), PublicUtil.getLastYearDay(lineParam.getDataDate())); - //本年的RL值 - List 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值 - List 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()); - - - - } - - @Override - public void alarmMonth(LineParam lineParam) { - - } -} +//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) { +// +// } +//}