From 90e2eaed96de4a37fa4a991f35bd38d5d1c77da8 Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Thu, 7 Sep 2023 09:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A11.?=
 =?UTF-8?q?1.2=E7=89=88=E6=9C=AC=EF=BC=9A=201=E3=80=81tdengine=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?tags=E5=A2=9E=E5=8A=A0deviceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/tdengine/api/domain/DeviceStatus.java    | 14 ++++++++++++--
 .../tdengine/controller/TdEngineController.java    |  4 ----
 .../mapper/tdengine/DeviceStatusMapper.xml         |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/domain/DeviceStatus.java b/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/domain/DeviceStatus.java
index 08f3edb..25182b6 100644
--- a/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/domain/DeviceStatus.java
+++ b/ruoyi-api/hw-api-tdengine/src/main/java/com/ruoyi/tdengine/api/domain/DeviceStatus.java
@@ -5,14 +5,16 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 /**
  * @Description: 设备状态对象
  * @ClassName: DeviceStatus
- * @Author  : xins
- * @Date    :2023-09-05  11:35
+ * @Author : xins
+ * @Date :2023-09-05  11:35
  * @Version :1.0
  */
 public class DeviceStatus extends BaseEntity {
 
     private Long ts;
 
+    private Long deviceId;
+
     private String deviceCode;
 
     private int deviceType;
@@ -29,6 +31,14 @@ public class DeviceStatus extends BaseEntity {
         this.ts = ts;
     }
 
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getDeviceCode() {
         return deviceCode;
     }
diff --git a/ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/controller/TdEngineController.java b/ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/controller/TdEngineController.java
index ddf2f1d..c50e794 100644
--- a/ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/controller/TdEngineController.java
+++ b/ruoyi-modules/hw-tdengine/src/main/java/com/ruoyi/tdengine/controller/TdEngineController.java
@@ -386,10 +386,6 @@ public class TdEngineController {
             List<DeviceStatus> deviceStatuses = this.deviceStatusService.getOnlineDevicesGroupByDay(queryDeviceStatus);
             Map<Long, List<DeviceStatus>> deviceStatusMap = deviceStatuses.stream()
                     .collect(Collectors.groupingBy(DeviceStatus::getTs));
-            deviceStatusMap.forEach((k,v)->{
-                System.out.println(k+"----"+v);
-            });
-
             return R.ok(deviceStatusMap);
         } catch (UncategorizedSQLException e) {
             String message = e.getCause().getMessage();
diff --git a/ruoyi-modules/hw-tdengine/src/main/resources/mapper/tdengine/DeviceStatusMapper.xml b/ruoyi-modules/hw-tdengine/src/main/resources/mapper/tdengine/DeviceStatusMapper.xml
index 6698952..2b5b813 100644
--- a/ruoyi-modules/hw-tdengine/src/main/resources/mapper/tdengine/DeviceStatusMapper.xml
+++ b/ruoyi-modules/hw-tdengine/src/main/resources/mapper/tdengine/DeviceStatusMapper.xml
@@ -4,13 +4,13 @@
 <mapper namespace="com.ruoyi.tdengine.mapper.DeviceStatusMapper">
 
     <select id="getOnlineDevicesGroupByDay" parameterType="com.ruoyi.tdengine.api.domain.DeviceStatus" resultType="com.ruoyi.tdengine.api.domain.DeviceStatus" >
-        select timetruncate(ts,1d) ts,devicetype,onlinestatus,devicecode from #{params.databaseName}.#{params.superTableName}
+        select timetruncate(ts,1d) ts,devicetype,onlinestatus,deviceid from #{params.databaseName}.#{params.superTableName}
         where onlinestatus=1
         <if test="{params.beginTime}!= null and {params.endTime} != null">
             and ts BETWEEN #{params.beginTime} AND #{params.endTime}
         </if>
         <if test="sceneId != null "> and scene_id = #{sceneId}</if>
-        group by timetruncate(ts,1d),devicetype,onlinestatus,devicecode
+        group by timetruncate(ts,1d),devicetype,onlinestatus,deviceid
         order by ts
     </select>