Browse Source

更新!

TRX 1 year ago
parent
commit
a2f0102e1c

+ 2 - 2
OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/DeviceInfoAddParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.iot.client.model.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,7 +24,7 @@ public class DeviceInfoAddParam extends SuperParam {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     @Schema(description = "ip地址")
     private String ip;

+ 2 - 2
OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/DeviceInfoModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.github.microservice.models.type.OnLineState;
 import com.zhongshu.iot.client.model.baseParam.SuperModel;
@@ -35,7 +35,7 @@ public class DeviceInfoModel extends SuperModel {
     }
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     private String deviceModelStr;
 

+ 2 - 2
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/DeviceInfo.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.domain.iot.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.github.microservice.models.type.OnLineState;
 import com.zhongshu.iot.client.type.DataState;
@@ -39,7 +39,7 @@ public class DeviceInfo extends SuperEntity {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     @Schema(description = "在线状态")
     private OnLineState onLineState;

+ 13 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/GateWayUserInfoService.java

@@ -233,6 +233,19 @@ public class GateWayUserInfoService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 更新连接用户绑定的设备数量
+     *
+     * @param entity
+     * @return
+     */
+    public ResultContent updateBindNumber(GateWayUserInfo entity) {
+        if (ObjectUtils.isNotEmpty(entity)) {
+
+        }
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 删除mqtt用户信息
      *