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:22:49 +08:00
parent fb593ae053
commit 39fe78f948
2 changed files with 104 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,20 +38,20 @@ import com.njcn.web.controller.BaseController;
@AllArgsConstructor @AllArgsConstructor
public class RMpTargetWarnDController extends BaseController { public class RMpTargetWarnDController extends BaseController {
private final IRMpTargetWarnDService irMpTargetWarnDService; // private final IRMpTargetWarnDService irMpTargetWarnDService;
//
/** // /**
* @author xuyang // * @author xuyang
*/ // */
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) // @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/alarmDay") // @PostMapping("/alarmDay")
@ApiOperation("监测点指标告警日统计") // @ApiOperation("监测点指标告警日统计")
@ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) // @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true)
public HttpResult<Boolean> alarmDay(@RequestBody @Validated LineParam lineParam) { // public HttpResult<Boolean> alarmDay(@RequestBody @Validated LineParam lineParam) {
String methodDescribe = getMethodDescribe("alarmDay"); // String methodDescribe = getMethodDescribe("alarmDay");
irMpTargetWarnDService.alarmDay(lineParam); // irMpTargetWarnDService.alarmDay(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
} // }
} }

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

@@ -1,76 +1,90 @@
package com.njcn.prepare.harmonic.service.mysql.Impl.line; //package com.njcn.prepare.harmonic.service.mysql.Impl.line;
//
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; //import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO; //import com.njcn.harmonic.pojo.po.RMpTargetWarnDPO;
import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper; //import com.njcn.prepare.harmonic.mapper.mysql.area.RMpTargetWarnDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper; //import com.njcn.prepare.harmonic.mapper.mysql.day.RStatDataVDMapper;
import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO; //import com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpTargetDiffDPO; //import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpTargetDiffDPO;
import com.njcn.prepare.harmonic.pojo.param.LineParam; //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.AlarmDetailService;
import com.njcn.prepare.harmonic.service.mysql.line.IRMpTargetWarnDService; //import com.njcn.prepare.harmonic.service.mysql.line.IRMpTargetWarnDService;
import com.njcn.prepare.harmonic.utils.PublicUtil; //import com.njcn.prepare.harmonic.utils.PublicUtil;
import lombok.AllArgsConstructor; //import lombok.AllArgsConstructor;
import org.checkerframework.checker.units.qual.A; //import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//import org.springframework.util.CollectionUtils;
import java.util.List; //
import java.util.Objects; //import java.util.ArrayList;
import java.util.stream.Collectors; //import java.util.List;
//import java.util.Objects;
/** //import java.util.stream.Collectors;
* <p> //
* 服务实现类 ///**
* </p> // * <p>
* // * 服务实现类
* @author xuyang // * </p>
* @since 2023-05-08 // *
*/ // * @author xuyang
@Service // * @since 2023-05-08
@AllArgsConstructor // */
public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapper, RMpTargetWarnDPO> implements IRMpTargetWarnDService { //@Service
//@AllArgsConstructor
private final AlarmDetailService alarmDetailService; //public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapper, RMpTargetWarnDPO> implements IRMpTargetWarnDService {
//
private final RStatDataVDMapper rStatDataVDMapper; // private final AlarmDetailService alarmDetailService;
//
@Override // private final RStatDataVDMapper rStatDataVDMapper;
public void alarmDay(LineParam lineParam) { //
//本年的rm值 // @Override
List<AlarmDetailDayDTO> rmList = alarmDetailService.getAvgDiffData(lineParam); // public void alarmDay(LineParam lineParam) {
//本年的CL值 // List<AlarmDetailDayDTO> rlList,uclList;
List<AlarmDetailDayDTO> clList = rStatDataVDMapper.getAvgDayData(lineParam.getDataDate(), PublicUtil.getLastYearDay(lineParam.getDataDate())); // //本年的rm值
//本年的RL值 // List<AlarmDetailDayDTO> rmList = alarmDetailService.getAvgDiffData(lineParam);
List<AlarmDetailDayDTO> rlList = rmList.stream().map(item->{ // //本年的CL值
AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO(); // List<AlarmDetailDayDTO> clList = rStatDataVDMapper.getAvgDayData(lineParam.getDataDate(), PublicUtil.getLastYearDay(lineParam.getDataDate()));
alarmDetailDayDTO.setLineId(item.getLineId()); // //本年的RL值
alarmDetailDayDTO.setVlDev(item.getVlDev()*3.3); // if (!CollectionUtils.isEmpty(rmList)){
alarmDetailDayDTO.setFreqDev(item.getFreqDev()*3.3); // rlList = rmList.stream().map(item->{
alarmDetailDayDTO.setVUnbalance(item.getVUnbalance()*3.3); // AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO();
alarmDetailDayDTO.setVHarmonic(item.getVHarmonic()*3.3); // alarmDetailDayDTO.setLineId(item.getLineId());
alarmDetailDayDTO.setSagTimes(item.getSagTimes()*3.3); // alarmDetailDayDTO.setVlDev(item.getVlDev()*3.3);
alarmDetailDayDTO.setInterruptTimes(item.getInterruptTimes()*3.3); // alarmDetailDayDTO.setFreqDev(item.getFreqDev()*3.3);
return alarmDetailDayDTO; // alarmDetailDayDTO.setVUnbalance(item.getVUnbalance()*3.3);
}).collect(Collectors.toList()); // alarmDetailDayDTO.setVHarmonic(item.getVHarmonic()*3.3);
//本年的UCL值 // alarmDetailDayDTO.setSagTimes(item.getSagTimes()*3.3);
List<AlarmDetailDayDTO> uclList = rmList.stream().map(map->clList.stream().filter(m-> Objects.equals(m.getLineId(),map.getLineId())).findFirst().map(m->{ // alarmDetailDayDTO.setInterruptTimes(item.getInterruptTimes()*3.3);
AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO(); // return alarmDetailDayDTO;
alarmDetailDayDTO.setLineId(map.getLineId()); // }).collect(Collectors.toList());
alarmDetailDayDTO.setVlDev(m.getVlDev()+map.getVlDev()*3); // }
alarmDetailDayDTO.setFreqDev(m.getFreqDev()+map.getFreqDev()*3); // //本年的UCL值
alarmDetailDayDTO.setVUnbalance(m.getVUnbalance()+map.getVUnbalance()*3); // if (!CollectionUtils.isEmpty(rmList) && !CollectionUtils.isEmpty(clList)){
alarmDetailDayDTO.setVHarmonic(m.getVHarmonic()+map.getVHarmonic()*3); // uclList = rmList.stream().map(map->clList.stream().filter(m-> Objects.equals(m.getLineId(),map.getLineId())).findFirst().map(m->{
alarmDetailDayDTO.setSagTimes(m.getSagTimes()+map.getSagTimes()*3); // AlarmDetailDayDTO alarmDetailDayDTO = new AlarmDetailDayDTO();
alarmDetailDayDTO.setInterruptTimes(m.getInterruptTimes()+map.getInterruptTimes()*3); // alarmDetailDayDTO.setLineId(map.getLineId());
return alarmDetailDayDTO; // alarmDetailDayDTO.setVlDev(m.getVlDev()+map.getVlDev()*3);
}).orElse(null)).filter(Objects::nonNull).collect(Collectors.toList()); // 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;
@Override // }).orElse(null)).filter(Objects::nonNull).collect(Collectors.toList());
public void alarmMonth(LineParam lineParam) { // }
//
} // 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) {
//
// }
//}