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

1.异常数据界面业务调整

Browse Source 
2.技术监督增加仿真治理方案
This commit is contained in:
wr
2026-01-04 14:50:03 +08:00
parent 63603dee08
commit fe029fcb95
10 changed files with 404 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/dataClean/MonitorBaseParam.java
View File

@@ -43,4 +43,7 @@ public class MonitorBaseParam extends BaseParam {
@ApiModelProperty(value = "异常天数时间")
private List<String> time;
@ApiModelProperty(value = "过滤异常时间次数")
private Integer errorTimeCount;
}

267
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqDataVerifyBak.java
View File

@@ -1,8 +1,9 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import java.time.LocalDate;
import lombok.Getter;
import lombok.Setter;
@@ -25,136 +26,306 @@ public class PqDataVerifyBak {
/**
* 监测点id
*/
@MppMultiId
@TableField(value = "line_id")
private String lineId;
/**
* 异常数据时间
*/
@MppMultiId
@TableField(value = "time_id")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate timeId;
/**
* 频率(0:正常 1:异常)
* 监测点状态
* 判断所有指标 0:无异常 1:异常
*/
private Integer freq;
@TableField(value = "state")
private Integer state ;
/**
* 频率偏差(0:正常 1:异常)
* 频率指标
*/
private Integer freqDev;
@TableField(value = "freq")
private Integer freq ;
/**
* 相电压有效值(0:正常 1:异常)
* 频率异常时间
*/
private Integer vRms;
@TableField(value = "freq_time")
private Integer freqTime ;
/**
* 正序电压(0:正常 1:异常)
* 频率偏差指标
*/
private Integer vPos;
@TableField(value = "freq_dev")
private Integer freqDev ;
/**
* 负序电压(0:正常 1:异常)
* 频率偏差异常时间
*/
private Integer vNeg;
@TableField(value = "freq_dev_time")
private Integer freqDevTime ;
/**
* 零序电压(0:正常 1:异常)
* 相电压有效值
*/
private Integer vZero;
@TableField(value = "v_rms")
private Integer vRms ;
/**
* 电压不平衡度(0:正常 1:异常)
* 相电压有效值异常时间
*/
private Integer vUnbalance;
@TableField(value = "v_rms_time")
private Integer vRmsTime ;
/**
* 线电压有效值(0:正常 1:异常)
* 正序电压
*/
private Integer rmsLvr;
@TableField(value = "v_pos")
private Integer vPos ;
/**
* 电压正偏差(0:正常 1:异常)
* 正序电压异常时间
*/
private Integer vuDev;
@TableField(value = "v_pos_time")
private Integer vPosTime ;
/**
* 电压负偏差(0:正常 1:异常)
* 负序电压
*/
private Integer vlDev;
@TableField(value = "v_neg")
private Integer vNeg ;
/**
* 电压总谐波畸变率(0:正常 1:异常)
* 负序电压异常时间
*/
private Integer vThd;
@TableField(value = "v_neg_time")
private Integer vNegTime ;
/**
* 相电压基波有效值(0:正常 1:异常)
* 零序电压
*/
private Integer v;
@TableField(value = "v_zero")
private Integer vZero ;
/**
* 电流有效值(0:正常 1:异常)
* 零序电压异常时间
*/
private Integer iRms;
@TableField(value = "v_zero_time")
private Integer vZeroTime ;
/**
* 长时闪变(0:正常 1:异常)
* 电压不平衡度
*/
private Integer plt;
@TableField(value = "v_unbalance")
private Integer vUnbalance ;
/**
* 间谐波电压含有率(0:正常 1:异常)
* 电压不平衡度异常时间
*/
private Integer vInharm;
@TableField(value = "v_unbalance_time")
private Integer vUnbalanceTime ;
/**
* 谐波电压含有率(0:正常 1:异常)
* 线电压有效值
*/
private Integer vHarm;
@TableField(value = "rms_lvr")
private Integer rmsLvr ;
/**
* 功率因数(0:正常 1:异常)
* 线电压有效值异常时间
*/
private Integer pf;
@TableField(value = "rms_lvr_time")
private Integer rmsLvrTime ;
/**
* 谐波电压相角(0:正常 1:异常)
* 电压正偏差
*/
private Integer vPhasic;
@TableField(value = "vu_dev")
private Integer vuDev ;
/**
* 谐波电压基波相角(0:正常 1:异常)
* 电压正偏差异常时间
*/
private Integer v1Phasic;
@TableField(value = "vu_dev_time")
private Integer vuDevTime ;
/**
* 电压波动(0:正常 1:异常)
* 电压负偏差
*/
private Integer fluc;
@TableField(value = "vl_Dev")
private Integer vlDev ;
/**
* 短时闪变(0:正常 1:异常)
* 电压负偏差异常时间
*/
private Integer pst;
@TableField(value = "vl_Dev_time")
private Integer vlDevTime ;
/**
* 电压总谐波畸变率
*/
@TableField(value = "v_thd")
private Integer vThd ;
/**
* 电压总谐波畸变率异常时间
*/
@TableField(value = "v_thd_time")
private Integer vThdTime ;
/**
* 相电压基波有效值
*/
@TableField(value = "v")
private Integer v ;
/**
* 相电压基波有效值异常时间
*/
@TableField(value = "v_time")
private Integer vTime ;
/**
* 电流有效值
*/
@TableField(value = "i_rms")
private Integer iRms ;
/**
* 电流有效值异常时间
*/
@TableField(value = "i_rms_time")
private Integer iRmsTime ;
/**
* 长时闪变
*/
@TableField(value = "plt")
private Integer plt ;
/**
* 长时闪变异常时间
*/
@TableField(value = "plt_time")
private Integer pltTime ;
/**
* 间谐波电压含有率
*/
@TableField(value = "v_inharm")
private Integer vInharm ;
/**
* 间谐波电压含有率异常时间
*/
@TableField(value = "v_Inharm_time")
private Integer vInharmTime ;
/**
* 谐波电压含有率
*/
@TableField(value = "v_harm")
private Integer vHarm ;
/**
* 谐波电压含有率异常时间
*/
@TableField(value = "v_harm_time")
private Integer vHarmTime ;
/**
* 功率因数
*/
@TableField(value = "pf")
private Integer pf ;
/**
* 功率因数异常时间
*/
@TableField(value = "pf_time")
private Integer pfTime ;
/**
* 谐波电压相角
*/
@TableField(value = "v_phasic")
private Integer vPhasic ;
/**
* 谐波电压相角异常时间
*/
@TableField(value = "v_phasic_time")
private Integer vPhasicTime ;
/**
* 谐波电压基波相角
*/
@TableField(value = "v1_phasic")
private Integer v1Phasic ;
/**
* 谐波电压基波相角异常时间
*/
@TableField(value = "v1_phasic_time")
private Integer v1PhasicTime ;
/**
* 电压波动
*/
@TableField(value = "fluc")
private Integer fluc ;
/**
* 电压波动异常时间
*/
@TableField(value = "fluc_time")
private Integer flucTime ;
/**
* 短时闪变
*/
@TableField(value = "pst")
private Integer pst ;
/**
* 短时闪变异常时间
*/
@TableField(value = "pst_time")
private Integer pstTime ;
/**
* 电压暂降(0:正常 1:异常)
*/
private Integer dip;
@TableField(value = "dip")
private Integer dip ;
/**
* 电压暂降异常时间
*/
@TableField(value = "dip_time")
private Integer dipTime ;
/**
* 电压暂升(0:正常 1:异常)
*/
private Integer rise;
@TableField(value = "rise")
private Integer rise ;
/**
* 判断所有指标 0:无异常 1:有异常
* 电压暂升异常时间
*/
private Integer state;
@TableField(value = "rise_time")
private Integer riseTime ;
/**
* 文件路径
*/
@TableField(value = "path")
private String path;

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RStatOnlinerateDMapper.xml
View File

@@ -5,7 +5,8 @@
select
dev_index,
sum(online_min) as onlineMin,
sum(offline_min) as offlineMin
sum(offline_min) as offlineMin,
ROUND( sum(online_min)*1.0/(sum(online_min) + sum(offline_min))*100,2) as onlineRate
from r_stat_onlinerate_d
<where>
<if test="param!=null and param.ids != null and param.ids.size > 0">

203
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java
View File

@@ -4,6 +4,7 @@ package com.njcn.device.pq.service.impl;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.*;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONConfig;
@@ -74,21 +75,24 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
@Override
public VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam) {
if(Objects.isNull(monitorBaseParam.getErrorTimeCount())){
monitorBaseParam.setErrorTimeCount(720);
}
List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
VerifyMonitorVO verifyMonitorVO = new VerifyMonitorVO();
if (CollUtil.isNotEmpty(monitorIds)) {
List<PqDataVerifyBak> dataVerifyList = baseDataVerifyQuery(monitorIds, monitorBaseParam);
verifyMonitorVO.setRunNum(monitorIds.size());
verifyMonitorVO.setAbnormalNum(dataVerifyList.stream().collect(Collectors.groupingBy(PqDataVerifyBak::getLineId)).size());
List<PqDataVerifyBak> dataSumVerifyList = baseDataSumVerifyQuery(monitorIds, monitorBaseParam);
// List<PqDataVerifyBak> dataSumVerifyList = baseDataSumVerifyQuery(monitorIds, monitorBaseParam);
verifyMonitorVO.setMapList(getRangeAbnormalMonitor(monitorBaseParam, dataVerifyList));
verifyMonitorVO.setTargetList(getAbnormalTarget(dataSumVerifyList));
verifyMonitorVO.setTargetList(getAbnormalTarget(dataVerifyList,monitorBaseParam.getErrorTimeCount()));
verifyMonitorVO.setMonitorAlarmInfo(getAbnormalTable(dataVerifyList, monitorBaseParam));
} else {
verifyMonitorVO.setRunNum(0);
verifyMonitorVO.setAbnormalNum(0);
verifyMonitorVO.setMapList(getRangeAbnormalMonitor(monitorBaseParam, new ArrayList<>()));
verifyMonitorVO.setTargetList(getAbnormalTarget(new ArrayList<>()));
verifyMonitorVO.setTargetList(getAbnormalTarget(new ArrayList<>(),monitorBaseParam.getErrorTimeCount()));
verifyMonitorVO.setMonitorAlarmInfo(getAbnormalTable(new ArrayList<>(), monitorBaseParam));
}
@@ -179,6 +183,9 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
@Override
public List<DetailAbnormalVO> monitorAbnormalTable(MonitorBaseParam monitorBaseParam) {
if(Objects.isNull(monitorBaseParam.getErrorTimeCount())){
monitorBaseParam.setErrorTimeCount(720);
}
List<DetailAbnormalVO> result = new ArrayList<>();
//参数校验
Map<String, PqReasonableRangeDto> rangeMap = getStandRange();
@@ -201,67 +208,73 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
if (StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
switch (monitorBaseParam.getTargetKey()) {
case Param.freq:
lambdaQueryWrapper.eq(PqDataVerifyBak::getFreq, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getFreqTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.freq_dev:
lambdaQueryWrapper.eq(PqDataVerifyBak::getFreqDev, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getFreqDevTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.rms_v:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVRms, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVRmsTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.rms_lvr:
lambdaQueryWrapper.eq(PqDataVerifyBak::getRmsLvr, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getRmsLvrTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.vu_dev:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVuDev, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVuDevTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.vl_dev:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVlDev, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVlDevTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.rms_i:
lambdaQueryWrapper.eq(PqDataVerifyBak::getIRms, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getIRmsTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_thd:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVThd, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVThdTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_1_v:
lambdaQueryWrapper.eq(PqDataVerifyBak::getV, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.phasic_v_1:
lambdaQueryWrapper.eq(PqDataVerifyBak::getV1Phasic, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getV1PhasicTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.phasic_rate_x:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVPhasic, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVPhasicTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_rate:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVHarm, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVHarmTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.in_v_rate:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVInharm, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVInharmTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_zero:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVZero, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVZeroTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_neg:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVNeg, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVNegTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_pos:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVPos, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVPosTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.v_unbalance:
lambdaQueryWrapper.eq(PqDataVerifyBak::getVUnbalance, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getVUnbalanceTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.fluc:
lambdaQueryWrapper.eq(PqDataVerifyBak::getFluc, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getFlucTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.pst:
lambdaQueryWrapper.eq(PqDataVerifyBak::getPst, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getPstTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.plt:
lambdaQueryWrapper.eq(PqDataVerifyBak::getPlt, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getPltTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.pf:
lambdaQueryWrapper.eq(PqDataVerifyBak::getPf, 1);
lambdaQueryWrapper.ge(PqDataVerifyBak::getPfTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.Voltage_Dip:
lambdaQueryWrapper.ge(PqDataVerifyBak::getDipTime, monitorBaseParam.getErrorTimeCount());
break;
case Param.Voltage_Rise:
lambdaQueryWrapper.ge(PqDataVerifyBak::getRiseTime, monitorBaseParam.getErrorTimeCount());
break;
default:
log.error("方法{}未匹配到异常数据指标", "monitorAbnormalTable");
@@ -284,7 +297,7 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
for (PqDataVerifyBak pqDataVerifyBak : value) {
targetKey = new DetailAbnormalVO.TimeAndTargetKey();
targetKey.setDate(pqDataVerifyBak.getTimeId().format(DatePattern.NORM_DATE_FORMATTER));
targetKey.setTargetKeys(getAbnormalTarget(Arrays.asList(pqDataVerifyBak)).stream().filter(x->x.getIds().size()>0).collect(Collectors.toList()));
targetKey.setTargetKeys(getAbnormalTarget(Arrays.asList(pqDataVerifyBak),monitorBaseParam.getErrorTimeCount()).stream().filter(x->x.getIds().size()>0).collect(Collectors.toList()));
targetKeyList.add(targetKey);
}
detailAbnormalVO.setDateTargetList(targetKeyList);
@@ -462,6 +475,52 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
lambdaQueryWrapper.between(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
.in(PqDataVerifyBak::getLineId, monitorIds)
.eq(PqDataVerifyBak::getState, 1)
.and(x -> x.ge(PqDataVerifyBak::getFreqTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getFreqDevTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVRmsTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVPosTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVNegTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVZeroTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVUnbalanceTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getRmsLvrTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVuDevTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVlDevTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVThdTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getIRmsTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getPltTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVInharmTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVHarmTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getPfTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVPhasicTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getV1PhasicTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getFlucTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getPstTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getDipTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getRiseTime, monitorBaseParam.getErrorTimeCount())
)
.orderByAsc(PqDataVerifyBak::getTimeId);
return this.list(lambdaQueryWrapper);
}
@@ -475,6 +534,52 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
.lambda().between(PqDataVerifyBak::getTimeId, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
.in(PqDataVerifyBak::getLineId, monitorIds)
.eq(PqDataVerifyBak::getState, 1)
.and(x -> x.ge(PqDataVerifyBak::getFreqTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getFreqDevTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVRmsTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVPosTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVNegTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVZeroTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVUnbalanceTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getRmsLvrTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVuDevTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVlDevTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVThdTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getIRmsTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getPltTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVInharmTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVHarmTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getPfTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getVPhasicTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getV1PhasicTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getFlucTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getPstTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getDipTime, monitorBaseParam.getErrorTimeCount())
.or()
.ge(PqDataVerifyBak::getRiseTime, monitorBaseParam.getErrorTimeCount())
)
.groupBy(PqDataVerifyBak::getLineId);
return this.list(queryWrapper);
}
@@ -515,102 +620,102 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
/**
* 指标异常测点数量
*/
public List<VerifyTargetVO> getAbnormalTarget(List<PqDataVerifyBak> dataVerifyList) {
public List<VerifyTargetVO> getAbnormalTarget(List<PqDataVerifyBak> dataVerifyList,Integer errorTimeCount) {
List<VerifyTargetVO> result = new ArrayList<>();
Map<String, PqReasonableRangeDto> rangeMap = getStandRange();
rangeMap.forEach((key, dto) -> {
Set<String> ids;
switch (key) {
case Param.freq:
ids = dataVerifyList.stream().filter(it -> it.getFreq() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getFreqTime())).filter(it -> it.getFreqTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.freq_dev:
ids = dataVerifyList.stream().filter(it -> it.getFreqDev() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getFreqDevTime())).filter(it -> it.getFreqDevTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.rms_v:
ids = dataVerifyList.stream().filter(it -> it.getVRms() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVRmsTime())).filter(it -> it.getVRmsTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.rms_lvr:
ids = dataVerifyList.stream().filter(it -> it.getRmsLvr() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getRmsLvrTime())).filter(it -> it.getRmsLvrTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.vu_dev:
ids = dataVerifyList.stream().filter(it -> it.getVuDev() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVuDevTime())).filter(it -> it.getVuDevTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.vl_dev:
ids = dataVerifyList.stream().filter(it -> it.getVlDev() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVlDevTime())).filter(it -> it.getVlDevTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.rms_i:
ids = dataVerifyList.stream().filter(it -> it.getIRms() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getIRmsTime())).filter(it -> it.getIRmsTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_thd:
ids = dataVerifyList.stream().filter(it -> it.getVThd() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVThdTime())).filter(it -> it.getVThdTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_1_v:
ids = dataVerifyList.stream().filter(it -> it.getV() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVTime())).filter(it -> it.getVTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.phasic_v_1:
ids = dataVerifyList.stream().filter(it -> it.getV1Phasic() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getV1PhasicTime())).filter(it -> it.getV1PhasicTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.phasic_rate_x:
ids = dataVerifyList.stream().filter(it -> it.getVPhasic() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVPhasicTime())).filter(it -> it.getVPhasicTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_rate:
ids = dataVerifyList.stream().filter(it -> it.getVHarm() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVHarmTime())).filter(it -> it.getVHarmTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.in_v_rate:
ids = dataVerifyList.stream().filter(it -> it.getVInharm() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVInharmTime())).filter(it -> it.getVInharmTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_zero:
ids = dataVerifyList.stream().filter(it -> it.getVZero() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVZeroTime())).filter(it -> it.getVZeroTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_neg:
ids = dataVerifyList.stream().filter(it -> it.getVNeg() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVNegTime())).filter(it -> it.getVNegTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_pos:
ids = dataVerifyList.stream().filter(it -> it.getVPos() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVPosTime())).filter(it -> it.getVPosTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.v_unbalance:
ids = dataVerifyList.stream().filter(it -> it.getVUnbalance() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getVUnbalanceTime())).filter(it -> it.getVUnbalanceTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.fluc:
ids = dataVerifyList.stream().filter(it -> it.getFluc() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getFlucTime())).filter(it -> it.getFlucTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.pst:
ids = dataVerifyList.stream().filter(it -> it.getPst() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getPstTime())).filter(it -> it.getPstTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.plt:
ids = dataVerifyList.stream().filter(it -> it.getPlt() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getPltTime())).filter(it -> it.getPltTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.pf:
ids = dataVerifyList.stream().filter(it -> it.getPf() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getPfTime())).filter(it -> it.getPfTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.Voltage_Dip:
ids = dataVerifyList.stream().filter(it -> it.getDip() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getDipTime())).filter(it -> it.getDipTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
case Param.Voltage_Rise:
ids = dataVerifyList.stream().filter(it -> it.getRise() > 0).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
ids = dataVerifyList.stream().filter(x-> ObjUtil.isNotNull(x.getRiseTime())).filter(it -> it.getRiseTime() > errorTimeCount).map(PqDataVerifyBak::getLineId).collect(Collectors.toSet());
assembleEntity(ids, dto, result);
break;
default:

3
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/rstatintegrity/mapper/mapping/RStatIntegrityDMapper.xml
View File

@@ -20,7 +20,8 @@
SELECT
line_index AS lineIndex,
sum(real_time) AS realTime,
sum(due_time) AS dueTime
sum(due_time) AS dueTime,
ROUND(sum( real_time )*100.0 / sum( due_time ) ,2) AS integrityRate
FROM
r_stat_integrity_d
<where>

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportNormalParam.java
View File

@@ -23,6 +23,7 @@ public class UserReportNormalParam extends BaseParam {
private static final long serialVersionUID = 1L;
private String id;
@ApiModelProperty(value = "保存1,提交审批2")
private String saveOrCheckflag;
/**
@@ -40,6 +41,11 @@ public class UserReportNormalParam extends BaseParam {
*/
private String reportUrl;
/**
* 治理方案仿真校验评估报告
*/
private String simulationReportUrl;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java
View File

@@ -37,6 +37,12 @@ public class UserReportNormalPO extends BaseEntity {
*/
private String reportUrl;
/**
* 治理方案仿真校验评估报告
*/
private String simulationReportUrl;
private String processInstanceId;
private String historyInstanceId;

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
View File

@@ -209,6 +209,9 @@ public class UserReportVO {
@ApiModelProperty(value = "入网评估报告和治理报告的文件路径名")
private String otherReport;
@ApiModelProperty(value = "仿真治理评估告")
private String simulationReport;
private String userReportId;
}
@@ -221,5 +224,8 @@ public class UserReportVO {
@ApiModelProperty(value = "治理评估告")
private List<String> governReport;
@ApiModelProperty(value = "仿真治理评估告")
private List<String> simulationReport;
}
}

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
View File

@@ -68,7 +68,6 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
userReportNormalPO.setState(DataStateEnum.ENABLE.getCode());
if (Objects.equals(userReportNormalParam.getSaveOrCheckflag(), "1")) {
userReportNormalPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
} else {
userReportNormalPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
@@ -154,6 +153,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
vo.setId(item.getId());
vo.setUserReportId(item.getUserReportId());
vo.setOtherReport(item.getReportUrl());
vo.setSimulationReport(item.getSimulationReportUrl());
vo.setProcessInstanceId(item.getProcessInstanceId());
vo.setCreateTime(item.getCreateTime());
vo.setStatus(item.getStatus());
@@ -175,6 +175,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
BeanUtil.copyProperties(userReportPO, vo);
BeanUtil.copyProperties(userReportNormalPO, vo);
vo.setOtherReport(userReportNormalPO.getReportUrl());
vo.setSimulationReport(userReportNormalPO.getSimulationReportUrl());
return vo;
}
return null;
@@ -278,8 +279,10 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
);
Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> simulationReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getSimulationReportUrl).findFirst();
userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
userReportVO.setSimulationReport(Collections.singletonList(simulationReport.orElse(null)));
return userReportVO;
}

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -420,8 +420,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
);
Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> simulationReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getSimulationReportUrl).findFirst();
userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
userReportVO.setSimulationReport(Collections.singletonList(simulationReport.orElse(null)));
return userReportVO;
}