From 145f3c2fa994f7fdc37248fa0e2222a14ac5c7d9 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 18:15:13 +0800
Subject: [PATCH] 功率因数-电网拓扑 增加有功无功预警
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 229 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 174 insertions(+), 55 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index c161ca8..e80f133 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -77,11 +77,14 @@
@Autowired
private PowerNetDropdownService powerNetDropdownService;
+ @Autowired
+ private PowerVoltageStatusService powerVoltageStatusService;
+
@GetMapping("/net-factor/list")
@Operation(summary = "功率因数-电网拓扑")
public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) {
List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
- List<PowerNetFactorDTO> result = ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class);
+ List<PowerNetFactorDTO> result = new ArrayList<>();
if (CollectionUtils.isEmpty(result)) {
return success(result);
}
@@ -91,72 +94,102 @@
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.HOUR_OF_DAY, 0);
- for (PowerNetFactorDTO dto : result) {
+ for (PowerNetFactorEntity entity : list) {
+ PowerNetFactorDTO powerNetFactorDTO = new PowerNetFactorDTO();
+ powerNetFactorDTO.setId(entity.getId());
+ powerNetFactorDTO.setGroupName(entity.getGroupName());
+ powerNetFactorDTO.setNodeCode(entity.getNodeCode());
+ powerNetFactorDTO.setNodeName(entity.getNodeName());
boolean cosFlag = false;
try {
List<String> points = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getCurP())) {
- points.add(dto.getCurP());
+ if (StringUtils.isNotBlank(entity.getCurP())) {
+ points.add(entity.getCurP());
}
- if (StringUtils.isNotBlank(dto.getCurQ())) {
- points.add(dto.getCurQ());
+ if (StringUtils.isNotBlank(entity.getCurQ())) {
+ points.add(entity.getCurQ());
}
if (!CollectionUtils.isEmpty(points)) {
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- if (pointsRealValue.get(dto.getCurP()) != null) {
- dto.setCurP(pointsRealValue.get(dto.getCurP()).toString());
+ if (pointsRealValue.get(entity.getCurP()) != null) {
+ powerNetFactorDTO.setCurP(new BigDecimal(pointsRealValue.get(entity.getCurP()).toString()));
}
- if (pointsRealValue.get(dto.getCurQ()) != null) {
- dto.setCurQ(pointsRealValue.get(dto.getCurQ()).toString());
+ if (pointsRealValue.get(entity.getCurQ()) != null) {
+ powerNetFactorDTO.setCurQ(new BigDecimal(pointsRealValue.get(entity.getCurQ()).toString()));
}
- if (pointsRealValue.get(dto.getCurCos()) != null) {
- dto.setCurCos(pointsRealValue.get(dto.getCurCos()).toString());
+ if (pointsRealValue.get(entity.getCurCos()) != null) {
+ powerNetFactorDTO.setCurCos(new BigDecimal(pointsRealValue.get(entity.getCurCos()).toString()));
cosFlag = true;
}
}
} catch (Exception ex) {
- log.info(dto.getNodeName() + "获取当前值异常" + ex.getMessage());
+ log.info(entity.getNodeName() + "获取当前值异常" + ex.getMessage());
}
try {
PredictLastValueReqVO reqVO = new PredictLastValueReqVO();
reqVO.setPredictTime(calendar.getTime());
List<String[]> itemNos = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getPreP())) {
- itemNos.add(dto.getPreP().split(","));
+ if (StringUtils.isNotBlank(entity.getPreP())) {
+ itemNos.add(entity.getPreP().split(","));
}
- if (StringUtils.isNotBlank(dto.getPreQ())) {
- itemNos.add(dto.getPreQ().split(","));
+ if (StringUtils.isNotBlank(entity.getPreQ())) {
+ itemNos.add(entity.getPreQ().split(","));
}
- if (StringUtils.isNotBlank(dto.getPreCos())) {
- itemNos.add(dto.getPreCos().split(","));
+ if (StringUtils.isNotBlank(entity.getPreCos())) {
+ itemNos.add(entity.getPreCos().split(","));
}
if (!CollectionUtils.isEmpty(itemNos)) {
reqVO.setItemNos(itemNos);
log.info("reqVO=" + JSONObject.toJSONString(reqVO));
Map<String, BigDecimal> preValues = mcsApi.getPredictValueByTime(reqVO);
- if (StringUtils.isNotBlank(dto.getPreP()) && preValues.get(dto.getPreP()) != null) {
- dto.setPreP(preValues.get(dto.getPreP()).toString());
+ if (StringUtils.isNotBlank(entity.getPreP()) && preValues.get(entity.getPreP()) != null) {
+ powerNetFactorDTO.setPreP(new BigDecimal(preValues.get(entity.getPreP()).toString()));
}
- if (StringUtils.isNotBlank(dto.getPreQ()) && preValues.get(dto.getPreQ()) != null) {
- dto.setPreQ(preValues.get(dto.getPreQ()).toString());
+ if (StringUtils.isNotBlank(entity.getPreQ()) && preValues.get(entity.getPreQ()) != null) {
+ powerNetFactorDTO.setPreQ(new BigDecimal(preValues.get(entity.getPreQ()).toString()));
}
- if (StringUtils.isNotBlank(dto.getPreCos()) && preValues.get(dto.getPreCos()) != null) {
- dto.setPreCos(preValues.get(dto.getPreCos()).toString());
+ if (StringUtils.isNotBlank(entity.getPreCos()) && preValues.get(entity.getPreCos()) != null) {
+ powerNetFactorDTO.setPreCos(new BigDecimal(preValues.get(entity.getPreCos()).toString()));
}
}
} catch (Exception ex) {
- log.info(dto.getNodeName() + "获取预测值异常," + ex.getMessage());
+ log.info(entity.getNodeName() + "获取预测值异常," + ex.getMessage());
}
- // 设置状态
- if (cosFlag && StringUtils.isNotBlank(dto.getCurCos()) && NumberUtil.isNumber(dto.getCurCos())) {
- BigDecimal curCos = new BigDecimal(dto.getCurCos());
- if (dto.getLimitL() != null && dto.getLimitH() != null &&
- curCos.compareTo(dto.getLimitL()) < 0 || curCos.compareTo(dto.getLimitH()) > 0) {
- dto.setStatus(1);
+ // 设置功率因数状态
+ if (cosFlag && powerNetFactorDTO.getCurCos() != null) {
+ BigDecimal curCos = powerNetFactorDTO.getCurCos();
+ if (entity.getLimitL() != null && curCos.compareTo(entity.getLimitL()) < 0) {
+ powerNetFactorDTO.setStatus(1);
+ } else if (entity.getLimitH() != null && curCos.compareTo(entity.getLimitH()) > 0) {
+ powerNetFactorDTO.setStatus(1);
} else {
- dto.setStatus(0);
+ powerNetFactorDTO.setStatus(0);
+ }
+ }
+
+ // 设置有功预警状态
+ if (powerNetFactorDTO.getCurP() != null) {
+ BigDecimal curP = powerNetFactorDTO.getCurP();
+ if (entity.getPLimitH() != null && curP.compareTo(entity.getPLimitL()) < 0) {
+ powerNetFactorDTO.setStatus(1);
+ } else if (entity.getPLimitH() != null && curP.compareTo(entity.getPLimitH()) > 0) {
+ powerNetFactorDTO.setStatus(1);
+ } else {
+ powerNetFactorDTO.setStatus(0);
+ }
+ }
+
+ // 设置无功预警状态
+ if (powerNetFactorDTO.getCurQ() != null) {
+ BigDecimal curQ = powerNetFactorDTO.getCurQ();
+ if (entity.getQLimitH() != null && curQ.compareTo(entity.getQLimitL()) < 0) {
+ powerNetFactorDTO.setStatus(1);
+ } else if (entity.getQLimitH() != null && curQ.compareTo(entity.getQLimitH()) > 0) {
+ powerNetFactorDTO.setStatus(1);
+ } else {
+ powerNetFactorDTO.setStatus(0);
}
}
}
@@ -459,6 +492,13 @@
if (CollectionUtils.isEmpty(result)) {
return success(result);
}
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+
for (PowerDemandDTO dto : result) {
List<String> points = new ArrayList<>();
if (StringUtils.isNotBlank(dto.getCurDemand())) {
@@ -467,11 +507,8 @@
if (StringUtils.isNotBlank(dto.getActivePower())) {
points.add(dto.getActivePower());
}
-
if (!CollectionUtils.isEmpty(points)) {
-
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
-
if (pointsRealValue.get(dto.getCurDemand()) != null) {
dto.setCurDemand(pointsRealValue.get(dto.getCurDemand()).toString());
}
@@ -481,31 +518,17 @@
}
if (!StringUtils.isEmpty(dto.getMaxDemand())) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- calendar.set(Calendar.HOUR_OF_DAY, 0);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MILLISECOND, 0);
Date start = calendar.getTime();
ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
- apiPointValueQueryDTO.setEnd(new Date());
apiPointValueQueryDTO.setPointNo(dto.getMaxDemand());
-
- List<ApiPointValueDTO> monthValues = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
- double max = 0;
- for (int i = 0; i < monthValues.size() - 1; i++) {
- if (max < monthValues.get(i).getV()) {
- max = monthValues.get(i).getV();
- }
+ Map<String, Object> maxValue = dataPointApi.queryPointMaxValue(apiPointValueQueryDTO);
+ if (maxValue != null) {
+ dto.setMaxDemand(maxValue.get(dto.getMaxDemand()) == null ? "" : maxValue.get(dto.getMaxDemand()).toString());
}
- dto.setMaxDemand(String.valueOf(max));
+
}
-
-
}
-
return success(result);
}
@@ -768,7 +791,7 @@
}
@PostMapping("/demand/history")
- @Operation(summary = "负荷移植-实测需量，有功功率 历史")
+ @Operation(summary = "负荷移植-实测需量有功功率历史")
public CommonResult<PowerHistoryDTO> getPowerDemandHistory(@RequestBody PowerDemandHisReqDTO dto) {
log.info("请求参数: {}", JSONObject.toJSONString(dto));
@@ -836,4 +859,100 @@
return success(result);
}
+ @PostMapping("/demand/history-list")
+ @Operation(summary = "负荷移植-实测需量有功功率历史(多code)")
+ public CommonResult<LinkedHashMap<String, List<Object[]>>> getPowerDemandHistoryList(@RequestBody PowerDemandHisReqDTO dto) {
+ log.info("请求参数: {}", JSONObject.toJSONString(dto));
+ LinkedHashMap<String, List<Object[]>> result = new LinkedHashMap<>();
+
+ // 参数校验
+ if (CollectionUtils.isEmpty(dto.getCodeList())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "codeList不能为空");
+ }
+ if (StringUtils.isBlank(dto.getQueryType())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "queryType不能为空");
+ }
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.set(Calendar.SECOND, 0);
+ Date endTime = dto.getEndTime() == null ? cal.getTime() : dto.getEndTime();
+ Date startTime = dto.getStartTime();
+ if (dto.getStartTime() == null) {
+ cal.add(Calendar.DAY_OF_YEAR, -1);
+ startTime = cal.getTime();
+ }
+
+ for (String code : dto.getCodeList()) {
+ PowerDemandEntity powerDemand = powerDemandService.getByCode(code);
+ if (powerDemand == null) {
+ log.info("未找到code对应的数据: {}", dto.getCode());
+ return success(new LinkedHashMap<>());
+ }
+
+ String queryType = dto.getQueryType().toUpperCase();
+ String pointNo;
+ switch (queryType.toUpperCase()) {
+ case "D":
+ pointNo = powerDemand.getCurDemand();
+ break;
+ case "P":
+ pointNo = powerDemand.getActivePower();
+ break;
+ default:
+ throw new IllegalArgumentException("不支持的queryType: " + queryType);
+ }
+
+ // 查询历史数据
+ ApiPointValueQueryDTO query = new ApiPointValueQueryDTO();
+ query.setPointNo(pointNo);
+ query.setStart(startTime);
+ query.setEnd(endTime);
+ log.info("开始查询实测需量有功功率历史数据，测点: {}", pointNo);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(query);
+ List<Object[]> dataList = chartData.stream()
+ .map(pv -> new Object[]{
+ DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND),
+ pv.getV()
+ })
+ .collect(Collectors.toList());
+
+ result.put(code, dataList);
+ }
+
+ return success(result);
+ }
+
+
+ @GetMapping("/voltage/status-list")
+ @Operation(summary = "功率因数-母线电压状态")
+ public CommonResult<List<PowerVoltageStatusDTO>> getPowerVoltageStatusList(@RequestParam Map<String, Object> params) {
+ List<PowerVoltageStatusDTO> result = new ArrayList<>();
+ List<PowerVoltageStatusEntity> list = powerVoltageStatusService.list(params);
+ if (CollectionUtils.isEmpty(list)) {
+ return success(result);
+ }
+
+ List<String> points = new ArrayList<>();
+ for (PowerVoltageStatusEntity entity : list) {
+ if (StringUtils.isBlank(entity.getPoint())) {
+ continue;
+ }
+ points.add(entity.getPoint());
+ }
+ Map<String, Object> pointsRealValue = new HashMap<>();
+ if (!CollectionUtils.isEmpty(points)) {
+ pointsRealValue = dataPointApi.queryPointsRealValue(points);
+ }
+ for (PowerVoltageStatusEntity entity : list) {
+ PowerVoltageStatusDTO dto = ConvertUtils.sourceToTarget(entity, PowerVoltageStatusDTO.class);
+ dto.setStatus(0);
+ BigDecimal value = new BigDecimal(pointsRealValue.get(entity.getPoint()).toString());
+ if (value.compareTo(entity.getLimitH()) > 0) {
+ dto.setStatus(1);
+ }
+ dto.setVoltage(value);
+ result.add(dto);
+ }
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3