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

接口调整

Browse Source
This commit is contained in:
xy
2024-07-16 09:21:10 +08:00
parent c1bfc2347f
commit 458b2347ed
12 changed files with 274 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
private final WordUtil2 wordUtil2;
private final DataVMapper dataVMapper;
private final DataIMapper dataIMapper;
private final IDataIMapper dataIMapper;
private final DataHarmRateVMapper dataHarmRateVMapper;
private final DataInHarmVMapper dataInHarmVMapper;
private final DataPltMapper dataPltMapper;
@@ -252,8 +252,8 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
param.setDeptName(deptName);
String inputUrl = "file/warningReport.docx";
String alarmType = param.getType() == 1 ? "预警" : "告警";
String fileName = "电能[告]"+param.getYear()+"年"+param.getNumber()+"号-"+param.getDeptName()+"地市 电能质量技术监督"+alarmType+"单.docx";
String alarmType = param.getType() == 1 ? "预" : "告";
String fileName = "电能["+alarmType+"]"+param.getYear()+"年"+param.getNumber()+"号-"+param.getDeptName()+"地市 电能质量技术监督"+alarmType+"警单.docx";
//获取无数据监测点集合
List<ReportLineInfoVo> list1 = getReportLineInfo(true,param.getIdList(),null,param.getSearchBeginTime(),param.getSearchEndTime(),param.getDeptId(),allLineWarnings);
//获取谐波电压超标监测点集合
@@ -272,7 +272,10 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
dataMap.put("${harmonicV}", CollUtil.isEmpty(list2)?"0":String.valueOf(list2.size()));
dataMap.put("${harmonicI}", CollUtil.isEmpty(list3)?"0":String.valueOf(list3.size()));
dataMap.put("${alarmDay}", String.valueOf(param.getAlarmThreshold()));
dataMap.put("${title}", alarmType);
dataMap.put("${title}", alarmType + "警");
dataMap.put("${alarmType}", alarmType);
dataMap.put("${gdName}", getGdName(param.getDeptName()));
dataMap.put("${time}", LocalDate.now().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
List<String[]> dataList1 = new ArrayList<String[]>(),dataList2 = new ArrayList<String[]>(),dataList3 = new ArrayList<String[]>();
if (CollUtil.isNotEmpty(list1)) {
@@ -336,13 +339,18 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
@Override
public List<LineLimitDetailVo> getOverLimitDetail(OnlineParam.DetailParam param) {
List<LineLimitDetailVo> result = new ArrayList<>();
String targetCode = dicDataFeignClient.getDicDataById(param.getTargetId()).getData().getCode();
//获取监测点统计间隔
Integer timeInterval = commTerminalGeneralClient.getMonitorDetail(param.getLineId()).getData().getInterval();
//获取限值
Overlimit overlimit = commTerminalGeneralClient.getOverLimitData(param.getLineId()).getData();
//处理数据
return chanelTarget(param,overlimit,timeInterval,targetCode);
List<LineLimitDetailVo> data = chanelTarget(param,overlimit,timeInterval,targetCode);
if (CollUtil.isNotEmpty(data)) {
result = data.stream().sorted(Comparator.comparing(LineLimitDetailVo::getTime)).collect(Collectors.toList());
}
return result;
}
//指标数据处理
@@ -401,7 +409,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
}
}
//电压总谐波畸变率
if (Objects.equals(targetCode,DicDataEnum.THD_V.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
if (Objects.equals(targetCode,DicDataEnum.THD_V.getCode())) {
List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),4).getData();
if (CollUtil.isNotEmpty(list)) {
list.forEach(item->{
@@ -583,6 +591,19 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
result.add(vo);
}
/**
* 获取供电公司名称
*/
public String getGdName(String deptName) {
String gdName;
if (Objects.equals(deptName,"风光储") || Objects.equals(deptName,"超高压") ) {
gdName = deptName + "公司";
} else {
gdName = deptName + "供电公司";
}
return gdName;
}
public List<ReportLineInfoVo> getReportLineInfo(boolean type, List<String> idList, String codeId, String startTime, String endTime, String deptId,List<LineWarning> allLineWarnings) {
List<ReportLineInfoVo> list = new ArrayList<>();
LambdaQueryWrapper<LineWarning> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -786,7 +807,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhaseType,"T")
.eq(DataV::getPhasicType,"T")
.max(DataV::getFreqDev)
.between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper2);
@@ -799,14 +820,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MIN)
.regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
.min(DataV::getVuDev)
.between(DataV::getTime, startTime, endTime);
List<DataV> result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper));
InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
.max(DataV::getVuDev)
.between(DataV::getTime, startTime, endTime);
result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2));
@@ -832,7 +853,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.CP95)
.regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
.max(DataV::getVThd)
.between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -845,7 +866,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhaseType,"T")
.eq(DataV::getPhasicType,"T")
.max(DataV::getVUnbalance)
.between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper);

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

@@ -89,7 +89,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
QueryWrapper<SurveyTestVO> surveyTestVOQueryWrapper = new QueryWrapper<>();
if (Objects.nonNull(surveyTestQueryParam)) {
//添加上时间范围
surveyTestVOQueryWrapper.between("supervision_survey_test.create_time",
surveyTestVOQueryWrapper.between("supervision_survey_plan.plan_start_time",
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())));
//根据工程名称模糊搜索
@@ -121,6 +121,9 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
surveyTestVOQueryWrapper
.eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode())
.orderByDesc("supervision_survey_test.Update_Time");
//未完成的技术监督计划，也要展示出来，不受时间限制
surveyTestVOQueryWrapper.or().isNull("supervision_survey_test.complete_time")
.le("supervision_survey_plan.plan_start_time",surveyTestQueryParam.getSearchBeginTime());
Page<SurveyTestVO> surveyTestVOPage = this.baseMapper.surveyTestPage(new Page<>(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper);
List<SurveyTestVO> records = surveyTestVOPage.getRecords();
if (CollectionUtil.isNotEmpty(records)) {
@@ -358,7 +361,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
surveyTestVO.getDeptId(),
IdWorker.get32UUID(),
warningAddParam.getId(),
ProblemTypeEnum.SITE_TEST.getCode(),
ProblemTypeEnum.PLAN.getCode(),
LeafletTypeEnum.ALARM.getCode(),
surveyTestVO.getProblemDetail(),
warningAddParam.getReformAdvice(),

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

@@ -553,7 +553,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
//评估类型
List<DictData> evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData();
//指标类型
List<DictData> indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData();
List<DictData> indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_INDICATORS.getCode()).getData();
//行业类型
List<DictData> industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE_JB.getCode()).getData();
//负荷级别
@@ -671,6 +671,8 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
List<DictData> devVoltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
//指标类型
List<DictData> indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData();
//敏感用户字典
List<DictData> problemIndicators = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_INDICATORS.getCode()).getData();
//评估类型
List<DictData> evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData();
//行业类型
@@ -717,12 +719,18 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
userReportPO.setState(DataStateEnum.ENABLE.getCode());
this.baseMapper.insert(userReportPO);
//处理敏感用户的信息
List<String> indexList = new ArrayList<>();
UserReportSensitivePO userReportSensitivePO = new UserReportSensitivePO();
userReportSensitivePO.setId(userReportPO.getId());
userReportSensitivePO.setPccPoint(userExcel.getPccPoint());
userReportSensitivePO.setDeviceName(userExcel.getDeviceName());
userReportSensitivePO.setPowerSupplyCount(userExcel.getPowerSupplyCount());
userReportSensitivePO.setEnergyQualityIndex(PubUtil.getDicById(userExcel.getEnergyQualityIndex(), indicatorType));
//处理多指标数据
String[] indexArr = userExcel.getEnergyQualityIndex().split(",");
for (String s : indexArr) {
indexList.add(PubUtil.getDicById(s, problemIndicators));
}
userReportSensitivePO.setEnergyQualityIndex(indexList.stream().map(String::valueOf).collect(Collectors.joining(",")));
userReportSensitivePO.setEvaluationType(PubUtil.getDicById(userExcel.getEvaluationType(), evaluationType));
userReportSensitivePO.setAntiInterferenceTest(userExcel.getAntiInterferenceTest() + "");
userReportSensitivePO.setEvaluationChekDept(userExcel.getEvaluationChekDept());

BIN
pqs-supervision/supervision-boot/src/main/resources/file/warningReport.docx
View File

Binary file not shown.