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

超高压数据中心代码提交

Browse Source
This commit is contained in:
雨木c
2023-03-30 11:50:42 +08:00
parent 792dfed16e
commit 940e7f4c02
14 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-common/common-web/src/main/java/com/njcn/web/utils/PqsComasses.java
View File

@@ -50,16 +50,16 @@ public class PqsComasses implements Serializable {
@Column(name = "data_plt1")
private Double dataPlt1;
//电压闪变等级2
@Column(name = "data_plt2")
private Double dataPlt2;
//电压闪变等级3
@Column(name = "data_plt3")
private Double dataPlt3;
//电压闪变等级4
@Column(name = "data_plt4")
private Double dataPlt4;
//电压闪变等级5
@Column(name = "data_plt5")
private Double dataPlt5;

10
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ComAssessDTO.java
View File

@@ -30,15 +30,15 @@ public class ComAssessDTO {
//频率偏差等级5
private Float freqDev5;
//电压闪变等级1
private Float dataPST1;
private Float dataPlT1;
//电压闪变等级2
private Float dataPST2;
private Float dataPlT2;
//电压闪变等级3
private Float dataPST3;
private Float dataPlT3;
//电压闪变等级4
private Float dataPST4;
private Float dataPlT4;
//电压闪变等级5
private Float dataPST5;
private Float dataPlT5;
//电压不平衡度等级1
private Float vUnbalance1;
//电压不平衡度等级2

12
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/PQSComAssesPO.java
View File

@@ -50,21 +50,21 @@ public class PQSComAssesPO {
//频率偏差等级5
@Column(name = "freq_dev5")
private Double freqDev5;
//电压闪变等级1
@Column(name = "data_plt1")
private Double dataPST1;
private Double dataPlt1;
//电压闪变等级2
@Column(name = "data_plt2")
private Double dataPST2;
private Double dataPlt2;
//电压闪变等级3
@Column(name = "data_plt3")
private Double dataPST3;
private Double dataPlt3;
//电压闪变等级4
@Column(name = "data_plt4")
private Double dataPST4;
private Double dataPlt4;
//电压闪变等级5
@Column(name = "data_plt5")
private Double dataPST5;
private Double dataPlt5;
//电压不平衡度等级1
@Column(name = "v_unbalance1")
private Double vUnbalance1;

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java
View File

@@ -88,7 +88,7 @@ public class HarmonicComAssesUtil {
if (getBysxf()) {
//G和F得出综合权重A
if (getZhqzf()) {
//A[0] = 0.28;A[1] = 0.23;A[2] = 0.13;A[3] = 0.16;A[4] = 0.08;A[5] = 0.12;
A[0] = 0.28f;A[1] = 0.23f;A[2] = 0.13f;A[3] = 0.16f;A[4] = 0.08f;A[5] = 0.12f;
for (i = 0; i < GRADE_NUM; i++) {
B[i] = 0;
for (j = 0; j < ST_QT_NUM; j++) {
@@ -123,7 +123,7 @@ public class HarmonicComAssesUtil {
//组合二维数组
float f1[][]={{tempPqs.getFreqDev1(),tempPqs.getFreqDev2(),tempPqs.getFreqDev3(),tempPqs.getFreqDev4(),tempPqs.getFreqDev5()}
,{tempPqs.getVTHD1(),tempPqs.getVTHD2(),tempPqs.getVTHD3(),tempPqs.getVTHD4(),tempPqs.getVTHD5(),}
,{tempPqs.getDataPST1(),tempPqs.getDataPST2(),tempPqs.getDataPST3(),tempPqs.getDataPST4(),tempPqs.getDataPST5()}
,{tempPqs.getDataPlT1(),tempPqs.getDataPlT2(),tempPqs.getDataPlT3(),tempPqs.getDataPlT4(),tempPqs.getDataPlT5()}
,{tempPqs.getVuDev1(),tempPqs.getVuDev2(),tempPqs.getVuDev3(),tempPqs.getVuDev4(),tempPqs.getVuDev5(),}
,{tempPqs.getVUnbalance1(),tempPqs.getVUnbalance2(),tempPqs.getVUnbalance3(),tempPqs.getVUnbalance4(),tempPqs.getVUnbalance5(),}
,{tempPqs.getEvent1(),tempPqs.getEvent2(),tempPqs.getEvent3(),tempPqs.getEvent4(),tempPqs.getEvent5(),}};

32
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java
View File

@@ -49,39 +49,7 @@ public class AnalyzeController extends BaseController {
private final IHarmonicService harmonicService;
/* @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/deptSubstationRelations")
@ApiOperation("污区图-部门变电站关系")
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
public HttpResult<List<PollutionVO>> deptSubstationRelations(@RequestBody HarmonicPublicParam param) {
String methodDescribe = getMethodDescribe("deptSubstationRelations");
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
List<PollutionVO> list = pollutionService.getDeptSubstationRelations(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getSubstationInfoById")
@ApiOperation("污区图-根据部门获取变电站详情")
@ApiImplicitParam(name = "param", value = "部门参数", required = true)
public HttpResult<List<PollutionSubstationDTO>> getSubstationInfoById(@RequestBody HarmonicPublicParam param) {
String methodDescribe = getMethodDescribe("getSubstationInfoById");
LogUtil.njcnDebug(log, "{}，部门参数：{}", methodDescribe, param);
List<PollutionSubstationDTO> list = pollutionService.getSubstationInfoById(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getLineInfoById")
@ApiOperation("污区图-根据变电站获取监测点详情")
@ApiImplicitParam(name = "param", value = "变电站参数", required = true)
public HttpResult<List<PollutionLineDTO>> getLineInfoById(@RequestBody HarmonicPublicParam param) {
String methodDescribe = getMethodDescribe("getLineInfoById");
LogUtil.njcnDebug(log, "{}，变电站参数：{}", methodDescribe, param);
List<PollutionLineDTO> list = pollutionService.getLineInfoById(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getLineRank")
@ApiOperation("污区图-获取前十监测点排名")

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java
View File

@@ -26,6 +26,7 @@ import java.util.List;
* @version 1.0.0
* @author: chenchao
* @date: 2022/04/21 09:05
* 对应菜单 谐波系统-区域-电能质量评估
*/
@Validated
@Slf4j

20
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java
View File

@@ -119,16 +119,16 @@ public class ComAssessServiceImpl implements ComAssessService {
comAssessDTO.setFreqDev4(f4);
float f5 = new BigDecimal(pqsComAssesPOS.get(i).getFreqDev5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setFreqDev5(f5);
float d1 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPST1(d1);
float d2 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPST2(d2);
float d3 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPST3(d3);
float d4 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPST4(d4);
float d5 = new BigDecimal(pqsComAssesPOS.get(i).getDataPST5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPST5(d5);
float d1 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPlT1(d1);
float d2 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPlT2(d2);
float d3 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt3()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPlT3(d3);
float d4 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt4()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPlT4(d4);
float d5 = new BigDecimal(pqsComAssesPOS.get(i).getDataPlt5()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setDataPlT5(d5);
float vu1 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance1()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();
comAssessDTO.setVUnbalance1(vu1);
float vu2 = new BigDecimal(pqsComAssesPOS.get(i).getVUnbalance2()).setScale(4, BigDecimal.ROUND_HALF_UP).floatValue();

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
View File

@@ -67,8 +67,7 @@ public class THDistortionServiceImpl implements THDistortionService {
thDistortionVO.setName(generalDeviceDTO.getName());
if (!CollectionUtils.isEmpty(generalDeviceDTO.getLineIndexes())){
List<String> lineIndexes = generalDeviceDTO.getLineIndexes();
List<THDistortionVO> monitorList = thDistortionMapper.getLineData(lineIndexes);
// setLineData(monitorList,thDistortionVO);
//查找畸变率
List<PublicDTO> condition = getCondition(lineIndexes, thDistortionParam.getSearchBeginTime(), thDistortionParam.getSearchEndTime());
thDistortionVO.setDistortion(condition.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159));

2
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java
View File

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
/**
* pqs
* 畸变率
* 畸变率(mysql)
* @author cdf
* @date 2022/10/24
*/

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/PollutionDTO.java
View File

@@ -50,5 +50,10 @@ public class PollutionDTO {
*/
private Double vInharm = 0.0;
/**
* 谐波电压含有率污染值
*/
private Double vHarmonic = 0.0;
}

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

@@ -34,7 +34,7 @@ import java.util.List;
* @version V1.0.0
*/
@Slf4j
@Api(tags = "监测点数据超限处理")
@Api(tags = "监测点数据超限处理limitRate")
@RestController
@RequestMapping("limitrate")
@RequiredArgsConstructor

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

@@ -30,6 +30,7 @@ import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -532,6 +533,7 @@ public class DayDataServiceImpl implements DayDataService {
}
log.info(LocalDateTime.now()+"dayDataJobHandler执行完成!");
}
@Override

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

@@ -152,6 +152,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
outMap.put("vu_dev3",vuDev3.multiply(hundred).divide(vuDevAll,3, RoundingMode.HALF_UP));
outMap.put("vu_dev4",vuDev4.multiply(hundred).divide(vuDevAll,3, RoundingMode.HALF_UP));
outMap.put("vu_dev5",vuDev5.multiply(hundred).divide(vuDevAll,3, RoundingMode.HALF_UP));
}else {
outMap.put("vu_dev1",0.0);
outMap.put("vu_dev2",0.0);
outMap.put("vu_dev3",0.0);
outMap.put("vu_dev4",0.0);
outMap.put("vu_dev5",0.0);
}
String freqDevSql = "select count(freq_dev) from data_v where phasic_type != 'T' and quality_flag = '0' and value_type = 'AVG' and ";
@@ -172,6 +178,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
outMap.put("freq_dev3",freqDev3.multiply(hundred).divide(freqDevAll,3, RoundingMode.HALF_UP));
outMap.put("freq_dev4",freqDev4.multiply(hundred).divide(freqDevAll,3, RoundingMode.HALF_UP));
outMap.put("freq_dev5",freqDev5.multiply(hundred).divide(freqDevAll,3, RoundingMode.HALF_UP));
}else {
outMap.put("freq_dev1",0.0);
outMap.put("freq_dev2",0.0);
outMap.put("freq_dev3",0.0);
outMap.put("freq_dev4",0.0);
outMap.put("freq_dev5",0.0);
}
String vThdSql = "select count(v_thd) from data_v where phasic_type != 'T' and quality_flag = '0' and value_type = 'CP95' and ";
@@ -192,6 +204,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
outMap.put("v_thd3",vThd3.multiply(hundred).divide(vThdAll,3, RoundingMode.HALF_UP));
outMap.put("v_thd4",vThd4.multiply(hundred).divide(vThdAll,3, RoundingMode.HALF_UP));
outMap.put("v_thd5",vThd5.multiply(hundred).divide(vThdAll,3, RoundingMode.HALF_UP));
}else {
outMap.put("v_thd1",0.0);
outMap.put("v_thd2",0.0);
outMap.put("v_thd3",0.0);
outMap.put("v_thd4",0.0);
outMap.put("v_thd5",0.0);
}
String vUnbalanceSql="select count(v_unbalance) from data_v where phasic_type != 'T' and quality_flag = '0' and value_type = 'CP95' and ";
@@ -212,6 +230,12 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
outMap.put("v_unbalance3",vUnbalance3.multiply(hundred).divide(vUnbalanceAll,3, RoundingMode.HALF_UP));
outMap.put("v_unbalance4",vUnbalance4.multiply(hundred).divide(vUnbalanceAll,3, RoundingMode.HALF_UP));
outMap.put("v_unbalance5",vUnbalance5.multiply(hundred).divide(vUnbalanceAll,3, RoundingMode.HALF_UP));
}else {
outMap.put("v_unbalance1",0.0);
outMap.put("v_unbalance2",0.0);
outMap.put("v_unbalance3",0.0);
outMap.put("v_unbalance4",0.0);
outMap.put("v_unbalance5",0.0);
}
String pstSql="select count(pst) from data_flicker where phasic_type != 'T' and quality_flag = '0' and ";
@@ -227,11 +251,17 @@ public class HarmonicGeneralServiceImpl extends MppServiceImpl<RStatComassesDMap
BigDecimal pst5 = BigDecimal.valueOf(mapper.toPOJO(pstResult5, DataFlickerPO.class).size());
BigDecimal pstAll = pst1.add(pst2).add(pst3).add(pst4).add(pst5);
if (pstAll.compareTo(BigDecimal.ZERO)!=0){
outMap.put("data_pst1",pst1.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_pst2",pst2.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_pst3",pst3.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_pst4",pst4.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_pst5",pst5.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_plt1",pst1.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_plt2",pst2.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_plt3",pst3.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_plt4",pst4.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
outMap.put("data_plt5",pst5.multiply(hundred).divide(pstAll,3, RoundingMode.HALF_UP));
}else {
outMap.put("data_plt1",0.0);
outMap.put("data_plt2",0.0);
outMap.put("data_plt3",0.0);
outMap.put("data_plt4",0.0);
outMap.put("data_plt5",0.0);
}
if (!CollUtil.isEmpty(outMap)){

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

@@ -117,16 +117,12 @@ public class PollutionServiceImpl implements PollutionService {
lineIdList.add(pollutionDTO);
});
pollutionList = processPollutionList(lineIdList,harmonicVoltageList,harmonicCurrentList,frequencyDeviationList,voltageDeviationList,threePhaseVoltageList,negativeSequenceList,interHarmonicVoltageList,voltageFlickerList);
//原逻辑修改，influxDb不再进行存储日数据，改为Mysql直存
/*insertPolluction(pollutionList,dateOut.getTime());*/
//MySql入表 r_mp_pollution_d
insertPollutionDayMySql(pollutionList, dictData, local);
LogUtil.njcnDebug(log, "监测点污染指标数据MySql插入耗时：{}", timer.intervalRestart());
}
//原逻辑修改，influxDb不再进行存储日数据，改为Mysql直存
/*if (Integer.valueOf(BizParamConstant.STAT_BIZ_DAY).equals(lineParam.getType())){
insertLinePollution(pollutionList,local);
}*/
Date dateOut = DateUtil.parse(lineParam.getDataDate());
LocalDateTime localEnd = LocalDateTimeUtil.now();
LambdaQueryWrapper<RMpPollutionDPO> lambdaQuery = new LambdaQueryWrapper<>();
@@ -279,6 +275,10 @@ public class PollutionServiceImpl implements PollutionService {
map.put("pollutionType",dictData.getId());
map.put("value",pollution.getVInharm());
}
if ("V_Harmonic".equals(dictData.getCode())){
map.put("pollutionType",dictData.getId());
map.put("value",pollution.getVHarmonic());
}
}
private void processData(DictData dictData, List<RMpPollutionDPO> processList, Map<String, Object> map){