Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
xuyang
2023-05-09 09:33:18 +08:00
parent 39fe78f948
commit 056c19195a
5 changed files with 95 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/RMpTargetWarnDController.java
View File

@@ -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;
/**
* <p>
@@ -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<Boolean> 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<Boolean> alarmDay(@RequestBody @Validated LineParam lineParam) {
String methodDescribe = getMethodDescribe("alarmDay");
rMpTargetWarnDService.alarmDay(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}

65
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java
View File

@@ -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<RMpTargetWarnDMapper, RMpTargetWarnDPO> 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<RMpTargetWarnDMapp
result = rMpTargetWarnDMapper.selectCount (wrapper);
return result;
}
@Override
public void alarmDay(LineParam lineParam) {
List<AlarmDetailDayDTO> rlList,uclList;
//本年的rm值
List<AlarmDetailDayDTO> rmList = alarmDetailService.getAvgDiffData(lineParam);
//本年的CL值
List<AlarmDetailDayDTO> 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<RMpTargetDiffDPO> todayList = rStatDataVDMapper.getDayData(lineParam.getDataDate());
List<RMpTargetDiffDPO> yesterdayList = rStatDataVDMapper.getDayData(yesterday);
List<RMpTargetDiffDPO> theDayBeforeYesterday = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(yesterday));
List<RMpTargetDiffDPO> threeDaysAgo = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(PublicUtil.getYesterday(yesterday)));
}
@Override
public void alarmMonth(LineParam lineParam) {
}
}

90
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpTargetWarnDServiceImpl.java
View File

@@ -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;
//
///**
// * <p>
// * 服务实现类
// * </p>
// *
// * @author xuyang
// * @since 2023-05-08
// */
//@Service
//@AllArgsConstructor
//public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapper, RMpTargetWarnDPO> implements IRMpTargetWarnDService {
//
// private final AlarmDetailService alarmDetailService;
//
// private final RStatDataVDMapper rStatDataVDMapper;
//
// @Override
// public void alarmDay(LineParam lineParam) {
// List<AlarmDetailDayDTO> rlList,uclList;
// //本年的rm值
// List<AlarmDetailDayDTO> rmList = alarmDetailService.getAvgDiffData(lineParam);
// //本年的CL值
// List<AlarmDetailDayDTO> 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<RMpTargetDiffDPO> todayList = rStatDataVDMapper.getDayData(lineParam.getDataDate());
// List<RMpTargetDiffDPO> yesterdayList = rStatDataVDMapper.getDayData(yesterday);
// List<RMpTargetDiffDPO> theDayBeforeYesterday = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(yesterday));
// List<RMpTargetDiffDPO> threeDaysAgo = rStatDataVDMapper.getDayData(PublicUtil.getYesterday(PublicUtil.getYesterday(yesterday)));
//
//
//
//
// }
//
// @Override
// public void alarmMonth(LineParam lineParam) {
//
// }
//}

5
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/area/RMpTargetWarnDService.java
View File

@@ -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;
@@ -24,4 +25,8 @@ public interface RMpTargetWarnDService extends IMppService<RMpTargetWarnDPO> {
* @Date: 2022/12/15
*/
Integer queryHarmonicMeasurementAccrued(List<String> monitorIdList, String dataDate);
void alarmDay(LineParam lineParam);
void alarmMonth(LineParam lineParam);
}

19
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/IRMpTargetWarnDService.java
View File

@@ -1,19 +0,0 @@
package com.njcn.prepare.harmonic.service.mysql.line;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
/**
* <p>
* 服务类
* </p>
*
* @author xuyang
* @since 2023-05-08
*/
public interface IRMpTargetWarnDService {
void alarmDay(LineParam lineParam);
void alarmMonth(LineParam lineParam);
}