From 4d3c6a51de4a4a21c4e46004a7e535e6f3185953 Mon Sep 17 00:00:00 2001 From: Yang <17363321594@163.com> Date: Mon, 9 Feb 2026 14:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=94=B9=E9=80=A0=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnergyDataStatisticsController.java | 4 +-- .../homepage/HomePageController.java | 2 +- .../home/service/HomePageServiceImpl.java | 1 + .../data/influxdb/InfluxDBRepository.java | 5 +++- .../mapper/model/ModelNodeMapper.xml | 25 ++++++++++++++----- 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java index e24243a..1563f94 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/energydatastatistics/EnergyDataStatisticsController.java @@ -43,7 +43,7 @@ public class EnergyDataStatisticsController extends BaseController public AjaxResult energyConsumptionSummationDay() { try { String timeType = "DAY"; - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "YSCJMX"; return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelCode)); } catch (Exception ex) { logger.error("获取出错！", ex); @@ -59,7 +59,7 @@ public class EnergyDataStatisticsController extends BaseController @GetMapping("/energyConsumptionSummation") public AjaxResult energyConsumptionSummation(String timeType) { try { - String modelCode = "COMPREHENSIVE_CODE"; + String modelCode = "YSCJMX"; return AjaxResult.success(statisticService.energyConsumptionSummation(timeType,modelCode)); } catch (Exception ex) { logger.error("获取出错！", ex); diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java index b7affd7..80a8831 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java @@ -36,7 +36,7 @@ public class HomePageController extends BaseController { @GetMapping("/energyConsumptionSummation") public AjaxResult energyConsumptionSummation(String timeType) { try { - String modelcode = "COMPREHENSIVE_CODE"; + String modelcode = "YSCJMX"; return AjaxResult.success(homepageService.energyConsumptionSummation(timeType, modelcode)); } catch (Exception ex) { logger.error("获取出错！", ex); diff --git a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java index e43584e..106b86d 100644 --- a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java +++ b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java @@ -131,6 +131,7 @@ public class HomePageServiceImpl implements IHomePageService { if (ObjectUtils.isEmpty(modelNode)) { return voList; } + // 查询 node 节点的所有 point 点位 List inforList = modelNodeService.getModelNodeIndexIdRelationInforByNodeId(modelNode.getNodeId()); List indexIds = inforList.stream().map(ModelNodePointInfo::getIndexId).collect(Collectors.toList()); // 通过indexIds找energy_used数据 diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java index 60efd7e..fe9a7d5 100644 --- a/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java +++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/data/influxdb/InfluxDBRepository.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 实时库初连接 @@ -151,7 +152,9 @@ public class InfluxDBRepository { fluxSql.append("|> filter(fn: (r) => r[\"_field\"] == \"value\")"); if (!tagCodes.isEmpty()) { fluxSql.append("|> filter(fn: (r) => r[\"tag\"] =~ /"); - List filter = new ArrayList<>(tagCodes); + List filter = tagCodes.stream() + .map(code -> code.split("_")[0]) // 按下划线分割，取第0段 + .collect(Collectors.toList()); fluxSql.append(String.join("|", filter)); fluxSql.append("/)"); } diff --git a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml index 88d4ab9..47beb26 100644 --- a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml +++ b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml @@ -307,12 +307,25 @@