From ab9792668cb40177c12dd1d94ff4acb7328b701b Mon Sep 17 00:00:00 2001
From: wyw <373811525@qq.com>
Date: Fri, 16 Aug 2024 02:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E4=BD=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fastbee-service/fastbee-iot-service/pom.xml    |  4 ++++
 .../iot/service/impl/DeviceServiceImpl.java    | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/fastbee-service/fastbee-iot-service/pom.xml b/fastbee-service/fastbee-iot-service/pom.xml
index 7f8eb0d..bf4ffed 100644
--- a/fastbee-service/fastbee-iot-service/pom.xml
+++ b/fastbee-service/fastbee-iot-service/pom.xml
@@ -156,6 +156,10 @@
             <artifactId>forest-spring-boot-starter</artifactId>
             <version>1.5.36</version>
         </dependency>
+        <dependency>
+            <groupId>com.fastbee</groupId>
+            <artifactId>fastbee-waterele-service</artifactId>
+        </dependency>
 
 
     </dependencies>
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
index af1d148..cff4818 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
@@ -10,6 +10,7 @@ import com.fastbee.common.core.domain.AjaxResult;
 import com.fastbee.common.core.domain.entity.SysDept;
 import com.fastbee.common.core.domain.entity.SysUser;
 import com.fastbee.common.core.domain.model.LoginUser;
+import com.fastbee.common.core.page.TableDataInfo;
 import com.fastbee.common.core.redis.RedisCache;
 import com.fastbee.common.core.redis.RedisKeyBuilder;
 import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem;
@@ -37,6 +38,8 @@ import com.fastbee.iot.cache.ITSLValueCache;
 import com.fastbee.iot.tdengine.service.ILogService;
 import com.fastbee.system.mapper.SysDeptMapper;
 import com.fastbee.system.service.ISysUserService;
+import com.fastbee.waterele.domain.MaWatereleRecord;
+import com.fastbee.waterele.service.IMaWatereleRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -121,7 +124,8 @@ public class DeviceServiceImpl implements IDeviceService {
     private SubGatewayMapper subGatewayMapper;
     @Resource
     private IOrderControlService orderControlService;
-
+    @Resource
+    private IMaWatereleRecordService watereleRecordService;
 
     /**
      * 查询设备
@@ -1604,6 +1608,18 @@ public class DeviceServiceImpl implements IDeviceService {
         devices.setProductId(136L);
         List<Device> deviceList = selectDeviceList(devices);
         for (Device device : deviceList) {
+            MaWatereleRecord maWatereleRecord = new MaWatereleRecord();
+            maWatereleRecord.setDevSn(device.getSerialNumber());
+            TableDataInfo tableDataInfo = watereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
+            List<MaWatereleRecord> list = (List<MaWatereleRecord>) tableDataInfo.getRows();
+            int status = 4;
+            if(list.size() > 0){
+                MaWatereleRecord record = list.get(0);
+                if(new Date().getTime() - record.getCreateTime().getTime() < 3600000){
+                    status = 3;
+                }
+            }
+            device.setStatus(status);
             HashMap<String, Object> itemMap = new HashMap<>();
             resultList.add(itemMap);
             Integer integer = 0;