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
2024-09-25 16:27:58 +08:00
parent 89cb22b3ea
commit 4211105c8d
14 changed files with 95 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PulicTimeParam.java
View File

@@ -17,6 +17,7 @@ public class PulicTimeParam {
@ApiModelProperty("监测点id")
private String id;
@ApiModelProperty("开始时间")
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
private String searchBeginTime;

1
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PulicTimeStatisParam.java
View File

@@ -13,6 +13,7 @@ import javax.validation.constraints.Pattern;
*/
@Data
public class PulicTimeStatisParam extends PulicTimeParam {
@ApiModelProperty("比较开始时间")
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
private String periodBeginTime;

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

@@ -776,7 +776,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
public List<PqsCommunicate> getCommunicate(String devId, String startTime, String endTime) {
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(PqsCommunicate.class);
influxQueryWrapper.between(InfluxDbSqlConstant.TIME,DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(),DateUtil.beginOfDay(DateUtil.parse(endTime)).toString())
influxQueryWrapper.between(InfluxDbSqlConstant.TIME,DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(),DateUtil.endOfDay(DateUtil.parse(endTime)).toString())
.eq(PqsCommunicate::getDevId,devId);
return pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper);
}

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/SteadyInfoData.java
View File

@@ -16,8 +16,8 @@ public class SteadyInfoData implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("稳态指标合格率")
private List<Float> steadyInfoList;
private List<Double> steadyInfoList;
@ApiModelProperty("稳态指标合格率(同比/环比)")
private List<Float> steadyInfoData;
private List<Double> steadyInfoData;
}

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/hebeinorth/EvaluationLevelVo.java
View File

@@ -106,7 +106,7 @@ public class EvaluationLevelVo {
@ApiModelProperty("谐波电流")
private Double iHarm = 3.14159;
@ApiModelProperty("闪变合格率")
@ApiModelProperty("间谐波")
private Double inuHarm = 3.14159;
@ApiModelProperty("负序电流")

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyDataController.java
View File

@@ -38,10 +38,10 @@ public class SteadyDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getSteadyData")
@ApiOperation("稳态指标合格率")
@ApiImplicitParam(name = "pulicTimeStatisParam", value = "稳态指标合格率参数", required = true)
public HttpResult<SteadyInfoData> getSteadyData(@RequestBody @Validated PulicTimeStatisParam pulicTimeStatisParam) {
@ApiImplicitParam(name = "param", value = "稳态指标合格率参数", required = true)
public HttpResult<SteadyInfoData> getSteadyData(@RequestBody @Validated PulicTimeStatisParam param) {
String methodDescribe = getMethodDescribe("getSteadyData");
SteadyInfoData list = steadyDataService.getSteadyData(pulicTimeStatisParam);
SteadyInfoData list = steadyDataService.getSteadyData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
View File

@@ -381,7 +381,6 @@
sum(inuharm_15_overtime) inuharm15Overtime,
sum(inuharm_16_overtime) inuharm16Overtime,
sum(i_neg_overtime) iNegOvertime
from
r_stat_limit_rate_d
where

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/SteadyDataService.java
View File

@@ -6,8 +6,16 @@ import com.njcn.harmonic.pojo.vo.SteadyInfoData;
/**
* @author denghuajun
* @date 2022/3/4
* 稳态指标合格率
*
*/
public interface SteadyDataService {
SteadyInfoData getSteadyData(PulicTimeStatisParam pulicTimeStatisParam);
/**
* 稳态指标合格率查询
* @param param
* @return: com.njcn.harmonic.pojo.vo.SteadyInfoData
* @Author: wr
* @Date: 2024/9/24 14:30
*/
SteadyInfoData getSteadyData(PulicTimeStatisParam param);
}

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -153,6 +153,12 @@ public class GridServiceImpl implements IGridService {
List<String> ll = lineDetailMap.get(item.getArea()).stream().map(LineDetail::getId).collect(Collectors.toList());
AssessDetailVo comAssess = getAssessData(item.getId(), item.getName(), ll, list1, list2, list3);
result.add(comAssess);
}else{
AssessVo assessVo = new AssessVo();
assessVo.setName(item.getName());
List<String> ll = lineDetailList.stream().map(LineDetail::getId).collect(Collectors.toList());
AssessDetailVo comAssess = getAssessData(item.getId(), item.getName(), ll, list1, list2, list3);
result.add(comAssess);
}
});
}

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ReportServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.njcn.harmonic.pojo.po.report.OverLimitInfo;
import com.njcn.harmonic.pojo.vo.ReportValue;
import com.njcn.harmonic.service.IRStatDataVDService;
import com.njcn.harmonic.service.ReportService;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
@@ -23,8 +23,11 @@ import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author wr
*/
@Service
@AllArgsConstructor
@RequiredArgsConstructor
public class ReportServiceImpl implements ReportService {
private final ReportMapper reportMapper;

365
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyDataServiceImpl.java
View File

@@ -1,22 +1,16 @@
package com.njcn.harmonic.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.njcn.device.pq.pojo.param.PulicTimeStatisParam;
import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
import com.njcn.harmonic.pojo.vo.RStatLimitRateDVO;
import com.njcn.harmonic.pojo.vo.SteadyInfoData;
import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationLevelVo;
import com.njcn.harmonic.service.SteadyDataService;
import com.njcn.web.pojo.vo.SteadyDataVO;
import lombok.AllArgsConstructor;
import com.njcn.harmonic.service.hebeinorth.IGridService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -25,338 +19,45 @@ import java.util.List;
*
*/
@Service
@AllArgsConstructor
@RequiredArgsConstructor
public class SteadyDataServiceImpl implements SteadyDataService {
private final RStatLimitRateDMapper rateDMapper;
private final IGridService gridService;
@Override
public SteadyInfoData getSteadyData(PulicTimeStatisParam pulicTimeStatisParam) {
SteadyInfoData steadyInfoDatas = new SteadyInfoData();
List<Float> steadyInfoList = new ArrayList<>();
List<Float> steadyInfoData = new ArrayList<>();
steadyInfoList = getCondition(pulicTimeStatisParam.getId(), pulicTimeStatisParam.getSearchBeginTime(), pulicTimeStatisParam.getSearchEndTime());
if (StringUtils.isNotBlank(pulicTimeStatisParam.getPeriodBeginTime()) && StringUtils.isNotBlank(pulicTimeStatisParam.getPeriodEndTime())) {
steadyInfoData = getCondition(pulicTimeStatisParam.getId(), pulicTimeStatisParam.getPeriodBeginTime(), pulicTimeStatisParam.getPeriodEndTime());
public SteadyInfoData getSteadyData(PulicTimeStatisParam param) {
SteadyInfoData steadyInfoData = new SteadyInfoData();
List<Double> steadyInfoList = getCondition(param.getId(), param.getSearchBeginTime(), param.getSearchEndTime());
List<Double> steadyInfoDataRatioList = new ArrayList<>();
if (StringUtils.isNotBlank(param.getPeriodBeginTime()) && StringUtils.isNotBlank(param.getPeriodEndTime())) {
steadyInfoDataRatioList = getCondition(param.getId(), param.getPeriodBeginTime(), param.getPeriodEndTime());
}
steadyInfoDatas.setSteadyInfoList(steadyInfoList);
steadyInfoDatas.setSteadyInfoData(steadyInfoData);
return steadyInfoDatas;
steadyInfoData.setSteadyInfoList(steadyInfoList);
steadyInfoData.setSteadyInfoData(steadyInfoDataRatioList);
return steadyInfoData;
}
private List<Float> getCondition(String lineList, String startTime, String endTime) {
SteadyDataVO steadyDataVO = new SteadyDataVO();
SteadyDataVO steadyData = new SteadyDataVO();
if (!lineList.isEmpty() || StringUtils.isNotBlank(lineList)) {
List<RStatLimitRateDVO> list = rateDMapper.getSumPassRate(Arrays.asList(lineList),
DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(),
DateUtil.beginOfDay(DateUtil.parse(endTime)).toString());
if (CollUtil.isNotEmpty(list)) {
if (ObjectUtil.isNull(list.get(0))) {
steadyDataVO.setVoltageDeviation(3.14159f);
steadyDataVO.setUBalance(3.14159f);
steadyDataVO.setFlicker(3.14159f);
steadyDataVO.setOddVoltage(3.14159f);
steadyDataVO.setEvenVoltage(3.14159f);
steadyDataVO.setOddElectric(3.14159f);
steadyDataVO.setEvenElectric(3.14159f);
steadyDataVO.setFrequency(3.14159f);
steadyDataVO.setUAberrance(3.14159f);
steadyDataVO.setHarmVoltage(3.14159f);
steadyDataVO.setHarmElec(3.14159f);
//负序电流
steadyDataVO.setINeg(3.14159f);
//间谐波
steadyDataVO.setInUharm(3.14159f);
steadyData = mergeSteady(steadyData, steadyDataVO);
SteadyDataVO steadyDataList = getSteadyAcc(steadyData);
return getSteadyData(steadyDataList);
} else {
steadyDataVO.setAllTime(Float.parseFloat(list.get(0).getAlltime().toString()));
steadyDataVO.setFrequency(Float.parseFloat(list.get(0).getFrequency().toString()));
steadyDataVO.setUBalance(Float.parseFloat(list.get(0).getUBalance().toString()));
steadyDataVO.setINeg(Float.parseFloat(list.get(0).getINeg().toString()));
steadyDataVO.setHarmElec(Float.parseFloat(list.get(0).getHarmElec().toString()));
steadyDataVO.setHarmVoltage(Float.parseFloat(list.get(0).getHarmVoltage().toString()));
steadyDataVO.setFlicker(Float.parseFloat(list.get(0).getFlicker().toString()));
steadyDataVO.setAllFlicker(Float.parseFloat(list.get(0).getAllFlicker().toString()));
steadyDataVO.setVoltageDeviation(Float.parseFloat(list.get(0).getVoltageDeviation().toString()));
steadyDataVO.setInUharm(Float.parseFloat(list.get(0).getInUharm().toString()));
}
} else {
//有监测点，但是无数据的处理
steadyDataVO.setVoltageDeviation(3.14159f);
steadyDataVO.setUBalance(3.14159f);
steadyDataVO.setFlicker(3.14159f);
steadyDataVO.setOddVoltage(3.14159f);
steadyDataVO.setEvenVoltage(3.14159f);
steadyDataVO.setOddElectric(3.14159f);
steadyDataVO.setEvenElectric(3.14159f);
steadyDataVO.setFrequency(3.14159f);
steadyDataVO.setUAberrance(3.14159f);
steadyDataVO.setHarmVoltage(3.14159f);
steadyDataVO.setHarmElec(3.14159f);
//负序电流
steadyDataVO.setINeg(3.14159f);
//间谐波
steadyDataVO.setInUharm(3.14159f);
steadyData = mergeSteady(steadyData, steadyDataVO);
SteadyDataVO steadyDataList = getSteadyAcc(steadyData);
return getSteadyData(steadyDataList);
}
} else {
//steadyData = mergeSteady(steadyData, steadyDataVO);
//无监测点前台统一替换为“/”
// SteadyDataVO steadyDataList = getSteadyAcc(steadyData);
return getSteadyData(steadyData);
}
steadyData = mergeSteady(steadyData, steadyDataVO);
SteadyDataVO steadyDataList = getSteadyAcc(steadyData);
return getSteadyData(steadyDataList);
}
/**
* 合并数据
*
* @param steadyData 原始稳态实体
*/
private SteadyDataVO mergeSteady(SteadyDataVO steadyData, SteadyDataVO tempT) {
if (tempT == null) {
return steadyData;
} else {
if (steadyData.getAllTime() == 0) {
steadyData.setAllTime(tempT.getAllTime());
} else {
steadyData.setAllTime(steadyData.getAllTime() + tempT.getAllTime());
}
if (steadyData.getFrequency() == 3.1415f) {
steadyData.setFrequency(tempT.getFrequency());
} else {
steadyData.setFrequency(steadyData.getFrequency() + tempT.getFrequency());
}
if (steadyData.getUBalance() == 3.1415f) {
steadyData.setUBalance(tempT.getUBalance());
} else {
steadyData.setUBalance(steadyData.getUBalance() + tempT.getUBalance());
}
if (steadyData.getVoltageDeviation() == 3.1415f) {
steadyData.setVoltageDeviation(tempT.getVoltageDeviation());
} else {
steadyData.setVoltageDeviation(steadyData.getVoltageDeviation() + tempT.getVoltageDeviation());
}
if (steadyData.getAllFlicker() == 3.1415f) {
steadyData.setAllFlicker(tempT.getAllFlicker());
} else {
steadyData.setAllFlicker(steadyData.getAllFlicker() + tempT.getAllFlicker());
}
if (steadyData.getFlicker() == 3.1415f) {
steadyData.setFlicker(tempT.getFlicker());
} else {
steadyData.setFlicker(steadyData.getFlicker() + tempT.getFlicker());
}
if (steadyData.getINeg() == 3.1415f) {
steadyData.setINeg(tempT.getINeg());
} else {
steadyData.setINeg(steadyData.getINeg() + tempT.getINeg());
}
if (steadyData.getInUharm() == 3.1415f) {
steadyData.setInUharm(tempT.getInUharm());
} else {
steadyData.setInUharm(steadyData.getInUharm() + tempT.getInUharm());
}
if (steadyData.getHarmVoltage() == 3.1415f) {
steadyData.setHarmVoltage(tempT.getHarmVoltage());
} else {
steadyData.setHarmVoltage(steadyData.getHarmVoltage() + tempT.getHarmVoltage());
}
if (steadyData.getHarmElec() == 3.1415f) {
steadyData.setHarmElec(tempT.getHarmElec());
} else {
steadyData.setHarmElec(steadyData.getHarmElec() + tempT.getHarmElec());
}
}
return steadyData;
}
/**
* 根据查询出来的数据，计算出每个指标的合格率
*
* @param steadyData 稳态指标数据实体
*/
private SteadyDataVO getSteadyAcc(SteadyDataVO steadyData) {
if (steadyData.getAllTime() == 0 || steadyData.getAllTime() < 0) {
steadyData.setVoltageDeviation(3.14159f);
steadyData.setUBalance(3.14159f);
steadyData.setFlicker(3.14159f);
steadyData.setOddVoltage(3.14159f);
steadyData.setEvenVoltage(3.14159f);
steadyData.setOddElectric(3.14159f);
steadyData.setEvenElectric(3.14159f);
steadyData.setFrequency(3.14159f);
steadyData.setUAberrance(3.14159f);
steadyData.setHarmVoltage(3.14159f);
steadyData.setHarmElec(3.14159f);
private List<Double> getCondition(String lineList, String startTime, String endTime) {
List<Double> floatList = new ArrayList<>();
EvaluationLevelVo.QualifiedDetail lineQualifiedDetail = gridService.getLineQualifiedDetail(lineList, startTime, endTime);
if(ObjectUtil.isNotNull(lineQualifiedDetail)){
//频率偏差
floatList.add(lineQualifiedDetail.getFreqDev());
//闪变
floatList.add(lineQualifiedDetail.getPlt());
//三项电压不平衡
floatList.add(lineQualifiedDetail.getUbalance());
//谐波电压
floatList.add(lineQualifiedDetail.getUHarm());
//谐波电流
floatList.add(lineQualifiedDetail.getIHarm());
//电压偏差
floatList.add(lineQualifiedDetail.getVDev());
//负序电流
steadyData.setINeg(3.14159f);
//间谐波
steadyData.setInUharm(3.14159f);
return steadyData;
} else {
float allTime = steadyData.getAllTime();
//冀北二期 谐波电流 谐波电压 负序电流 间谐波电压含有率 start
steadyData.setHarmVoltage(getAcceptlityByData(allTime, steadyData.getHarmVoltage()));
steadyData.setHarmElec(getAcceptlityByData(allTime, steadyData.getHarmElec()));
steadyData.setINeg(getAcceptlityByData(allTime, steadyData.getINeg()));
steadyData.setInUharm(getAcceptlityByData(allTime, steadyData.getInUharm()));
//冀北二期 谐波电流 谐波电压 负序电流 间谐波电压含有率 end
steadyData.setVoltageDeviation(getAcceptlityByData(allTime, steadyData.getVoltageDeviation()));
steadyData.setUBalance(getAcceptlityByData(allTime, steadyData.getUBalance()));
steadyData.setFlicker(getAcceptlityByData(steadyData.getAllFlicker(), steadyData.getFlicker()));
steadyData.setOddVoltage(getAcceptlityByData(allTime, steadyData.getOddVoltage()));
steadyData.setEvenVoltage(getAcceptlityByData(allTime, steadyData.getEvenVoltage()));
steadyData.setOddElectric(getAcceptlityByData(allTime, steadyData.getOddElectric()));
steadyData.setEvenElectric(getAcceptlityByData(allTime, steadyData.getEvenElectric()));
steadyData.setFrequency(getAcceptlityByData(allTime, steadyData.getFrequency()));
steadyData.setUAberrance(getAcceptlityByData(allTime, steadyData.getUAberrance()));
floatList.add(lineQualifiedDetail.getINeg());
//间谐波含有率
floatList.add(lineQualifiedDetail.getInuHarm());
}
return steadyData;
}
//计算合格率结果
private float getAcceptlityByData(float allTime, float data) {
float accpet = allTime - data;
if (accpet < 0) {
accpet = 0;
}
if (allTime == 0) {
return 100.0f;
}
float num = accpet / allTime;
// 格式化小数
DecimalFormat df = new DecimalFormat("0.00");
return Float.valueOf(df.format(num * 100));
}
private List<Float> getSteadyData(SteadyDataVO steadyDataVO) {
List<Float> floatList = new ArrayList<>();
Float frequency = steadyDataVO.getFrequency();
if (frequency > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(BigDecimal.valueOf(frequency).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
}
Float flicker = steadyDataVO.getFlicker();
if (flicker > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(BigDecimal.valueOf(flicker).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
}
Float uBalance = steadyDataVO.getUBalance();
if (uBalance > 100) {
floatList.add(100f);
} else if (uBalance == 3.1415f) {
floatList.add(3.1415f);
} else if (uBalance == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(BigDecimal.valueOf(uBalance).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
}
Float uAberrance = steadyDataVO.getUAberrance();
Float oddVoltage = steadyDataVO.getOddVoltage();
Float evenVoltage = steadyDataVO.getEvenVoltage();
if (getHarmVoltageValue(uAberrance, oddVoltage, evenVoltage) > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(getHarmVoltageValue(uAberrance, oddVoltage, evenVoltage));
}
Float voltageDeviation = steadyDataVO.getVoltageDeviation();
if (voltageDeviation > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(BigDecimal.valueOf(voltageDeviation).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
}
Float oddElectric = steadyDataVO.getOddElectric();
Float evenElectric = steadyDataVO.getEvenElectric();
if (getHarmElecValue(oddElectric, evenElectric) > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(getHarmElecValue(oddElectric, evenElectric));
}
Float iNeg = steadyDataVO.getINeg();
if (iNeg > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(BigDecimal.valueOf(iNeg).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
}
Float inUharm = steadyDataVO.getInUharm();
if (inUharm > 100) {
floatList.add(100f);
} else if (frequency == 3.1415f) {
floatList.add(3.1415f);
} else if (frequency == 3.14159f) {
floatList.add(3.14159f);
} else {
floatList.add(BigDecimal.valueOf(inUharm).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue());
}
return floatList;
}
private Float getHarmVoltageValue(Float uAberrance, Float evenVoltage, Float oddVoltage) {
float value = uAberrance + oddVoltage + evenVoltage;
value = value / 3;
return BigDecimal.valueOf(value).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
}
private Float getHarmElecValue(Float oddElectric, Float evenElectric) {
float value = oddElectric + evenElectric;
value = value / 2;
return BigDecimal.valueOf(value).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
}
}

14
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
View File

@@ -272,7 +272,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
name = data.getName();
}
String sign = name.concat("->")
.concat(surveyPlanVO.getPlanName());
.concat(surveyPlanVO.getSupvObjectName());
bpmInstanceInfo.setInstanceSign(sign);
return bpmInstanceInfo;
}
@@ -312,11 +312,13 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
String[] subIds = substation.split(StrPool.COMMA);
for (String subId : subIds) {
PollutionSubstationDTO data = lineFeignClient.getSubstationInfo(subId).getData();
SurveySubstation surveySubstation = new SurveySubstation();
surveySubstation.setDataSource(0);
surveySubstation.setSubstationName(data.getName());
surveySubstation.setVoltageLevel(data.getVoltageLevel());
surveySubstationList.add(surveySubstation);
if(ObjectUtil.isNotNull(data)){
SurveySubstation surveySubstation = new SurveySubstation();
surveySubstation.setDataSource(0);
surveySubstation.setSubstationName(data.getName());
surveySubstation.setVoltageLevel(data.getVoltageLevel());
surveySubstationList.add(surveySubstation);
}
}
}
} else {

28
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
View File

@@ -31,7 +31,6 @@ import com.njcn.supervision.pojo.param.leaflet.WarningAddParam;
import com.njcn.supervision.pojo.param.survey.SurveyTestParam;
import com.njcn.supervision.pojo.po.survey.SurveyPlan;
import com.njcn.supervision.pojo.po.survey.SurveyTest;
import com.njcn.supervision.pojo.vo.leaflet.WarningLeafletVO;
import com.njcn.supervision.pojo.vo.survey.SurveyTestVO;
import com.njcn.supervision.service.leaflet.IWarningLeafletService;
import com.njcn.supervision.service.survey.ISurveyPlanService;
@@ -100,6 +99,11 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
x.isNull("supervision_survey_test.complete_time")
.le("supervision_survey_plan.plan_start_time", surveyTestQueryParam.getSearchBeginTime())
)
.or(x->
x.between("supervision_survey_test.complete_time",
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())))
)
);
//根据工程名称模糊搜索
@@ -313,16 +317,18 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
if(Objects.nonNull(data)){
name = data.getName();
}
String sign = name.concat("由")
.concat(surveyTestVO.getDeptName())
.concat("负责")
.concat(surveyTestVO.getPlanName())
.concat("，由")
.concat(surveyTestVO.getCompleteBy())
.concat("，在")
.concat(LocalDateTimeUtil.format(surveyTestVO.getCompleteTime(),DatePattern.CHINESE_DATE_PATTERN))
.concat("完成计划测试。")
;
// String sign = name.concat("由")
// .concat(surveyTestVO.getDeptName())
// .concat("负责")
// .concat(surveyTestVO.getPlanName())
// .concat("，由")
// .concat(surveyTestVO.getCompleteBy())
// .concat("，在")
// .concat(LocalDateTimeUtil.format(surveyTestVO.getCompleteTime(),DatePattern.CHINESE_DATE_PATTERN))
// .concat("完成计划测试。")
// ;
String sign = name.concat("->")
.concat(surveyTestVO.getSupvObjectName());
bpmInstanceInfo.setInstanceSign(sign);
return bpmInstanceInfo;
}

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

@@ -234,12 +234,14 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO();
//干扰源用户台账和敏感用户审核流程
if (userReportPO.getDataType() == 1) {
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO_ARCHIVIST.getKey());
}else{
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO.getKey());
String key = SupervisionKeyEnum.BUILD_USER_INFO.getKey();
if(ObjectUtil.isNotNull(userReportPO.getDataType())){
//干扰源用户台账和敏感用户审核流程
if (userReportPO.getDataType() == 1) {
key = SupervisionKeyEnum.BUILD_USER_INFO_ARCHIVIST.getKey();
}
}
bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(key);
bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId());
bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees());
bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables);