From 825762b4a1babee4d2225ed1263f3f55c6fc9263 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 11:29:31 +0800
Subject: [PATCH] 日平衡、实时调度建议保存
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 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 562b70b..1415e48 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
@@ -158,10 +158,10 @@
@GetMapping("/net-factor-dropdown/list")
@Operation(summary = "功率因数-电网拓扑下拉列表")
- public CommonResult<List<PowerNetFactorDropdownDTO>> getPowerNetFactorDropdownList(@RequestParam String nodeName) {
- List<PowerNetFactorEntity> list = powerNetFactorService.listDropdown(nodeName);
- List<PowerNetFactorDropdownDTO> result = ConvertUtils.sourceToTarget(list, PowerNetFactorDropdownDTO.class);
- return success(result);
+ public CommonResult<List<PowerNetFactorDropdownDTO>> getPowerNetFactorDropdownList(@RequestParam String nodeCode) {
+ log.info("nodeCode=" + nodeCode);
+ List<PowerNetFactorEntity> list = powerNetFactorService.listDropdown(nodeCode);
+ return success(ConvertUtils.sourceToTarget(list, PowerNetFactorDropdownDTO.class));
}
/**
@@ -467,6 +467,7 @@
List<PowerAdjustedFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerAdjustedFactorDTO.class);
Map<String, Double> result = new HashMap<>();
if (CollectionUtils.isEmpty(list)) {
+ log.info("PowerAdjustedFactor List is empty");
return success(result);
}
List<String> points = new ArrayList<>();
@@ -479,6 +480,7 @@
if (!CollectionUtils.isEmpty(points)) {
dataMap = dataPointApi.queryPointsRealValue(points);
}
+
for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
Double value = dataMap.get(powerAdjustedFactorDTO.getPointNo()) == null ? 0 : Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString());
result.put(powerAdjustedFactorDTO.getName(), value);
@@ -486,7 +488,7 @@
return success(result);
}
- @GetMapping("/demand/history")
+ @PostMapping("/demand/history")
@Operation(summary = "负荷移植-实测需量，有功功率 历史")
public CommonResult<PowerHistoryDTO> getPowerDemandHistory(@RequestBody PowerDemandHisReqDTO dto) {
log.info("请求参数: {}", JSONObject.toJSONString(dto));
@@ -554,4 +556,75 @@
return success(result);
}
+ @PostMapping("/gen/history")
+ @Operation(summary = "功率因数-发电机组功率历史")
+ public CommonResult<PowerHistoryDTO> getPowerGenStatusHistory(@RequestBody PowerGenStatusHisReqDTO dto) {
+ log.info("请求参数: {}", JSONObject.toJSONString(dto));
+
+ // 参数校验
+ if (StringUtils.isBlank(dto.getId())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "id不能为空");
+ }
+ if (StringUtils.isBlank(dto.getQueryType())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "queryType不能为空");
+ }
+
+ PowerGenStatusEntity powerGenStatus = powerGenStatusDaoService.getById(dto.getId());
+ if (powerGenStatus == null) {
+ log.info("未找到code对应的数据: {}", dto.getId());
+ return success(new PowerHistoryDTO());
+ }
+
+ String queryType = dto.getQueryType().toUpperCase();
+ String pointNo;
+ switch (queryType.toUpperCase()) {
+ case "D":
+ pointNo = powerGenStatus.getCurP();
+ break;
+ case "P":
+ pointNo = powerGenStatus.getCurQ();
+ break;
+ case "COS":
+ pointNo = powerGenStatus.getCurCOS();
+ break;
+ default:
+ throw new IllegalArgumentException("不支持的queryType: " + queryType);
+ }
+
+ // 默认查最近24小时
+ Date end = Optional.ofNullable(dto.getEndTime()).orElseGet(() -> {
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.MILLISECOND, 0);
+ cal.set(Calendar.SECOND, 0);
+ return cal.getTime();
+ });
+
+ Date start = Optional.ofNullable(dto.getStartTime()).orElseGet(() -> {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(end);
+ cal.add(Calendar.MINUTE, -1440); // 24小时前
+ return cal.getTime();
+ });
+
+ // 查询历史数据
+ ApiPointValueQueryDTO query = new ApiPointValueQueryDTO();
+ query.setPointNo(pointNo);
+ query.setStart(start);
+ query.setEnd(end);
+
+ log.info("开始查询发电机组功率历史数据，测点: {}", pointNo);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(query);
+
+ // 构建返回结果
+ PowerHistoryDTO result = new PowerHistoryDTO();
+ result.setCategories(DateUtils.getTimeScale(start, end, 60));
+ result.setDataList(chartData.stream()
+ .map(pv -> new Object[]{
+ DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND),
+ pv.getV()
+ })
+ .collect(Collectors.toList()));
+
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3