From 34e42df090413355fa92b52251d88d3c137a8c94 Mon Sep 17 00:00:00 2001
From: xiwa <xw2sy@163.com>
Date: Tue, 5 Mar 2024 19:58:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E7=A9=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/iotkit/data/service/DeviceInfoDataImpl.java     | 6 +++---
 .../java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java  | 6 ------
 .../manager/service/impl/DeviceManagerServiceImpl.java      | 1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
index 1e7368dc..63f3c1b8 100644
--- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
+++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
@@ -142,9 +142,9 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
      */
     private void parseStateToVo(DeviceInfo dto, TbDeviceInfo vo) {
         DeviceInfo.State state = dto.getState();
-        vo.setState(state.isOnline() ? "online" : "offline");
-        vo.setOfflineTime(state.getOfflineTime());
-        vo.setOnlineTime(state.getOnlineTime());
+        vo.setState(state != null && state.isOnline() ? "online" : "offline");
+        vo.setOfflineTime(state != null ? state.getOfflineTime() : null);
+        vo.setOnlineTime(state != null ? state.getOnlineTime() : null);
         DeviceInfo.Locate locate = dto.getLocate();
         vo.setLongitude(locate.getLongitude());
         vo.setLatitude(locate.getLatitude());
diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java
index bc72e457..6eb35d80 100644
--- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java
+++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/device/DeviceInfoBo.java
@@ -61,12 +61,6 @@ public class DeviceInfoBo extends BaseDto {
     @ApiModelProperty(value = "纬度")
     private String latitude;
 
-    @ApiModelProperty(value = "设备状态")
-    @Size(max = 255, message = "设备状态长度不正确")
-    @AutoMapping(ignore = true)
-    @ReverseAutoMapping(ignore = true)
-    private DeviceInfo.State state;
-
     @ApiModelProperty(value = "用户id")
     @Size(max = 255, message = "用户id长度不正确")
     private String uid;
diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/DeviceManagerServiceImpl.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/DeviceManagerServiceImpl.java
index 7d615f5d..71b2e290 100644
--- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/DeviceManagerServiceImpl.java
+++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/DeviceManagerServiceImpl.java
@@ -412,7 +412,6 @@ public class DeviceManagerServiceImpl implements IDeviceManagerService {
     public boolean saveDevice(DeviceInfoBo data) {
         DeviceInfo di = data.to(DeviceInfo.class);
         di.setLocate(new DeviceInfo.Locate(data.getLongitude(), data.getLatitude()));
-        di.setState(data.getState());
         if (StringUtils.isBlank(data.getSecret())) {
             data.setSecret(RandomStringUtils.random(16));
         }