online 默认9 代表未激活

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/device/DeviceDTO.java

@@ -56,7 +56,7 @@ public class DeviceDTO extends BaseVO {
     /**
      * 在线状态：0-离线，1-在线
      */
-    @Schema(description = "在线状态：0-离线，1-在线")
+    @Schema(description = "在线状态：0-离线，1-在线,9-未激活")
     private Integer online;
 
 

portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceListQueryReq.java

@@ -18,7 +18,7 @@ public class DeviceListQueryReq extends PageVo {
     @Schema(description = "设备名称")
     private String devName;
 
-    @Schema(description = "设备状态： 0-离线,1-在线")
+    @Schema(description = "设备状态： 0-离线,1-在线,9-未激活")
     private Integer online;
 
     @Schema(description = "起始时间 格式yyyy-MM-dd")

portal-service-common/src/main/java/com/hfln/portal/common/request/web/DeviceAddParam.java

@@ -49,7 +49,7 @@ public class DeviceAddParam extends BaseVO {
     /**
      * 在线状态：0-离线，1-在线
      */
-    @Schema(description = "在线状态：0-离线，1-在线")
+    @Schema(description = "在线状态：0-离线，1-在线,9-未激活")
     private Integer online;
 
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -206,7 +206,7 @@ public class WebGatewayImpl implements WebGateway {
             devInfo.setDevType(item.getDevType());
             devInfo.setHardware(item.getHardware());
             devInfo.setStatusLight(1);
-            devInfo.setOnline(0);
+            devInfo.setOnline(9);
             devInfo.setIsDeleted(BasePO.DeleteFlag.NOT_DELETED);
             devInfo.setX(BigDecimal.ZERO);
             devInfo.setY(BigDecimal.ZERO);
@@ -294,11 +294,7 @@ public class WebGatewayImpl implements WebGateway {
         saveInfo.setHardware(deviceAddParam.getHardware());
         saveInfo.setTenantId(deviceAddParam.getTenantId());
         saveInfo.setStatusLight(1);
-        saveInfo.setOnline(0);
-        saveInfo.setIsDeleted(BasePO.DeleteFlag.NOT_DELETED);
-        saveInfo.setX(BigDecimal.ZERO);
-        saveInfo.setY(BigDecimal.ZERO);
-        saveInfo.setNorthAngle(BigDecimal.ZERO);
+        saveInfo.setOnline(9);
         devInfoService.save(saveInfo);
 
     }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/DevInfoMapper.java

@@ -19,7 +19,7 @@ public interface DevInfoMapper extends BaseMapper<DevInfo> {
             "SET " +
             "user_id = null , " +
             "tenant_id = null , " +
-            "online = 0 , " +
+            "online = 9 , " +
             "onoff_time = null , " +
             "wifi_name = null , " +
             "wifi_password = null , " +

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/DevInfo.java

@@ -51,7 +51,7 @@ public class DevInfo extends BasePO {
     private String devType;
 
     /**
-     * 在线状态：0-离线，1-在线
+     * 在线状态：0-离线，1-在线，9-未激活
      */
     @TableField("online")
     private Integer online;

portal-service-infrastructure/src/main/resources/db/init.sql

@@ -11,7 +11,7 @@ CREATE TABLE `dev_info` (
                             `user_openid` varchar(32) DEFAULT NULL COMMENT '用户openid',
                             `dev_name` varchar(64) DEFAULT NULL COMMENT '设备名称',
                             `dev_type` varchar(32) DEFAULT NULL COMMENT '设备类型',
-                            `online` tinyint(1) DEFAULT '0' COMMENT '在线状态：0-离线，1-在线',
+                            `online` tinyint(1) DEFAULT NULL COMMENT '在线状态：0-离线，1-在线，9-未激活',
                             `dev_warn` tinyint(1) DEFAULT '0' COMMENT '设备报警：0-正常，1-报警',
                             `software` varchar(32) DEFAULT NULL COMMENT '软件版本号',
                             `hardware` varchar(32) DEFAULT NULL COMMENT '硬件版本号',