From d7f9a43aa440ddd1408ea7816d46f3b55b57cb9f Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 08:59:01 +0800
Subject: [PATCH] 负荷移植-实测需量，有功功率 历史(多code)
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 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 a188daa..de0829f 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
@@ -826,4 +826,67 @@
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(dto.getCode());
+ 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);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3