From 94f0251ca0f2e955dc580362302d0dd2d34dfc2f Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 30 Jul 2024 15:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/bonus/aqd/base/dao/IndexMapper.java  | 10 ++++++++++
 .../com/bonus/aqd/base/entity/vo/DeviceInfoVo.java     |  5 +++++
 .../java/com/bonus/aqd/base/service/IndexService.java  |  3 +++
 .../bonus/aqd/base/service/impl/IndexServiceImpl.java  |  2 +-
 src/main/resources/mappers/base/IndexMapper.xml        |  4 ++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bonus/aqd/base/dao/IndexMapper.java b/src/main/java/com/bonus/aqd/base/dao/IndexMapper.java
index 5ce0330..ff47ef7 100644
--- a/src/main/java/com/bonus/aqd/base/dao/IndexMapper.java
+++ b/src/main/java/com/bonus/aqd/base/dao/IndexMapper.java
@@ -88,6 +88,7 @@ public interface IndexMapper {
 
     /**
      * 当天、本周、本月 单钩、双钩告警数量
+     *
      * @param dto
      * @return List<Integer>
      * @author cwchen
@@ -97,10 +98,19 @@ public interface IndexMapper {
 
     /**
      * 告警列表
+     *
      * @param dto
      * @return List<WarnInfoVo>
      * @author cwchen
      * @date 2024/7/30 9:57
      */
     List<WarnInfoVo> getWarns(ParamsDto dto);
+
+    /**
+     * 获取安全带绑定球机设备的PUID
+     * @return List<String>
+     * @author cwchen
+     * @date 2024/7/30 13:24
+     */
+    List<String> getDevicePuids();
 }
diff --git a/src/main/java/com/bonus/aqd/base/entity/vo/DeviceInfoVo.java b/src/main/java/com/bonus/aqd/base/entity/vo/DeviceInfoVo.java
index 7a471c3..ec57176 100644
--- a/src/main/java/com/bonus/aqd/base/entity/vo/DeviceInfoVo.java
+++ b/src/main/java/com/bonus/aqd/base/entity/vo/DeviceInfoVo.java
@@ -75,6 +75,11 @@ public class DeviceInfoVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date devTime;
 
+    /**
+     * 在线时长
+     */
+    private String onlineTime;
+
     /**
      * 查询条件限制
      */
diff --git a/src/main/java/com/bonus/aqd/base/service/IndexService.java b/src/main/java/com/bonus/aqd/base/service/IndexService.java
index dd2d850..d58db6e 100644
--- a/src/main/java/com/bonus/aqd/base/service/IndexService.java
+++ b/src/main/java/com/bonus/aqd/base/service/IndexService.java
@@ -66,6 +66,7 @@ public interface IndexService {
 
     /**
      * 设备分析
+     *
      * @param data
      * @return ServerResponse
      * @author cwchen
@@ -76,10 +77,12 @@ public interface IndexService {
 
     /**
      * 查询告警列表
+     *
      * @param data
      * @return PageInfo<WarnInfoVo>
      * @author cwchen
      * @date 2024/7/30 9:55
      */
     PageInfo<WarnInfoVo> getWarns(ParamsDto data);
+
 }
diff --git a/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java b/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java
index a0b61cf..b04bd90 100644
--- a/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java
+++ b/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java
@@ -20,7 +20,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -164,4 +163,5 @@ public class IndexServiceImpl implements IndexService {
         PageInfo<WarnInfoVo> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }
+
 }
diff --git a/src/main/resources/mappers/base/IndexMapper.xml b/src/main/resources/mappers/base/IndexMapper.xml
index 00f4b8b..05cefc2 100644
--- a/src/main/resources/mappers/base/IndexMapper.xml
+++ b/src/main/resources/mappers/base/IndexMapper.xml
@@ -137,5 +137,9 @@
         </where>
         ORDER BY tw.warn_time DESC
     </select>
+    <!--获取安全带绑定球机设备的PUID-->
+    <select id="getDevicePuids" resultType="java.lang.String">
+        SELECT DISTINCT puid FROM tb_device WHERE del_flag = 0
+    </select>
 
 </mapper>
\ No newline at end of file