更新！

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/artemis/OperationMessageModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.artemis;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.mqtt.DeviceInfoModel;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.busInfoModel.device.DeviceInfoModel;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/artemis/OperationMessageResultModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.artemis;
 
 import cn.hutool.json.JSONObject;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/artemis/OperationMessageResultParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.artemis;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/artemis/OperationMessageResultSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.artemis;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/artemis/OperationMessageSearchParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.artemis;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.OperationBusType;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/baseParam/IDParam.java

@@ -1,12 +0,0 @@
-package com.zhongshu.iot.client.model.baseParam;
-
-import lombok.Data;
-
-/**
- * @author TRX
- * @date 2024/5/16
- */
-@Data
-public class IDParam {
-    private String id;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/baseParam/NameModel.java

@@ -1,16 +0,0 @@
-package com.zhongshu.iot.client.model.baseParam;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author TRX
- * @date 2024/7/12
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class NameModel extends IDParam {
-    private String name;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/baseParam/OidModel.java

@@ -1,14 +0,0 @@
-package com.zhongshu.iot.client.model.baseParam;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author TRX
- * @date 2024/6/3
- */
-@Data
-public class OidModel implements Serializable {
-    private String oid;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/baseParam/SuperModel.java

@@ -1,44 +0,0 @@
-package com.zhongshu.iot.client.model.baseParam;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author TRX
- * @date 2024/5/16
- */
-@Data
-public class SuperModel implements Serializable {
-
-    @Schema(description = "数据ID")
-    private String id;
-
-    @Schema(description = "创建时间")
-    private Long createTime;
-
-    @Schema(description = "修改时间")
-    private Long updateTime;
-
-    @Schema(description = "备注")
-    private String remark;
-
-    @Schema(description = "是否已删除")
-    private Boolean isDelete = Boolean.FALSE;
-
-    @Schema(description = "所属项目ID")
-    private String oid;
-
-    @Schema(description = "排序", hidden = true)
-    private Long sort;
-
-    @Schema(description = "创建用户ID")
-    private String createUserId;
-
-    @Schema(description = "添加用户名称")
-    private String createUserName;
-
-    @Schema(description = "添加用户电话", hidden = true)
-    private String createPhone;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/baseParam/SuperParam.java

@@ -1,26 +0,0 @@
-package com.zhongshu.iot.client.model.baseParam;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author TRX
- * @date 2024/5/16
- */
-@Data
-public class SuperParam implements Serializable {
-
-    @Schema(description = "数据ID", example = "")
-    private String id = null;
-
-    @Schema(description = "排序")
-    private Long sort = 1l;
-
-    @Schema(description = "所属项目ID", hidden = true)
-    private String oid;
-
-    @Schema(description = "备注")
-    private String remark;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/baseParam/SuperSearchParam.java

@@ -1,47 +0,0 @@
-package com.zhongshu.iot.client.model.baseParam;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.domain.Sort;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author TRX
- * @date 2024/5/16
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SuperSearchParam implements Serializable {
-
-    @Schema(hidden = true)
-    private String id;
-
-    @Schema(description = "搜索时间范围", hidden = true)
-    private List<Long> times;
-
-    @Schema(description = "开始时间", hidden = true)
-    private Long startTime;
-
-    @Schema(description = "结束时间", hidden = true)
-    private Long endTime;
-
-    @Schema(description = "自定义排序", hidden = true)
-    private Sort orderSort;
-
-    @Schema(description = "是否按照序号排序", hidden = true)
-    private Boolean isSortDesc;
-
-    @Schema(description = "所属项目ID", hidden = true)
-    private String epId;
-
-    @Schema(description = "第几页，从0开始，默认：0")
-    private Integer number = 0;
-
-    @Schema(description = "每页查询多少条数据,大于0的整数，如：10")
-    private Integer size = 10;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/docker/DockerMetaModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.docker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/docker/DockerMetaParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.docker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/docker/DockerMetaSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.docker;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotDeviceDataModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotMainModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.iot;
 
 import com.github.microservice.types.FunctionType;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.DataType;
 import com.zhongshu.iot.client.type.EventType;
 import com.zhongshu.iot.client.type.OperationType;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotMainParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.iot;
 
 import com.github.microservice.types.FunctionType;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import com.zhongshu.iot.client.type.DataType;
 import com.zhongshu.iot.client.type.EventType;
 import com.zhongshu.iot.client.type.IotDataType;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotMainSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.iot;
 
 import com.github.microservice.types.FunctionType;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.DataType;
 import com.zhongshu.iot.client.type.IotDataType;
 import com.zhongshu.iot.client.type.RemoteUrlType;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotMainSuper.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import com.github.microservice.types.FunctionType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplate2DeviceModel.java

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.client.model.iot;
 
 import com.github.microservice.types.deviceUse.DeviceType;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.mqtt.DeviceInfoModel;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.busInfoModel.device.DeviceInfoModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplate2DeviceParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplate2DeviceSearch.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.client.model.iot;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.OnLineState;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplateModel.java

@@ -3,9 +3,8 @@ package com.zhongshu.iot.client.model.iot;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceType;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.type.DataState;
-import com.zhongshu.iot.client.type.IotDataType;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.types.common.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplateParam.java

@@ -3,8 +3,8 @@ package com.zhongshu.iot.client.model.iot;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceType;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperParam;
+import com.github.microservice.types.common.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplateSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperSearchParam;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.IotDataType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTemplateSimpleModel.java

@@ -1,76 +0,0 @@
-package com.zhongshu.iot.client.model.iot;
-
-import com.github.microservice.types.deviceUse.DeviceCategory;
-import com.github.microservice.types.deviceUse.DeviceSpecType;
-import com.github.microservice.types.deviceUse.DeviceType;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.type.DataState;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 产品信息
- *
- * @author TRX
- * @date 2024/6/20
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class IotTemplateSimpleModel  {
-
-    private String id;
-
-    @Schema(description = "产品名称")
-    private String name;
-
-    @Schema(description = "数据状态")
-    private DataState state;
-
-    @Schema(description = "所属物模型id")
-    private String iotThingId;
-
-    @Schema(description = "关联code,产品code")
-    private String productCode;
-
-    @Schema(description = "产品品类，直连设备、网关子设备、网关设备")
-    private DeviceCategory deviceCategory;
-
-    private String deviceCategoryStr;
-
-    public String getDeviceCategoryStr() {
-        if (deviceCategory != null) {
-            return deviceCategory.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "适用设备类型")
-    private DeviceType deviceType;
-
-    private String deviceTypeStr;
-
-    public String getDeviceTypeStr() {
-        if (deviceType != null) {
-            return deviceType.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "适用设备型号")
-    private DeviceSpecType specType;
-
-    private String specTypeStr;
-
-    public String getSpecTypeStr() {
-        if (specType != null) {
-            return specType.getRemark();
-        }
-        return "";
-    }
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTopicModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTopicParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/IotTopicSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/ping/DeviceOnLineRecordModel.java

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.client.model.iot.ping;
 
 import com.github.microservice.types.deviceUse.DeviceCategory;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.mqtt.DeviceInfoModel;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.busInfoModel.device.DeviceInfoModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/ping/DeviceOnLineRecordSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.iot.ping;
 
 import com.github.microservice.types.deviceUse.DeviceCategory;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/thing/IotThing2DeviceBind.java

@@ -1,21 +0,0 @@
-package com.zhongshu.iot.client.model.iot.thing;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author TRX
- * @date 2025/2/25
- */
-@Data
-public class IotThing2DeviceBind {
-
-    @Schema(description = "物模型id")
-    private String id;
-
-    @Schema(description = "设备id集合")
-    private List<String> deviceIds = new ArrayList<>();
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/thing/IotThing2DeviceModel.java

@@ -1,60 +0,0 @@
-package com.zhongshu.iot.client.model.iot.thing;
-
-import com.github.microservice.auth.client.type.DeviceType;
-import com.github.microservice.types.deviceUse.OnLineState;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.mqtt.DeviceInfoModel;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * @author TRX
- * @date 2025/2/25
- */
-@Data
-public class IotThing2DeviceModel extends SuperModel {
-
-    @Schema(description = "物模型id")
-    private String iotThingId;
-
-    @Schema(description = "设备id")
-    private String deviceId;
-
-    @Schema(description = "设备类型")
-    private DeviceType deviceType;
-
-    private String deviceTypeStr;
-
-    public String getDeviceTypeStr() {
-        if (deviceType != null) {
-            return deviceType.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "设备名称")
-    private String deviceName;
-
-    @Schema(description = "关联设备信息")
-    private DeviceInfoModel deviceInfo;
-
-    @Schema(description = "所属项目")
-    private ProjectInfoModel projectInfo;
-
-    @Schema(description = "项目code")
-    private String projectInfoCode;
-
-    @Schema(description = "在线状态")
-    private OnLineState onLineState;
-
-    private String onLineStateStr;
-
-    public String getOnLineStateStr() {
-        if (onLineState != null) {
-            return onLineState.getRemark();
-        }
-        return "";
-    }
-
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/thing/IotThing2DeviceSearch.java

@@ -1,34 +0,0 @@
-package com.zhongshu.iot.client.model.iot.thing;
-
-import com.github.microservice.auth.client.type.DeviceType;
-import com.github.microservice.types.deviceUse.OnLineState;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * @author TRX
- * @date 2025/2/25
- */
-@Data
-public class IotThing2DeviceSearch extends SuperSearchParam {
-
-    @Schema(description = "物模型id")
-    private String iotThingId;
-
-    @Schema(description = "设备id")
-    private String deviceId;
-
-    @Schema(description = "设备类型")
-    private DeviceType deviceType;
-
-    @Schema(description = "设备名称")
-    private String deviceName;
-
-    @Schema(description = "项目code")
-    private String projectCode;
-
-    @Schema(description = "在线状态")
-    private OnLineState onLineState;
-
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/thing/IotThingModel.java

@@ -1,79 +0,0 @@
-package com.zhongshu.iot.client.model.iot.thing;
-
-import com.github.microservice.types.deviceUse.DeviceCategory;
-import com.github.microservice.types.deviceUse.ThingType;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoSimpleModel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.apache.commons.lang3.ObjectUtils;
-
-/**
- * @author TRX
- * @date 2025/2/25
- */
-@Data
-public class IotThingModel extends SuperModel {
-
-    @Schema(description = "物模型类型：自动、手动创建")
-    private ThingType thingType;
-
-    public String thingTypeStr;
-
-    public String getThingTypeStr() {
-        if (thingType != null) {
-            return thingType.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "编码")
-    private String code;
-
-    @Schema(description = "名称")
-    private String name;
-
-    @Schema(description = "设备数量")
-    private Long deviceCount = 0L;
-
-    @Schema(description = "所属分组")
-    private String projectCode;
-
-    private String projectName;
-
-    public String getProjectName() {
-        if (ObjectUtils.isNotEmpty(projectInfo)) {
-            return projectInfo.getName();
-        }
-        return "";
-    }
-
-    @Schema(description = "分组信息")
-    private ProjectInfoSimpleModel projectInfo;
-
-    //-----------------所属产品 start-----------
-    @Schema(description = "所属产品数据id")
-    private String iotTemplateId;
-
-    @Schema(description = "关联code,产品code")
-    private String productCode;
-
-    //-----------------管理的设备类型 start ---------
-
-    @Schema(description = "设备id")
-    private String deviceId;
-
-    @Schema(description = "设备品类")
-    private DeviceCategory deviceCategory;
-
-    private String deviceCategoryStr;
-
-    public String getDeviceCategoryStr() {
-        if (deviceCategory != null) {
-            return deviceCategory.getRemark();
-        }
-        return "";
-    }
-
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/thing/IotThingParam.java

@@ -1,25 +0,0 @@
-package com.zhongshu.iot.client.model.iot.thing;
-
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-
-/**
- * @author TRX
- * @date 2025/2/25
- */
-@Data
-public class IotThingParam extends SuperParam {
-
-    @NotEmpty
-    @Schema(description = "名称")
-    private String name;
-
-    @NotEmpty
-    @Schema(description = "所属分组")
-    private String projectCode;
-
-    @Schema(description = "产品code")
-    private String productCode;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/iot/thing/IotThingSearch.java

@@ -1,45 +0,0 @@
-package com.zhongshu.iot.client.model.iot.thing;
-
-import com.github.microservice.types.deviceUse.ThingType;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author TRX
- * @date 2025/2/25
- */
-@Data
-public class IotThingSearch extends SuperSearchParam {
-
-    @Schema(description = "物模型类型：自动、手动创建")
-    private ThingType thingType;
-
-    @Schema(description = "编码")
-    private String code;
-
-    @Schema(description = "名称")
-    private String name;
-
-    @Schema(description = "所属分组")
-    private String projectCode;
-
-    //-----------------所属产品 start-----------
-    @Schema(description = "所属产品数据id")
-    private String iotTemplateId;
-
-    @Schema(description = "关联code,产品code")
-    private String productCode;
-
-    //-----------------管理的设备类型 start ---------
-
-    @Schema(description = "修改时间")
-    private List<Long> updateTimes;
-
-    private Long startUpdateTime;
-
-    private Long endUpdateTime;
-
-}

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

@@ -5,7 +5,7 @@ import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.RegistType;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

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

@@ -1,129 +0,0 @@
-package com.zhongshu.iot.client.model.mqtt;
-
-import cn.hutool.json.JSONObject;
-import com.github.microservice.types.deviceUse.DeviceSpecType;
-import com.github.microservice.types.deviceUse.DeviceType;
-import com.github.microservice.types.deviceUse.OnLineState;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.iot.IotTemplateSimpleModel;
-import com.zhongshu.iot.client.type.DataState;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.apache.commons.lang3.ObjectUtils;
-
-/**
- * @author TRX
- * @date 2024/5/16
- */
-@Data
-public class DeviceInfoModel extends SuperModel {
-
-    @Schema(description = "设备ID")
-    private String deviceId;
-
-    @Schema(description = "设备名称")
-    private String deviceName;
-
-    @Schema(description = "产品code")
-    private String productCode;
-
-    private String productName;
-
-    public String getProductName() {
-        if (ObjectUtils.isNotEmpty(iotTemplate)) {
-            return iotTemplate.getName();
-        }
-        return "";
-    }
-
-    @Schema(description = "产品信息")
-    private IotTemplateSimpleModel iotTemplate;
-
-    @Schema(description = "在线状态")
-    private OnLineState onLineState;
-
-    private String onLineStateStr;
-
-    public String getOnLineStateStr() {
-        if (onLineState != null) {
-            return onLineState.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "设备型号")
-    private DeviceSpecType specType;
-
-    private String deviceModelStr;
-
-    public String getDeviceModelStr() {
-        if (specType != null) {
-            return specType.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "设备类型：消费机 闸机")
-    private DeviceType deviceType;
-
-    private String deviceTypeStr;
-
-    public String getDeviceTypeStr() {
-        if (deviceType != null) {
-            return deviceType.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "数据状态")
-    private DataState state;
-
-    private String stateStr;
-
-    public String getStateStr() {
-        if (state != null) {
-            return state.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "ip地址")
-    private String ip;
-
-    @Schema(description = "激活时间")
-    private Long activityTime;
-
-    @Schema(description = "最后上线时间")
-    private Long lastOnlineTime;
-
-    @Schema(description = "所属分组")
-    private ProjectInfoModel projectInfo;
-
-    @Schema(description = "分组code")
-    private String projectInfoCode;
-
-    @Schema(description = "分组名称")
-    private String projectInfoName;
-
-    public String getProjectInfoName() {
-        if (ObjectUtils.isNotEmpty(projectInfo)) {
-            return projectInfo.getName();
-        }
-        return "";
-    }
-
-    @Schema(description = "固件版本")
-    private String firmwareVersion;
-
-    @Schema(description = "连接参数")
-    private JSONObject connectParam;
-
-    @Schema(description = "最后离线时间")
-    private Long lastOffLineTime;
-
-    @Schema(description = "设备本地日志上报")
-    private Boolean isReportLogs = Boolean.TRUE;
-
-//    @Schema(description = "物联网模版信息")
-//    private IotTemplateModel iotTemplate;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/DeviceInfoSearchParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import com.github.microservice.types.deviceUse.*;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayInfoAddParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import com.github.microservice.types.deviceUse.OnLineState;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayInfoModel.java

@@ -1,7 +1,8 @@
 package com.zhongshu.iot.client.model.mqtt;
 
+import com.github.microservice.busInfoModel.device.ProjectInfoModel;
 import com.github.microservice.types.deviceUse.OnLineState;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayInfoSearchParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.github.microservice.types.deviceUse.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayUserInfoAddParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayUserInfoModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.type.MqttUserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayUserInfoNameParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import com.zhongshu.iot.client.type.type.MqttUserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/GateWayUserInfoSearchParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.type.MqttUserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/MqttInfoAddParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import com.zhongshu.iot.client.type.type.AddressType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/MqttInfoModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import com.github.microservice.types.common.CommonState;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.type.AddressType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/MqttInfoSimpleModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.type.AddressType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/ProjectInfoAddParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import com.github.microservice.types.common.CommonState;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/ProjectInfoModel.java

@@ -1,39 +0,0 @@
-package com.zhongshu.iot.client.model.mqtt;
-
-import com.github.microservice.types.common.CommonState;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * @author TRX
- * @date 2024/5/21
- */
-@Data
-@Schema(description = "项目信息")
-public class ProjectInfoModel extends SuperModel {
-
-    @Schema(description = "名称")
-    private String name;
-
-    @Schema(description = "code")
-    private String code;
-
-    @Schema(description = "状态")
-    private CommonState state;
-
-    private String stateStr;
-
-    public String getStateStr() {
-        if (state != null) {
-            return state.getRemark();
-        }
-        return "";
-    }
-
-    @Schema(description = "设备数量")
-    private Integer deviceNumber = 0;
-
-    @Schema(description = "网关数量")
-    private Integer gateWayNumber = 0;
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/ProjectInfoSearchParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import com.github.microservice.types.common.CommonState;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/mqtt/ProjectInfoSimpleModel.java

@@ -1,36 +0,0 @@
-package com.zhongshu.iot.client.model.mqtt;
-
-import com.github.microservice.types.common.CommonState;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * @author TRX
- * @date 2024/5/21
- */
-@Data
-@Schema(description = "分组信息")
-public class ProjectInfoSimpleModel {
-
-    @Schema(description = "数据id")
-    private String id;
-
-    @Schema(description = "名称")
-    private String name;
-
-    @Schema(description = "code")
-    private String code;
-
-    @Schema(description = "状态")
-    private CommonState state;
-
-    private String stateStr;
-
-    public String getStateStr() {
-        if (state != null) {
-            return state.getRemark();
-        }
-        return "";
-    }
-}

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/blackList/BlackListModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.blackList;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/blackList/BlackListParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.blackList;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/blackList/BlackListSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.blackList;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/requestLog/OpenApiRequestLogModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.requestLog;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/requestLog/OpenApiRequestLogSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.requestLog;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/sign/OpenApiSignInfoModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.sign;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.AppState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/openApi/sign/OpenApiSignInfoSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.openApi.sign;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.AppState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/operLogs/OperationLogsModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.operLogs;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
+import com.github.microservice.models.baseParam.SuperModel;
 import com.zhongshu.iot.client.type.MessageType;
 import com.zhongshu.iot.client.type.OperationLogType;
 import com.zhongshu.iot.client.type.ResponseCode;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/operLogs/OperationLogsSearchParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.operLogs;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.OperationLogType;
 import com.zhongshu.iot.client.type.type.LoginType;
 import com.zhongshu.iot.client.type.type.LogsLevel;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/DepartmentModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.utils.ITree;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/DepartmentParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperParam;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.utils.ITree;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/DepartmentSearchParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperSearchParam;
+import com.github.microservice.types.common.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/RoleAddParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperParam;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.RoleDefaultType;
 import com.zhongshu.iot.client.type.RoleType;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/RoleModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.RoleType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/RoleSearchParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/UserCountParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperParam;
 import com.zhongshu.iot.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/UserInfoModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
+import com.github.microservice.models.baseParam.SuperModel;
+import com.github.microservice.busInfoModel.device.ProjectInfoModel;
 import com.zhongshu.iot.client.type.UserState;
 import com.zhongshu.iot.client.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/user/UserSearchParams.java

@@ -1,7 +1,6 @@
 package com.zhongshu.iot.client.model.user;
 
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.client.type.UserState;
 import com.zhongshu.iot.client.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/openApi/model/DeviceInfoOpenAPIModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.client.openApi.model;
 
 import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.client.openApi.base.SuperAPIModel;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/openApi/model/IotMainOpenAPIModel.java

@@ -1,14 +1,11 @@
 package com.zhongshu.iot.client.openApi.model;
 
 import com.github.microservice.types.FunctionType;
-import com.zhongshu.iot.client.model.baseParam.SuperModel;
 import com.zhongshu.iot.client.model.iot.IotAttribute;
 import com.zhongshu.iot.client.model.iot.IotDict;
-import com.zhongshu.iot.client.model.iot.IotTemplateModel;
 import com.zhongshu.iot.client.openApi.base.SuperAPIModel;
 import com.zhongshu.iot.client.type.DataType;
 import com.zhongshu.iot.client.type.EventType;
-import com.zhongshu.iot.client.type.OperationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/openApi/model/IotTemplateOpenAPIModel.java

@@ -1,8 +1,7 @@
 package com.zhongshu.iot.client.openApi.model;
 
 import com.zhongshu.iot.client.openApi.base.SuperAPIModel;
-import com.zhongshu.iot.client.type.DataState;
-import com.zhongshu.iot.client.type.IotDataType;
+import com.github.microservice.types.common.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

OneCardIotClient/src/main/java/com/zhongshu/iot/client/type/DataState.java

@@ -1,19 +0,0 @@
-package com.zhongshu.iot.client.type;
-
-import lombok.Getter;
-
-/**
- *
- */
-public enum DataState {
-    Enable("启用"),
-    Disable("停用"),
-    ;
-
-    @Getter
-    private String remark;
-
-    DataState(String remark) {
-        this.remark = remark;
-    }
-}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/devices/DeviceController.java

@@ -7,7 +7,7 @@ import com.github.microservice.types.FunctionType;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.zhongshu.iot.client.model.iot.IotMainModel;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoAddParam;
-import com.zhongshu.iot.client.model.mqtt.DeviceInfoModel;
+import com.github.microservice.busInfoModel.device.DeviceInfoModel;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoSearchParam;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoUpdateRemark;
 import com.zhongshu.iot.client.openApi.base.DeviceIdParam;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/iot/IotController.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.controller.iot;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.iot.client.model.baseParam.NameModel;
+import com.github.microservice.models.baseParam.NameModel;
 import com.zhongshu.iot.client.model.iot.*;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;
 import com.zhongshu.iot.server.core.service.iot.IotTemplateManagerService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/iot/IotThingController.java

@@ -2,9 +2,9 @@ package com.zhongshu.iot.server.core.controller.iot;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.busInfoModel.thing.*;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.iot.client.model.baseParam.IDParam;
-import com.zhongshu.iot.client.model.iot.thing.*;
+import com.github.microservice.models.baseParam.IDParam;
 import com.zhongshu.iot.server.core.service.iot.IotThing2DeviceService;
 import com.zhongshu.iot.server.core.service.iot.IotThingService;
 import io.swagger.v3.oas.annotations.Operation;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/iot/openAPI/IotThingOpenAPIController.java

@@ -0,0 +1,83 @@
+package com.zhongshu.iot.server.core.controller.iot.openAPI;
+
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.busInfoModel.thing.*;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.models.baseParam.IDParam;
+import com.zhongshu.iot.server.core.service.iot.IotThing2DeviceService;
+import com.zhongshu.iot.server.core.service.iot.IotThingService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 物模型管理
+ *
+ * @author TRX
+ * @date 2024/3/21
+ */
+@RequestMapping("/iotOpenAPI/manager/v1/thing")
+@RestController
+@Validated
+@Tag(name = "物模型-物模型管理")
+public class IotThingOpenAPIController {
+
+    @Autowired
+    private IotThingService iotThingService;
+
+    @Autowired
+    private IotThing2DeviceService iotThing2DeviceService;
+
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "物模型列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<IotThingModel>> page(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) IotThingSearch param) {
+        return iotThingService.page(pageable, param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "物模型详情")
+    @RequestMapping(value = "getDetail", method = {RequestMethod.POST})
+    public ResultContent getDetail(@RequestBody IDParam param) {
+        return iotThingService.getDetail(param.getId());
+    }
+
+    //--------------------------------物模型设备信息 start-----------------
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "物模型设备列表-分页查询")
+    @RequestMapping(value = {"pageDevice"}, method = {RequestMethod.POST})
+    public ResultContent<Page<IotThing2DeviceModel>> pageDevice(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) IotThing2DeviceSearch param) {
+        return iotThing2DeviceService.page(pageable, param);
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除物模型下的设备")
+    @RequestMapping(value = {"deleteDevice"}, method = {RequestMethod.POST})
+    public ResultContent deleteDevice(@RequestBody IDParam param) {
+        return iotThing2DeviceService.delete(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "物模型绑定设备（手动创建的才行）")
+    @RequestMapping(value = {"bindDevices"}, method = {RequestMethod.POST})
+    public ResultContent bindDevices(@RequestBody IotThing2DeviceBind param) {
+        return iotThing2DeviceService.bindDevices(param);
+    }
+
+}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/user/ProjectInfoController.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.controller.user;
 
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoAddParam;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
+import com.github.microservice.busInfoModel.device.ProjectInfoModel;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;
 import com.zhongshu.iot.server.core.service.device.ProjectInfoService;
 import io.swagger.v3.oas.annotations.Operation;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/base/BaseImpl.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.base;
 
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.DateUtils;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/iot/extend/IotThing2DeviceDaoExtend.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.iot.extend;
 
-import com.zhongshu.iot.client.model.iot.thing.IotThing2DeviceSearch;
+import com.github.microservice.busInfoModel.thing.IotThing2DeviceSearch;
 import com.zhongshu.iot.server.core.domain.iot.IotThing2Device;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/iot/extend/IotThingDaoExtend.java

@@ -1,8 +1,6 @@
 package com.zhongshu.iot.server.core.dao.iot.extend;
 
-import com.zhongshu.iot.client.model.iot.IotTemplateSearch;
-import com.zhongshu.iot.client.model.iot.thing.IotThingSearch;
-import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
+import com.github.microservice.busInfoModel.thing.IotThingSearch;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/iot/impl/IotThing2DeviceDaoImpl.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.iot.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.iot.client.model.iot.thing.IotThing2DeviceSearch;
+import com.github.microservice.busInfoModel.thing.IotThing2DeviceSearch;
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.iot.extend.IotThing2DeviceDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.IotThing2Device;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/iot/impl/IotThingDaoImpl.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.iot.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.iot.client.model.iot.thing.IotThingSearch;
+import com.github.microservice.busInfoModel.thing.IotThingSearch;
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.iot.extend.IotThingDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/docker/AkSkConfig.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.docker;
 
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/IotTemplate.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.domain.iot;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceType;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.IotDataType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/user/Department.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.user;
 
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.utils.ITree;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/user/Role.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.user;
 
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.RoleDefaultType;
 import com.zhongshu.iot.client.type.RoleType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/base/AkSignService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.service.base;
 
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.server.core.dao.docker.AkSkConfigDao;
 import com.zhongshu.iot.server.core.domain.docker.AkSkConfig;
 import com.zhongshu.iot.server.core.util.CommonUtil;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/base/SuperService.java

@@ -4,8 +4,8 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.org.UserCountModel;
 import com.zhongshu.card.client.service.feign.UserFeignService;
-import com.zhongshu.iot.client.model.baseParam.SuperParam;
-import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
+import com.github.microservice.models.baseParam.SuperParam;
+import com.github.microservice.models.baseParam.SuperSearchParam;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import com.zhongshu.iot.server.core.util.DateUtils;
 import jakarta.servlet.http.HttpServletRequest;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceInfoService.java

@@ -6,7 +6,7 @@ import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.client.model.iot.IotMainModel;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoAddParam;
-import com.zhongshu.iot.client.model.mqtt.DeviceInfoModel;
+import com.github.microservice.busInfoModel.device.DeviceInfoModel;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoSearchParam;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoUpdateRemark;
 import com.zhongshu.iot.client.type.IotDataType;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/ProjectInfoService.java

@@ -3,9 +3,9 @@ package com.zhongshu.iot.server.core.service.device;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoAddParam;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
+import com.github.microservice.busInfoModel.device.ProjectInfoModel;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoSimpleModel;
+import com.github.microservice.busInfoModel.device.ProjectInfoSimpleModel;
 import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.zhongshu.iot.server.core.service.base.SuperService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotServiceImpl.java

@@ -1,11 +1,12 @@
 package com.zhongshu.iot.server.core.service.iot;
 
+import com.github.microservice.busInfoModel.device.IotTemplateSimpleModel;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.FunctionType;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.ThingType;
-import com.zhongshu.iot.client.model.baseParam.NameModel;
+import com.github.microservice.models.baseParam.NameModel;
 import com.zhongshu.iot.client.model.iot.*;
 import com.zhongshu.iot.client.type.IotDataType;
 import com.zhongshu.iot.server.core.dao.UserDao;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotThing2DeviceService.java

@@ -3,9 +3,9 @@ package com.zhongshu.iot.server.core.service.iot;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.deviceUse.ThingType;
-import com.zhongshu.iot.client.model.iot.thing.IotThing2DeviceBind;
-import com.zhongshu.iot.client.model.iot.thing.IotThing2DeviceModel;
-import com.zhongshu.iot.client.model.iot.thing.IotThing2DeviceSearch;
+import com.github.microservice.busInfoModel.thing.IotThing2DeviceBind;
+import com.github.microservice.busInfoModel.thing.IotThing2DeviceModel;
+import com.github.microservice.busInfoModel.thing.IotThing2DeviceSearch;
 import com.zhongshu.iot.server.core.dao.iot.IotThing2DeviceDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotThingService.java

@@ -4,9 +4,9 @@ import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.ThingType;
-import com.zhongshu.iot.client.model.iot.thing.IotThingModel;
-import com.zhongshu.iot.client.model.iot.thing.IotThingParam;
-import com.zhongshu.iot.client.model.iot.thing.IotThingSearch;
+import com.github.microservice.busInfoModel.thing.IotThingModel;
+import com.github.microservice.busInfoModel.thing.IotThingParam;
+import com.github.microservice.busInfoModel.thing.IotThingSearch;
 import com.zhongshu.iot.client.type.IotDataType;
 import com.zhongshu.iot.server.core.dao.iot.IotTemplateDao;
 import com.zhongshu.iot.server.core.dao.iot.IotThingDao;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/DepartmentServiceImpl.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.service.user.impl;
 
 import com.zhongshu.iot.client.model.user.DepartmentModel;
 import com.zhongshu.iot.client.model.user.DepartmentParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.utils.ITree;
 import com.zhongshu.iot.client.utils.TreeUtil;
 import com.zhongshu.iot.server.core.dao.DepartmentDao;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/RoleServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.service.user.impl;
 import com.zhongshu.iot.client.model.user.RoleAddParam;
 import com.zhongshu.iot.client.model.user.RoleModel;
 import com.zhongshu.iot.client.model.user.RoleSearchParam;
-import com.zhongshu.iot.client.type.DataState;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.RoleType;
 import com.zhongshu.iot.server.core.dao.RoleDao;
 import com.zhongshu.iot.server.core.dataConfig.ResultMessage;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/UserManagerServiceImpl.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.service.user.impl;
 
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
+import com.github.microservice.busInfoModel.device.ProjectInfoModel;
 import com.zhongshu.iot.client.model.user.*;
 import com.zhongshu.iot.client.type.ResultState;
 import com.zhongshu.iot.client.type.UserType;