From 1d6d86b9d2c43067a25cd66c4b1c0d20187379d4 Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Thu, 19 Mar 2026 16:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=B8=A9=E5=BA=A6=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agri/system/domain/vo/LiveDataView.java   | 30 --------------
 .../system/domain/vo/UChartsDataView.java     |  4 +-
 .../system/service/ISysDtuDataService.java    |  5 +--
 .../service/impl/SysDtuDataServiceImpl.java   | 39 +++++++------------
 4 files changed, 19 insertions(+), 59 deletions(-)
 delete mode 100644 agri-system/src/main/java/com/agri/system/domain/vo/LiveDataView.java

diff --git a/agri-system/src/main/java/com/agri/system/domain/vo/LiveDataView.java b/agri-system/src/main/java/com/agri/system/domain/vo/LiveDataView.java
deleted file mode 100644
index a2bdaa2..0000000
--- a/agri-system/src/main/java/com/agri/system/domain/vo/LiveDataView.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.agri.system.domain.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-public class LiveDataView {
-
-    private List<String> timeList;
-
-    private List<BigDecimal> temp1List;
-
-    private List<BigDecimal> temp2List;
-
-    private List<BigDecimal> temp3List;
-
-    private List<BigDecimal> temp4List;
-
-    private List<BigDecimal> humi1List;
-
-    private List<BigDecimal> humi2List;
-
-    private List<BigDecimal> humi3List;
-
-    private List<BigDecimal> humi4List;
-
-}
diff --git a/agri-system/src/main/java/com/agri/system/domain/vo/UChartsDataView.java b/agri-system/src/main/java/com/agri/system/domain/vo/UChartsDataView.java
index f385480..04e8b5b 100644
--- a/agri-system/src/main/java/com/agri/system/domain/vo/UChartsDataView.java
+++ b/agri-system/src/main/java/com/agri/system/domain/vo/UChartsDataView.java
@@ -17,14 +17,16 @@ public class UChartsDataView {
     // 内部类：单条系列数据
     public static class UChartsSeries {
         private String name;    // 系列名称（如"温度1"）
+        private Boolean show;    // 系列名称（如"温度1"）
         private BigDecimal index;
         private List<BigDecimal> data; // 系列数值
 
         public UChartsSeries() {
         }
 
-        public UChartsSeries(String name, BigDecimal index, List<BigDecimal> data) {
+        public UChartsSeries(String name, Boolean show, BigDecimal index, List<BigDecimal> data) {
             this.name = name;
+            this.show = show;
             this.index = index;
             this.data = data;
         }
diff --git a/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java b/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java
index 77c1a13..1a4319c 100644
--- a/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java
+++ b/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java
@@ -1,11 +1,10 @@
 package com.agri.system.service;
 
 import com.agri.system.domain.SysDtuData;
-import com.agri.system.domain.vo.LiveDataView;
+import com.agri.system.domain.vo.UChartsDataView;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -74,7 +73,7 @@ public interface ISysDtuDataService  extends IService<SysDtuData>
 
     List<Map<String, Object>> getLastDtuDataByImeiList(List<String> imeiList);
 
-    LiveDataView getHistoryData(String imei, LocalDateTime startTime, LocalDateTime endTime);
+    UChartsDataView getHistoryData(String imei, LocalDateTime startTime, LocalDateTime endTime);
 
 
 }
diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java
index 1effdc0..93aa50e 100644
--- a/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java
+++ b/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java
@@ -2,7 +2,6 @@ package com.agri.system.service.impl;
 
 import com.agri.common.utils.DateUtils;
 import com.agri.system.domain.SysDtuData;
-import com.agri.system.domain.vo.LiveDataView;
 import com.agri.system.domain.vo.UChartsDataView;
 import com.agri.system.mapper.SysDtuDataMapper;
 import com.agri.system.service.ISysDtuDataService;
@@ -134,7 +133,7 @@ public class SysDtuDataServiceImpl extends ServiceImpl<SysDtuDataMapper, SysDtuD
     }
 
     @Override
-    public LiveDataView getHistoryData(String imei, LocalDateTime startTime, LocalDateTime endTime) {
+    public UChartsDataView getHistoryData(String imei, LocalDateTime startTime, LocalDateTime endTime) {
         // 非空校验
         Assert.hasText(imei, "设备IMEI不能为空");
 
@@ -149,7 +148,6 @@ public class SysDtuDataServiceImpl extends ServiceImpl<SysDtuDataMapper, SysDtuD
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
         List<SysDtuData> historyData = baseMapper.getHistoryData(imei, finalStartTime, finalEndTime);
-        LiveDataView liveDataView = new LiveDataView();
         List<String> categories = new ArrayList<>();
         List<BigDecimal> temp1List = new ArrayList<>();
         List<BigDecimal> temp2List = new ArrayList<>();
@@ -179,27 +177,18 @@ public class SysDtuDataServiceImpl extends ServiceImpl<SysDtuDataMapper, SysDtuD
         }
 
         // 设置返回数据
-        liveDataView.setTimeList(categories);
-        liveDataView.setTemp1List(temp1List);
-        liveDataView.setTemp2List(temp2List);
-        liveDataView.setTemp3List(temp3List);
-        liveDataView.setTemp4List(temp4List);
-        liveDataView.setHumi1List(humi1List);
-        liveDataView.setHumi2List(humi2List);
-        liveDataView.setHumi3List(humi3List);
-        liveDataView.setHumi4List(humi4List);
-//        UChartsDataView uChartsData = new UChartsDataView();
-//        uChartsData.setCategories(categories);
-//        uChartsData.setSeries(Arrays.asList(
-//                new UChartsDataView.UChartsSeries("温度1", BigDecimal.ZERO, temp1List),
-//                new UChartsDataView.UChartsSeries("温度2", BigDecimal.ZERO, temp2List),
-//                new UChartsDataView.UChartsSeries("温度3", BigDecimal.ZERO, temp3List),
-//                new UChartsDataView.UChartsSeries("温度4", BigDecimal.ZERO, temp4List),
-//                new UChartsDataView.UChartsSeries("湿度1", BigDecimal.ONE, humi1List),
-//                new UChartsDataView.UChartsSeries("湿度2", BigDecimal.ONE, humi2List),
-//                new UChartsDataView.UChartsSeries("湿度3", BigDecimal.ONE, humi3List),
-//                new UChartsDataView.UChartsSeries("湿度4", BigDecimal.ONE, humi4List)
-//        ));
-        return liveDataView;
+        UChartsDataView uChartsData = new UChartsDataView();
+        uChartsData.setCategories(categories);
+        uChartsData.setSeries(Arrays.asList(
+                new UChartsDataView.UChartsSeries("温度1", true,BigDecimal.ZERO, temp1List),
+                new UChartsDataView.UChartsSeries("温度2", true,BigDecimal.ZERO, temp2List),
+                new UChartsDataView.UChartsSeries("温度3", true,BigDecimal.ZERO, temp3List),
+                new UChartsDataView.UChartsSeries("温度4", true,BigDecimal.ZERO, temp4List),
+                new UChartsDataView.UChartsSeries("湿度1", false, BigDecimal.ONE, humi1List),
+                new UChartsDataView.UChartsSeries("湿度2", false, BigDecimal.ONE, humi2List),
+                new UChartsDataView.UChartsSeries("湿度3", false, BigDecimal.ONE, humi3List),
+                new UChartsDataView.UChartsSeries("湿度4", false, BigDecimal.ONE, humi4List)
+        ));
+        return uChartsData;
     }
 }