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
2025-12-13 23:59:26 +08:00
parent 12cfecac7e
commit b9696e957d
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/PowerFlagPollution.java
View File

@@ -72,4 +72,10 @@ public class PowerFlagPollution implements Serializable {
@ApiModelProperty("谐波污染值")
private Double vHarmonicValue;
@ApiModelProperty("干扰源类型")
private String loadType;
@ApiModelProperty("监测对象")
private String objName;
}

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/SubstationPollution.java
View File

@@ -42,6 +42,9 @@ public class SubstationPollution implements Serializable {
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("污染值")
private Double subValue;
/**
* 电网侧&非电网侧

22
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
View File

@@ -1152,6 +1152,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
PowerFlagPollution lineItemPollution = new PowerFlagPollution();
BeanUtil.copyProperties(linePollution, lineItemPollution, true);
lineItemPollution.setVHarmonicValue(linePollution.getHarmonicValue());
lineItemPollution.setSubName(linePollution.getSubStationName());
lineItemPollutionList.add(lineItemPollution);
}
substationPollution.setPowerFlagPollutionList(lineItemPollutionList);
@@ -1227,6 +1228,8 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
pollution1.setLoginTime(lineDetail.getLoginTime());
pollution1.setInterval(lineDetail.getTimeInterval());
pollution1.setPowerFlag(lineDetail.getPowerFlag());
pollution1.setLoadType(lineDetail.getLoadType());
pollution1.setObjName(lineDetail.getObjName());
pollution1.setVHarmonicValue(pollutionMap.containsKey(lineDetail.getLineId())?NumberUtil.round(pollutionMap.get(lineDetail.getLineId()),2).doubleValue():0.0);
linePollutionList.add(pollution1);
}
@@ -1264,7 +1267,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
if (CollectionUtil.isNotEmpty(userReportPOList)) {
userReportPOList.forEach(item -> {
if (ObjectUtil.isNotNull(item.getSubstation()) && !Objects.equals(item.getSubstation(), "")) {
List<BigDecimal> value = new ArrayList<>();
List<PowerFlagPollution> ll = new ArrayList<>();
String[] parts = item.getSubstation().split("、");
@@ -1280,6 +1282,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
PowerFlagPollution lineItemPollution = new PowerFlagPollution();
BeanUtil.copyProperties(pojo, lineItemPollution, true);
lineItemPollution.setVHarmonicValue(pojo.getHarmonicValue());
lineItemPollution.setSubName(pojo.getSubStationName());
ll.add(lineItemPollution);
}
}
@@ -1289,15 +1292,22 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
linePollution.setGdName(item.getCity());
linePollution.setSubStationName(item.getSubstation());
linePollution.setProjectName(item.getProjectName());
linePollution.setSubVStationValue(String.valueOf(BigDecimal.valueOf(value.stream()
.mapToDouble(BigDecimal::doubleValue)
.average()
.orElse(0.0)).setScale(2, RoundingMode.HALF_UP).doubleValue()));
if (CollectionUtil.isEmpty(ll)) {
linePollution.setSubValue(null);
} else {
linePollution.setSubValue(BigDecimal.valueOf(value.stream()
.mapToDouble(BigDecimal::doubleValue)
.average()
.orElse(0.0)).setScale(2, RoundingMode.HALF_UP).doubleValue());
linePollution.setPowerFlagPollutionList(ll);
}
result.add(linePollution);
linePollution.setPowerFlagPollutionList(ll);
}
});
}
if (CollectionUtil.isNotEmpty(result)) {
result.sort(Comparator.comparing(SubstationPollution::getSubValue,Comparator.nullsLast(Comparator.reverseOrder())));
}
return result;
}

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java
View File

@@ -297,7 +297,7 @@ public class UserReportManageController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getSensitiveUserByDept")
@ApiOperation("根据部门获取敏感用户信息")
@ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true)
@ApiImplicitParam(name = "param", value = "参数", required = true)
public HttpResult<List<UserReportPO>> getSensitiveUserByDept(@RequestBody @Validated SensitiveUserParam param) {
String methodDescribe = getMethodDescribe("getSensitiveUserByDept");
List<UserReportPO> list = userReportPOService.getSensitiveUserByDept(param);