更新！

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

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

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

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.client.model.iot;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OnLineState;
+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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,5 +1,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 io.swagger.v3.oas.annotations.media.Schema;
@@ -14,10 +17,20 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class IotTemplateParam  extends SuperParam {
+public class IotTemplateParam extends SuperParam {
+
     @Schema(description = "模版名称")
     private String name;
 
+    @Schema(description = "产品品类，直连设备、网关子设备、网关设备")
+    private DeviceCategory deviceCategory;
+
+    @Schema(description = "适用设备类型")
+    private DeviceType deviceType;
+
+    @Schema(description = "适用设备型号")
+    private DeviceSpecType specType;
+
     @Schema(description = "数据状态")
     private DataState state = DataState.Enable;
 }

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

@@ -1,9 +1,9 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.RegistType;
+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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,9 +1,9 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OnLineState;
+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.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -22,6 +22,9 @@ public class DeviceInfoModel extends SuperModel {
     @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/mqtt/DeviceInfoRegistParam.java

@@ -1,9 +1,8 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.RegistType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

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

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

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

@@ -1,8 +1,8 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OnLineState;
+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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.github.microservice.models.type.OnLineState;
+import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.client.model.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,7 +1,7 @@
 package com.zhongshu.iot.client.model.mqtt;
 
 import com.zhongshu.iot.client.model.baseParam.SuperSearchParam;
-import com.github.microservice.models.type.OnLineState;
+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/MqttInfoModel.java

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

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.client.model.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,6 +1,6 @@
 package com.zhongshu.iot.client.model.mqtt;
 
-import com.github.microservice.models.type.CommonState;
+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;

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

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

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

@@ -1,9 +1,6 @@
 package com.zhongshu.iot.client.openApi.model;
 
-import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.OnLineState;
-import com.zhongshu.iot.client.model.iot.IotTemplateModel;
-import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
+import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.client.openApi.base.SuperAPIModel;
 import com.zhongshu.iot.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/DeviceInfoDao.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.github.microservice.models.type.RegistType;
+import com.github.microservice.types.deviceUse.RegistType;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.DeviceInfoDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/ProjectInfoDao.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.ProjectInfoDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
 

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

@@ -39,6 +39,9 @@ public class IotMain extends SuperEntity {
     @Schema(description = "绑定的设备id")
     private String bindDeviceId;
 
+    @Schema(description = "关联code,产品code")
+    private String productCode;
+
     // ------------------------iotMain 基础字段 start-----------------------
 
     @Schema(description = "功能类型，属性 事件 服务")

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

@@ -1,7 +1,8 @@
 package com.zhongshu.iot.server.core.domain.iot;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
+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.zhongshu.iot.client.type.IotDataType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
@@ -33,7 +34,10 @@ public class IotTemplate extends SuperEntity {
     private String iotThingId;
 
     @Schema(description = "关联code,产品code")
-    private String code;
+    private String productCode;
+
+    @Schema(description = "产品品类，直连设备、网关子设备、网关设备")
+    private DeviceCategory deviceCategory;
 
     @Schema(description = "适用设备类型")
     private DeviceType deviceType;
@@ -59,4 +63,7 @@ public class IotTemplate extends SuperEntity {
         entity.setId(id);
         return entity;
     }
+
+    @Schema(description = "设备数量")
+    private Long deviceNumber = 0L;
 }

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.iot;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,5 +1,7 @@
 package com.zhongshu.iot.server.core.domain.iot;
 
+import com.github.microservice.types.deviceUse.DeviceType;
+import com.github.microservice.types.deviceUse.ThingType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -7,6 +9,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 真正的物模型
  *
@@ -19,6 +24,9 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @AllArgsConstructor
 public class IotThing extends SuperEntity {
 
+    @Schema(description = "物模型类型：自动、手动创建")
+    private ThingType thingType;
+
     @Schema(description = "名称")
     private String name;
 
@@ -27,4 +35,20 @@ public class IotThing extends SuperEntity {
 
     @Schema(description = "所属分组")
     private String projectCode;
+
+    //-----------------所属产品 start-----------
+    @Schema(description = "所属产品数据id")
+    private String iotTemplateId;
+
+    @Schema(description = "关联code,产品code")
+    private String productCode;
+
+    //-----------------管理的设备类型 start ---------
+
+    @Schema(description = "设备id集合")
+    private List<String> deviceIds = new ArrayList<>();
+
+    @Schema(description = "设备类型集合")
+    private List<DeviceType> deviceTypes = new ArrayList<>();
+
 }

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.*;
+import com.github.microservice.types.deviceUse.*;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -33,7 +33,7 @@ public class DeviceInfo extends SuperEntity {
     private String deviceName;
 
     @Schema(description = "设备code，产品code")
-    private String code;
+    private String projectCode;
 
     @Schema(description = "设备类型：消费机 闸机")
     private DeviceType deviceType;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.iot.mqtt;
 
-import com.github.microservice.models.type.OnLineDeviceType;
+import com.github.microservice.types.deviceUse.OnLineDeviceType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.iot.mqtt;
 
-import com.github.microservice.models.type.OnLineState;
+import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.domain.iot.mqtt;
 
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.OnLineState;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.OnLineState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.iot.mqtt;
 
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.client.type.type.AddressType;
 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/iot/mqtt/ProjectInfo.java

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.domain.iot.mqtt;
 
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.service.device;
 
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.OnLineState;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.OnLineState;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.FunctionType;
 import com.zhongshu.iot.client.model.iot.IotMainModel;

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

@@ -4,9 +4,9 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.models.hxz.GateWayPingInfoParam;
 import com.github.microservice.models.hxz.PingResult;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OnLineDeviceType;
-import com.github.microservice.models.type.OnLineState;
+import com.github.microservice.types.deviceUse.DeviceType;
+import com.github.microservice.types.deviceUse.OnLineDeviceType;
+import com.github.microservice.types.deviceUse.OnLineState;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceOnLineInfoDao;

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

@@ -4,10 +4,10 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.http.APIResponseModel;
 import com.github.microservice.models.common.CommonResult;
 import com.github.microservice.models.project.ProjectConfigQueryParam;
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OnLineState;
-import com.github.microservice.models.type.RegistType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceType;
+import com.github.microservice.types.deviceUse.OnLineState;
+import com.github.microservice.types.deviceUse.RegistType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.client.model.mqtt.*;
 import com.zhongshu.iot.server.core.dao.mqtt.*;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.service.device;
 
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.RegistType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.RegistType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.server.core.dao.mqtt.*;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.service.device;
 
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.iot.client.model.mqtt.MqttInfoAddParam;
 import com.zhongshu.iot.client.model.mqtt.MqttInfoModel;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.iot.server.core.service.device;
 
-import com.github.microservice.models.type.CommonState;
+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.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;

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

@@ -2,6 +2,7 @@ package com.zhongshu.iot.server.core.service.iot;
 
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.FunctionType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.zhongshu.iot.client.model.baseParam.NameModel;
 import com.zhongshu.iot.client.model.iot.*;
 import com.zhongshu.iot.client.type.IotDataType;
@@ -21,6 +22,7 @@ import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWay2Device;
 import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
+import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -85,6 +87,18 @@ public class IotServiceImpl extends SuperService {
     public ResultContent addIotTemplate(IotTemplateParam param) {
         IotTemplate template = null;
         initDefaultUser(param);
+        if (StringUtils.isEmpty(param.getName())) {
+            return ResultContent.buildFail("name is empty");
+        }
+        if (param.getDeviceCategory() == null) {
+            return ResultContent.buildFail("deviceCategory is empty");
+        }
+        if (param.getDeviceType() == null) {
+            return ResultContent.buildFail("deviceType is empty");
+        }
+        if (param.getSpecType() == null) {
+            param.setSpecType(DeviceSpecType.Common);
+        }
 
         IotTemplate temp = iotTemplateDao.findTopByNameAndIotDataType(param.getName(), IotDataType.IotTemplate);
         if (StringUtils.isNotEmpty(param.getId())) {
@@ -103,6 +117,11 @@ public class IotServiceImpl extends SuperService {
             template.setIotDataType(IotDataType.IotTemplate);
         }
         BeanUtils.copyProperties(param, template);
+        String productCode = template.getProductCode();
+        if (StringUtils.isEmpty(productCode)) {
+            productCode = String.format("%s%s", template.getDeviceCategory().name(), CommonUtil.randomStr(10));
+        }
+        template.setProductCode(productCode);
         iotTemplateDao.save(template);
         return ResultContent.buildSuccess();
     }

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/util/CommonUtil.java

@@ -33,6 +33,10 @@ public class CommonUtil {
         return str.toString();
     }
 
+    public static String randomStr(int length) {
+        return RandomStringUtils.random(length, true, true).toUpperCase();
+    }
+
     public static String generateRandomString(int count) {
         return RandomStringUtils.randomAlphabetic(count).toLowerCase();
     }