From 656039ea9f1393b0e04f5e6443e05a71c463ff77 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 23 四月 2025 16:57:26 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 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 4c97a10..562b70b 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
@@ -433,10 +433,7 @@
List<ApiPointValueDTO> monthChartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
List<Double> monthValues = new ArrayList<>();
if (CollectionUtils.isEmpty(monthChartData)) {
- monthValues = monthChartData.stream().map(item -> {
- return item.getV();
- }).collect(Collectors.toList());
-
+ monthValues = monthChartData.stream().map(item -> item.getV()).collect(Collectors.toList());
result.setMax(monthValues.stream().max(Double::compareTo).get());
result.setMin(monthValues.stream().min(Double::compareTo).get());
}
@@ -488,4 +485,73 @@
}
return success(result);
}
+
+ @GetMapping("/demand/history")
+ @Operation(summary = "负荷移植-实测需量，有功功率 历史")
+ public CommonResult<PowerHistoryDTO> getPowerDemandHistory(@RequestBody PowerDemandHisReqDTO dto) {
+ log.info("请求参数: {}", JSONObject.toJSONString(dto));
+
+ // 参数校验
+ if (StringUtils.isBlank(dto.getCode())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "code不能为空");
+ }
+ if (StringUtils.isBlank(dto.getQueryType())) {
+ return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST, "queryType不能为空");
+ }
+
+ PowerDemandEntity powerDemand = powerDemandService.getByCode(dto.getCode());
+ if (powerDemand == null) {
+ log.info("未找到code对应的数据: {}", dto.getCode());
+ return success(new PowerHistoryDTO());
+ }
+
+ 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);
+ }
+
+ // 默认查最近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