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-10 16:26:12 +08:00
parent bf52617a24
commit 6f0a19adf9
17 changed files with 393 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,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.area.IRMpMonitorAlarmCountMService;
import com.njcn.prepare.harmonic.service.mysql.area.RMpTargetWarnDService;
import com.njcn.prepare.harmonic.service.mysql.line.AlarmDetailService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
@@ -35,6 +37,10 @@ public class AlarmDetailController extends BaseController {
private final AlarmDetailService alarmDetailService;
private final RMpTargetWarnDService rMpTargetWarnDService;
private final IRMpMonitorAlarmCountMService rMpMonitorAlarmCountMService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/alarmDetailAlarm")
@ApiOperation("监测点指标告警日统计")
@@ -61,4 +67,24 @@ public class AlarmDetailController extends BaseController {
alarmDetailService.targetDiff(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@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);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/alarmMonth")
@ApiOperation("监测点指标告警月统计(新)")
@ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true)
public HttpResult<Boolean> alarmMonth(@RequestBody @Validated LineParam lineParam) {
String methodDescribe = getMethodDescribe("alarmMonth");
rMpMonitorAlarmCountMService.alarmMonth(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}

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

@@ -1,66 +0,0 @@
package com.njcn.prepare.harmonic.controller.line;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.enums.common.LogEnum;
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.area.IRMpMonitorAlarmCountMService;
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;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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;
/**
* <p>
* 前端控制器
* </p>
*
* @author xuyang
* @since 2023-05-08
*/
@Validated
@Slf4j
@RestController
@RequestMapping("/alarmDetailData")
@Api(tags = "监测点指标告警明细")
@AllArgsConstructor
public class RMpTargetWarnController extends BaseController {
private final RMpTargetWarnDService rMpTargetWarnDService;
private final IRMpMonitorAlarmCountMService rMpMonitorAlarmCountMService;
@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);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/alarmMonth")
@ApiOperation("监测点指标告警月统计(新)")
@ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true)
public HttpResult<Boolean> alarmMonth(@RequestBody @Validated LineParam lineParam) {
String methodDescribe = getMethodDescribe("alarmMonth");
rMpMonitorAlarmCountMService.alarmMonth(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/RMpTargetWarnDMapper.java
View File

@@ -20,6 +20,6 @@ import java.util.List;
@Mapper
public interface RMpTargetWarnDMapper extends MppBaseMapper<RMpTargetWarnDPO> {
List<RMpMonitorAlarmCountMDTO> getDate(@Param("startTime") String startTime, @Param("endTime") String endTime);
List<RMpMonitorAlarmCountMDTO> getDate(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("list") List<String> list);
}

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/area/mapping/RMpTargetWarnDMapper.xml
View File

@@ -48,6 +48,14 @@
r_mp_target_warn_d
where
data_date between #{startTime} and #{endTime}
<where>
<if test="list != null and list.size() > 0">
and measurement_point_id in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
group by measurement_point_id
order by harmonicTypeGradeTotal desc,eventTypeGradeTotal desc
</select>

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/RStatDataVDMapper.java
View File

@@ -16,12 +16,12 @@ public interface RStatDataVDMapper extends MppBaseMapper<RStatDataVDPO> {
* @param time 时间
* @return 集合
*/
List<RMpTargetDiffDPO> getDayData(@Param("time") String time);
List<RMpTargetDiffDPO> getDayData(@Param("time") String time, @Param("list") List<String> list);
/**
* 获取本年的所有(监测点日报表)稳态指标最大值（有的取最大值，有的取95概率大值）求一个平均值
*/
List<AlarmDetailDayDTO> getAvgDayData(@Param("startTime") String time, @Param("endTime") String endTime);
List<AlarmDetailDayDTO> getAvgDayData(@Param("startTime") String time, @Param("endTime") String endTime, @Param("list") List<String> list);
List<RMpTargetWarnDDTO> getTargetWarnD(@Param("time") String time);
List<RMpTargetWarnDDTO> getTargetWarnD(@Param("time") String time, @Param("list") List<String> list);
}

24
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/day/mapping/RStatDataVDMapper.xml
View File

@@ -75,6 +75,14 @@
data_date = #{time}
) D
on A.lineId = D.lineId
<where>
<if test="list != null and list.size() > 0">
A.lineId in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
</select>
<select id="getAvgDayData" resultType="com.njcn.prepare.harmonic.pojo.dto.AlarmDetailDayDTO">
@@ -152,6 +160,14 @@
data_date between #{startTime} and #{endTime}
) D
on A.lineId = D.lineId
<where>
<if test="list != null and list.size() > 0">
A.lineId in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
) Y
group by Y.lineId
</select>
@@ -269,6 +285,14 @@
data_date = #{time}
) G
on A.lineId = G.lineId
<where>
<if test="list != null and list.size() > 0">
A.lineId in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/AlarmMapper.java
View File

@@ -13,6 +13,6 @@ import java.util.List;
*/
public interface AlarmMapper extends MppBaseMapper<RMpTargetDiffDPO> {
List<AlarmDetailDayDTO> getAvgDiffData(@Param("startTime") String startTime, @Param("endTime") String endTime);
List<AlarmDetailDayDTO> getAvgDiffData(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("list") List<String> list);
}

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/AlarmMapper.xml
View File

@@ -15,6 +15,12 @@
from
r_mp_target_diff_d
where `time` between #{startTime} and #{endTime}
<if test="list != null and list.size() > 0">
and line_id in
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
group by line_id
</select>
</mapper>

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

@@ -82,7 +82,7 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapp
List<String> dayList = PublicUtil.getDayByMonth(year,month);
for (String item : dayList) {
log.info(item+"-->开始执行");
List<RMpTargetWarnDPO> day = getData(item);
List<RMpTargetWarnDPO> day = getData(item,lineParam.getLineIds());
if (!CollectionUtils.isEmpty(day)){
list.addAll(day);
}
@@ -90,7 +90,7 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapp
}
//日处理
else {
list = getData(lineParam.getDataDate());
list = getData(lineParam.getDataDate(),lineParam.getLineIds());
}
if (!CollectionUtils.isEmpty(list)){
this.saveOrUpdateBatchByMultiId(list,50);
@@ -103,24 +103,24 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapp
int month = Integer.parseInt(lineParam.getDataDate().split("-")[1]);
String startTime = PublicUtil.getFisrtDayOfMonth(year,month);
String endTime = PublicUtil.getLastDayOfMonth(year,month);
return this.baseMapper.getDate(startTime,endTime);
return this.baseMapper.getDate(startTime,endTime,lineParam.getLineIds());
}
public List<RMpTargetWarnDPO> getData(String time){
public List<RMpTargetWarnDPO> getData(String time, List<String> list){
List<RMpTargetWarnDPO> result = new ArrayList<>();
List<AlarmDetailDayDTO> rlList = new ArrayList<>(),uclList = new ArrayList<>();
//基础数据
String yesterday = PublicUtil.getYesterday(time);
List<RMpTargetWarnDDTO> todayList = rStatDataVDMapper.getTargetWarnD(time + " 00:00:00");
List<RMpTargetWarnDDTO> yesterdayList = rStatDataVDMapper.getTargetWarnD(yesterday + " 00:00:00");
List<RMpTargetWarnDDTO> theDayBeforeYesterday = rStatDataVDMapper.getTargetWarnD(PublicUtil.getYesterday(yesterday) + " 00:00:00");
List<RMpTargetWarnDDTO> threeDaysAgo = rStatDataVDMapper.getTargetWarnD(PublicUtil.getYesterday(PublicUtil.getYesterday(yesterday)) + " 00:00:00");
List<RMpTargetWarnDDTO> todayList = rStatDataVDMapper.getTargetWarnD(time + " 00:00:00",list);
List<RMpTargetWarnDDTO> yesterdayList = rStatDataVDMapper.getTargetWarnD(yesterday + " 00:00:00",list);
List<RMpTargetWarnDDTO> theDayBeforeYesterday = rStatDataVDMapper.getTargetWarnD(PublicUtil.getYesterday(yesterday) + " 00:00:00",list);
List<RMpTargetWarnDDTO> threeDaysAgo = rStatDataVDMapper.getTargetWarnD(PublicUtil.getYesterday(PublicUtil.getYesterday(yesterday)) + " 00:00:00",list);
if (!CollectionUtils.isEmpty(todayList)){
Map<String,List<RMpTargetWarnDDTO>> map2 = new HashMap<>(),map3 = new HashMap<>(),map4 = new HashMap<>();
//本年的rm值
List<AlarmDetailDayDTO> rmList = alarmDetailService.getAvgDiffData(time);
List<AlarmDetailDayDTO> rmList = alarmDetailService.getAvgDiffData(time,list);
//本年的CL值
List<AlarmDetailDayDTO> clList = rStatDataVDMapper.getAvgDayData(PublicUtil.getLastYearDay(time),time);
List<AlarmDetailDayDTO> clList = rStatDataVDMapper.getAvgDayData(PublicUtil.getLastYearDay(time),time,list);
//本年的RL值
if (!CollectionUtils.isEmpty(rmList)){
rlList = rmList.stream().map(item->{

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

@@ -128,30 +128,30 @@ public class AlarmDetailServiceImpl extends MppServiceImpl<AlarmMapper, RMpTarge
log.info(item+"-->开始执行");
startTime = item + " 00:00:00";
endTime = PublicUtil.getYesterday(item) + " 00:00:00";
diffData(startTime,endTime);
diffData(startTime,endTime,lineParam.getLineIds());
}
}
//日处理
else {
startTime = lineParam.getDataDate() + " 00:00:00";
endTime = PublicUtil.getYesterday(lineParam.getDataDate()) + " 00:00:00";
diffData(startTime,endTime);
diffData(startTime,endTime,lineParam.getLineIds());
}
}
@Override
public List<AlarmDetailDayDTO> getAvgDiffData(String time) {
public List<AlarmDetailDayDTO> getAvgDiffData(String time,List<String> list) {
String endTime = PublicUtil.getLastYearDay(time);
//计算本年的rm值
return this.baseMapper.getAvgDiffData(endTime,time);
return this.baseMapper.getAvgDiffData(endTime,time,list);
}
/**
* 生成指标差值日统计
*/
public void diffData(String startTime, String endTime) {
List<RMpTargetDiffDPO> localData = rStatDataVDMapper.getDayData(startTime);
List<RMpTargetDiffDPO> yesterdayData = rStatDataVDMapper.getDayData(endTime);
public void diffData(String startTime, String endTime, List<String> list) {
List<RMpTargetDiffDPO> localData = rStatDataVDMapper.getDayData(startTime,list);
List<RMpTargetDiffDPO> yesterdayData = rStatDataVDMapper.getDayData(endTime,list);
if (!CollectionUtils.isEmpty(localData) && !CollectionUtils.isEmpty(yesterdayData)){
//取两个集合的交集,做算法处理取绝对值
List<RMpTargetDiffDPO> intersectionList = localData.stream().map(map->yesterdayData.stream().filter(m->Objects.equals(m.getLineId(),map.getLineId())).findFirst().map(m->{

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

@@ -24,5 +24,5 @@ public interface AlarmDetailService {
void targetDiff(LineParam lineParam);
List<AlarmDetailDayDTO> getAvgDiffData(String time);
List<AlarmDetailDayDTO> getAvgDiffData(String time,List<String> list);
}