!1165 【代码优化】IOT: ThingModel 评审优化

Merge pull request !1165 from puhui999/iot

yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java

@@ -13,14 +13,14 @@ public interface ErrorCodeConstants {
     ErrorCode PRODUCT_NOT_EXISTS = new ErrorCode(1_050_001_000, "产品不存在");
     ErrorCode PRODUCT_KEY_EXISTS = new ErrorCode(1_050_001_001, "产品标识已经存在");
     ErrorCode PRODUCT_STATUS_NOT_DELETE = new ErrorCode(1_050_001_002, "产品状是发布状态，不允许删除");
-    ErrorCode PRODUCT_STATUS_NOT_ALLOW_FUNCTION = new ErrorCode(1_050_001_003, "产品状是发布状态，不允许操作物模型");
+    ErrorCode PRODUCT_STATUS_NOT_ALLOW_THING_MODEL = new ErrorCode(1_050_001_003, "产品状是发布状态，不允许操作物模型");
 
     // ========== 产品物模型 1-050-002-000 ============
-    ErrorCode THINK_MODEL_FUNCTION_NOT_EXISTS = new ErrorCode(1_050_002_000, "产品物模型不存在");
+    ErrorCode THING_MODEL_NOT_EXISTS = new ErrorCode(1_050_002_000, "产品物模型不存在");
-    ErrorCode THINK_MODEL_FUNCTION_EXISTS_BY_PRODUCT_KEY = new ErrorCode(1_050_002_001, "ProductKey 对应的产品物模型已存在");
+    ErrorCode THING_MODEL_EXISTS_BY_PRODUCT_KEY = new ErrorCode(1_050_002_001, "ProductKey 对应的产品物模型已存在");
-    ErrorCode THINK_MODEL_FUNCTION_IDENTIFIER_EXISTS = new ErrorCode(1_050_002_002, "存在重复的功能标识符。");
+    ErrorCode THING_MODEL_IDENTIFIER_EXISTS = new ErrorCode(1_050_002_002, "存在重复的功能标识符。");
-    ErrorCode THINK_MODEL_FUNCTION_NAME_EXISTS = new ErrorCode(1_050_002_003, "存在重复的功能名称。");
+    ErrorCode THING_MODEL_NAME_EXISTS = new ErrorCode(1_050_002_003, "存在重复的功能名称。");
-    ErrorCode THINK_MODEL_FUNCTION_IDENTIFIER_INVALID = new ErrorCode(1_050_002_003, "产品物模型标识无效");
+    ErrorCode THING_MODEL_IDENTIFIER_INVALID = new ErrorCode(1_050_002_003, "产品物模型标识无效");
 
     // ========== 设备 1-050-003-000 ============
     ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_050_003_000, "设备不存在");

yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotProductThingModelAccessModeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.enums.thinkmodel;
+package cn.iocoder.yudao.module.iot.enums.thingmodel;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -10,7 +10,7 @@ import lombok.Getter;
  */
 @AllArgsConstructor
 @Getter
-public enum IotProductThinkModelAccessModeEnum {
+public enum IotProductThingModelAccessModeEnum {
 
     READ_ONLY("r"),
     READ_WRITE("rw");

yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotProductThingModelTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.enums.thinkmodel;
+package cn.iocoder.yudao.module.iot.enums.thingmodel;
 
 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
 import lombok.AllArgsConstructor;
@@ -13,13 +13,13 @@ import java.util.Arrays;
  */
 @AllArgsConstructor
 @Getter
-public enum IotProductThinkModelTypeEnum implements IntArrayValuable {
+public enum IotProductThingModelTypeEnum implements IntArrayValuable {
 
     PROPERTY(1, "属性"),
     SERVICE(2, "服务"),
     EVENT(3, "事件");
 
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(IotProductThinkModelTypeEnum::getType).toArray();
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(IotProductThingModelTypeEnum::getType).toArray();
 
     /**
      * 类型
@@ -30,8 +30,8 @@ public enum IotProductThinkModelTypeEnum implements IntArrayValuable {
      */
     private final String description;
 
-    public static IotProductThinkModelTypeEnum valueOfType(Integer type) {
+    public static IotProductThingModelTypeEnum valueOfType(Integer type) {
-        for (IotProductThinkModelTypeEnum value : values()) {
+        for (IotProductThingModelTypeEnum value : values()) {
             if (value.getType().equals(type)) {
                 return value;
             }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataRespVO.java

@@ -13,7 +13,7 @@ public class IotDeviceDataRespVO {
     private Long deviceId;
 
     @Schema(description = "物模型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21816")
-    private Long thinkModelFunctionId;
+    private Long thingModelId;
 
     @Schema(description = "产品标识", requiredMode = Schema.RequiredMode.REQUIRED)
     private String productKey;

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/IotProductThingModelController.http

@@ -1,5 +1,5 @@
-### 请求 /iot/product-think-model/create 接口 => 成功
+### 请求 /iot/product-thing-model/create 接口 => 成功
-POST {{baseUrl}}/iot/product-think-model/create
+POST {{baseUrl}}/iot/product-thing-model/create
 Content-Type: application/json
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}
@@ -30,8 +30,8 @@ Authorization: Bearer {{token}}
   }
 }
 
-### 请求 /iot/product-think-model/create 接口 => 成功
+### 请求 /iot/product-thing-model/create 接口 => 成功
-POST {{baseUrl}}/iot/product-think-model/create
+POST {{baseUrl}}/iot/product-thing-model/create
 Content-Type: application/json
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}
@@ -65,8 +65,8 @@ Authorization: Bearer {{token}}
   }
 }
 
-### 请求 /iot/product-think-model/create 接口 => 成功
+### 请求 /iot/product-thing-model/create 接口 => 成功
-POST {{baseUrl}}/iot/product-think-model/create
+POST {{baseUrl}}/iot/product-thing-model/create
 Content-Type: application/json
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}
@@ -134,8 +134,8 @@ Authorization: Bearer {{token}}
   }
 }
 
-### 请求 /iot/product-think-model/update 接口 => 成功
+### 请求 /iot/product-thing-model/update 接口 => 成功
-PUT {{baseUrl}}/iot/product-think-model/update
+PUT {{baseUrl}}/iot/product-thing-model/update
 Content-Type: application/json
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}
@@ -170,18 +170,18 @@ Authorization: Bearer {{token}}
   }
 }
 
-### 请求 /iot/product-think-model/delete 接口 => 成功
+### 请求 /iot/product-thing-model/delete 接口 => 成功
-DELETE {{baseUrl}}/iot/product-think-model/delete?id=36
+DELETE {{baseUrl}}/iot/product-thing-model/delete?id=36
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}
 
-### 请求 /iot/product-think-model/get 接口 => 成功
+### 请求 /iot/product-thing-model/get 接口 => 成功
-GET {{baseUrl}}/iot/product-think-model/get?id=40
+GET {{baseUrl}}/iot/product-thing-model/get?id=40
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}
 
 
-### 请求 /iot/product-think-model/list-by-product-id 接口 => 成功
+### 请求 /iot/product-thing-model/list-by-product-id 接口 => 成功
-GET {{baseUrl}}/iot/product-think-model/list-by-product-id?productId=1001
+GET {{baseUrl}}/iot/product-thing-model/list-by-product-id?productId=1001
 tenant-id: {{adminTenentId}}
 Authorization: Bearer {{token}}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/IotProductThingModelController.java

@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelSaveReqVO;
+import cn.iocoder.yudao.module.iot.convert.thingmodel.IotProductThingModelConvert;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
+import cn.iocoder.yudao.module.iot.service.thingmodel.IotProductThingModelService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - IoT 产品物模型")
+@RestController
+@RequestMapping("/iot/product-thing-model")
+@Validated
+public class IotProductThingModelController {
+
+    @Resource
+    private IotProductThingModelService thingModelService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建产品物模型")
+    @PreAuthorize("@ss.hasPermission('iot:product-thing-model:create')")
+    public CommonResult<Long> createProductThingModel(@Valid @RequestBody IotProductThingModelSaveReqVO createReqVO) {
+        return success(thingModelService.createProductThingModel(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新产品物模型")
+    @PreAuthorize("@ss.hasPermission('iot:product-thing-model:update')")
+    public CommonResult<Boolean> updateProductThingModel(@Valid @RequestBody IotProductThingModelSaveReqVO updateReqVO) {
+        thingModelService.updateProductThingModel(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除产品物模型")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('iot:product-thing-model:delete')")
+    public CommonResult<Boolean> deleteProductThingModel(@RequestParam("id") Long id) {
+        thingModelService.deleteProductThingModel(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得产品物模型")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('iot:product-thing-model:query')")
+    public CommonResult<IotProductThingModelRespVO> getProductThingModel(@RequestParam("id") Long id) {
+        IotProductThingModelDO thingModel = thingModelService.getProductThingModel(id);
+        return success(IotProductThingModelConvert.INSTANCE.convert(thingModel));
+    }
+
+    @GetMapping("/list-by-product-id")
+    @Operation(summary = "获得产品物模型")
+    @Parameter(name = "productId", description = "产品ID", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iot:product-thing-model:query')")
+    public CommonResult<List<IotProductThingModelRespVO>> getProductThingModelListByProductId(@RequestParam("productId") Long productId) {
+        List<IotProductThingModelDO> list = thingModelService.getProductThingModelListByProductId(productId);
+        return success(IotProductThingModelConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得产品物模型分页")
+    @PreAuthorize("@ss.hasPermission('iot:product-thing-model:query')")
+    public CommonResult<PageResult<IotProductThingModelRespVO>> getProductThingModelPage(@Valid IotProductThingModelPageReqVO pageReqVO) {
+        PageResult<IotProductThingModelDO> pageResult = thingModelService.getProductThingModelPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotProductThingModelRespVO.class));
+    }
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelEvent.java

@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model;
 
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelArgument;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelArgument;
 import lombok.Data;
 import java.util.List;
 
 @Data
-public class ThinkModelEvent {
+public class ThingModelEvent {
 
     /**
      * 事件标识符
@@ -26,7 +26,7 @@ public class ThinkModelEvent {
      * "info"、"alert"、"error"
      */
     private String type;
-    private List<ThinkModelArgument> outputData;
+    private List<ThingModelArgument> outputData;
     private String method;
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelProperty.java

@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model;
 
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelDataSpecs;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelDataSpecs;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelAccessModeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelAccessModeEnum;
 import lombok.Data;
 
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author HUIHUI
  */
 @Data
-public class ThinkModelProperty {
+public class ThingModelProperty {
 
     /**
      * 属性标识符
@@ -30,7 +30,7 @@ public class ThinkModelProperty {
     private String description;
     /**
      * 云端可以对该属性进行的操作类型
-     * 关联枚举 {@link IotProductThinkModelAccessModeEnum}
+     * 关联枚举 {@link IotProductThingModelAccessModeEnum}
      */
     private String accessMode;
     /**
@@ -47,10 +47,10 @@ public class ThinkModelProperty {
     /**
      * 数据类型（dataType）为非列表型（int、float、double、text、date、array）的数据规范存储在 dataSpecs 中
      */
-    private ThinkModelDataSpecs dataSpecs;
+    private ThingModelDataSpecs dataSpecs;
     /**
      * 数据类型（dataType）为列表型（enum、bool、struct）的数据规范存储在 dataSpecsList 中
      */
-    private List<ThinkModelDataSpecs> dataSpecsList;
+    private List<ThingModelDataSpecs> dataSpecsList;
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model;
 
 import lombok.*;
 
@@ -9,7 +9,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
-public class ThinkModelRespVO {
+public class ThingModelRespVO {
 
     /**
      * 产品编号
@@ -35,16 +35,16 @@ public class ThinkModelRespVO {
         /**
          * 属性列表
          */
-        private List<ThinkModelProperty> properties;
+        private List<ThingModelProperty> properties;
 
         /**
          * 服务列表
          */
-        private List<ThinkModelService> services;
+        private List<ThingModelService> services;
 
         /**
          * 事件列表
          */
-        private List<ThinkModelEvent> events;
+        private List<ThingModelEvent> events;
     }
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/ThingModelService.java

@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model;
 
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelArgument;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelArgument;
 import lombok.Data;
 import java.util.List;
 
 @Data
-public class ThinkModelService {
+public class ThingModelService {
 
     /**
      * 服务标识符
@@ -26,8 +26,8 @@ public class ThinkModelService {
      * "sync"、"async"
      */
     private String callType;
-    private List<ThinkModelArgument> inputData;
+    private List<ThingModelArgument> inputData;
-    private List<ThinkModelArgument> outputData;
+    private List<ThingModelArgument> outputData;
     private String method;
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelArgument.java

@@ -1,10 +1,10 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
 import lombok.Data;
 
 @Data
-public class ThinkModelArgument {
+public class ThingModelArgument {
 
     public static final String DIRECTION_INPUT = "input";
     public static final String DIRECTION_OUTPUT = "output";
@@ -14,7 +14,7 @@ public class ThinkModelArgument {
     /**
      * 物模型中的属性
      */
-    private ThinkModelProperty property;
+    private ThingModelProperty property;
     /**
      * 用于区分输入或输出参数，"input" 或 "output"
      */

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelArrayDataSpecs.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
-// TODO @puhui999：thingmodel 哈 = = 之前我写错单词了
 /**
  * 物模型数据类型为数组的 DataSpec 定义
  *
@@ -15,7 +14,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties({"dataType"}) // 忽略子类中的 dataType 字段，从而避免重复。
-public class ThinkModelArrayDataSpecs extends ThinkModelDataSpecs {
+public class ThingModelArrayDataSpecs extends ThingModelDataSpecs {
 
     /**
      * 数组中的元素个数。
@@ -29,7 +28,7 @@ public class ThinkModelArrayDataSpecs extends ThinkModelDataSpecs {
      * 数据类型（childDataType）为列表型 struct 的数据规范存储在 dataSpecsList 中。
      * 此时 struct 取值范围为：int、float、double、text、date、enum、bool
      */
-    private List<ThinkModelDataSpecs> dataSpecsList;
+    private List<ThingModelDataSpecs> dataSpecsList;
 
 }
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelBoolOrEnumDataSpecs.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties({"dataType"}) // 忽略子类中的 dataType 字段，从而避免重复。
-public class ThinkModelBoolOrEnumDataSpecs extends ThinkModelDataSpecs {
+public class ThingModelBoolOrEnumDataSpecs extends ThingModelDataSpecs {
 
     /**
      * 枚举项的名称。

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelDataSpecs.java

@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
 
 /**
- * 抽象类 ThinkModelDataSpecs
+ * 抽象类 ThingModelDataSpecs
  *
  * 用于表示物模型数据的通用类型，根据具体的 "dataType" 字段动态映射到对应的子类。
  * 提供多态支持，适用于不同类型的数据结构序列化和反序列化场景。
@@ -15,17 +15,17 @@ import lombok.Data;
 @Data
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "dataType", visible = true)
 @JsonSubTypes({
-        @JsonSubTypes.Type(value = ThinkModelNumericDataSpec.class, name = "int"),
+        @JsonSubTypes.Type(value = ThingModelNumericDataSpec.class, name = "int"),
-        @JsonSubTypes.Type(value = ThinkModelNumericDataSpec.class, name = "float"),
+        @JsonSubTypes.Type(value = ThingModelNumericDataSpec.class, name = "float"),
-        @JsonSubTypes.Type(value = ThinkModelNumericDataSpec.class, name = "double"),
+        @JsonSubTypes.Type(value = ThingModelNumericDataSpec.class, name = "double"),
-        @JsonSubTypes.Type(value = ThinkModelDateOrTextDataSpecs.class, name = "text"),
+        @JsonSubTypes.Type(value = ThingModelDateOrTextDataSpecs.class, name = "text"),
-        @JsonSubTypes.Type(value = ThinkModelDateOrTextDataSpecs.class, name = "date"),
+        @JsonSubTypes.Type(value = ThingModelDateOrTextDataSpecs.class, name = "date"),
-        @JsonSubTypes.Type(value = ThinkModelBoolOrEnumDataSpecs.class, name = "bool"),
+        @JsonSubTypes.Type(value = ThingModelBoolOrEnumDataSpecs.class, name = "bool"),
-        @JsonSubTypes.Type(value = ThinkModelBoolOrEnumDataSpecs.class, name = "enum"),
+        @JsonSubTypes.Type(value = ThingModelBoolOrEnumDataSpecs.class, name = "enum"),
-        @JsonSubTypes.Type(value = ThinkModelArrayDataSpecs.class, name = "array"),
+        @JsonSubTypes.Type(value = ThingModelArrayDataSpecs.class, name = "array"),
-        @JsonSubTypes.Type(value = ThinkModelStructDataSpecs.class, name = "struct")
+        @JsonSubTypes.Type(value = ThingModelStructDataSpecs.class, name = "struct")
 })
-public abstract class ThinkModelDataSpecs {
+public abstract class ThingModelDataSpecs {
 
     /**
      * 数据类型

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelDateOrTextDataSpecs.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties({"dataType"}) // 忽略子类中的 dataType 字段，从而避免重复。
-public class ThinkModelDateOrTextDataSpecs extends ThinkModelDataSpecs {
+public class ThingModelDateOrTextDataSpecs extends ThingModelDataSpecs {
 
     /**
      * 数据长度，单位为字节。取值不能超过 2048。

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelNumericDataSpec.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties({"dataType"}) // 忽略子类中的 dataType 字段，从而避免重复。
-public class ThinkModelNumericDataSpec extends ThinkModelDataSpecs {
+public class ThingModelNumericDataSpec extends ThingModelDataSpecs {
 
     /**
      * 最大值，需转为字符串类型。值必须与 dataType 类型一致。

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/model/dataType/ThingModelStructDataSpecs.java

@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType;
 
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelAccessModeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelAccessModeEnum;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonIgnoreProperties({"dataType"}) // 忽略子类中的 dataType 字段，从而避免重复。
-public class ThinkModelStructDataSpecs extends ThinkModelDataSpecs {
+public class ThingModelStructDataSpecs extends ThingModelDataSpecs {
 
     /**
      * 属性标识符
@@ -31,7 +31,7 @@ public class ThinkModelStructDataSpecs extends ThinkModelDataSpecs {
     private String description;
     /**
      * 云端可以对该属性进行的操作类型
-     * 关联枚举 {@link IotProductThinkModelAccessModeEnum}
+     * 关联枚举 {@link IotProductThingModelAccessModeEnum}
      */
     private String accessMode;
     /**
@@ -48,11 +48,11 @@ public class ThinkModelStructDataSpecs extends ThinkModelDataSpecs {
     /**
      * 数据类型（dataType）为非列表型（int、float、double、text、date、array）的数据规范存储在 dataSpecs 中
      */
-    private ThinkModelDataSpecs dataSpecs;
+    private ThingModelDataSpecs dataSpecs;
     /**
      * 数据类型（dataType）为列表型（enum、bool、struct）的数据规范存储在 dataSpecsList 中
      */
-    private List<ThinkModelDataSpecs> dataSpecsList;
+    private List<ThingModelDataSpecs> dataSpecsList;
 
 }
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotProductThingModelPageReqVO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class IotProductThinkModelPageReqVO extends PageParam {
+public class IotProductThingModelPageReqVO extends PageParam {
 
     @Schema(description = "功能标识")
     private String identifier;
@@ -22,7 +22,7 @@ public class IotProductThinkModelPageReqVO extends PageParam {
     private String name;
 
     @Schema(description = "功能类型", example = "1")
-    @InEnum(IotProductThinkModelTypeEnum.class)
+    @InEnum(IotProductThingModelTypeEnum.class)
     private Integer type;
 
     @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED)

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotProductThingModelRespVO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo;
 
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelEvent;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelEvent;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelService;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelService;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 @Schema(description = "管理后台 - IoT 产品物模型 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class IotProductThinkModelRespVO {
+public class IotProductThingModelRespVO {
 
     @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21816")
     @ExcelProperty("产品ID")
@@ -39,13 +39,13 @@ public class IotProductThinkModelRespVO {
     private Integer type;
 
     @Schema(description = "属性", requiredMode = Schema.RequiredMode.REQUIRED)
-    private ThinkModelProperty property;
+    private ThingModelProperty property;
 
     @Schema(description = "服务", requiredMode = Schema.RequiredMode.REQUIRED)
-    private ThinkModelEvent event;
+    private ThingModelEvent event;
 
     @Schema(description = "事件", requiredMode = Schema.RequiredMode.REQUIRED)
-    private ThinkModelService service;
+    private ThingModelService service;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotProductThingModelSaveReqVO.java

@@ -1,10 +1,10 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo;
+package cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo;
 
 import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelEvent;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelEvent;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelService;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelService;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -12,7 +12,7 @@ import lombok.Data;
 
 @Schema(description = "管理后台 - IoT 产品物模型新增/修改 Request VO")
 @Data
-public class IotProductThinkModelSaveReqVO {
+public class IotProductThingModelSaveReqVO {
 
     @Schema(description = "编号", example = "1")
     private Long id;
@@ -38,16 +38,16 @@ public class IotProductThinkModelSaveReqVO {
 
     @Schema(description = "功能类型", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "功能类型不能为空")
-    @InEnum(IotProductThinkModelTypeEnum.class)
+    @InEnum(IotProductThingModelTypeEnum.class)
     private Integer type;
 
     @Schema(description = "属性", requiredMode = Schema.RequiredMode.REQUIRED)
-    private ThinkModelProperty property;
+    private ThingModelProperty property;
 
     @Schema(description = "服务", requiredMode = Schema.RequiredMode.REQUIRED)
-    private ThinkModelService service;
+    private ThingModelService service;
 
     @Schema(description = "事件", requiredMode = Schema.RequiredMode.REQUIRED)
-    private ThinkModelEvent event;
+    private ThingModelEvent event;
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodel/IotProductThinkModelController.java

@@ -1,84 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.thinkmodel;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelPageReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelRespVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelSaveReqVO;
-import cn.iocoder.yudao.module.iot.convert.thinkmodel.IotProductThinkModelConvert;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
-import cn.iocoder.yudao.module.iot.service.thinkmodel.IotProductThinkModelService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - IoT 产品物模型")
-@RestController
-@RequestMapping("/iot/product-think-model")
-@Validated
-public class IotProductThinkModelController {
-
-    @Resource
-    private IotProductThinkModelService thinkModelFunctionService;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建产品物模型")
-    @PreAuthorize("@ss.hasPermission('iot:product-think-model:create')")
-    public CommonResult<Long> createProductThinkModel(@Valid @RequestBody IotProductThinkModelSaveReqVO createReqVO) {
-        return success(thinkModelFunctionService.createProductThinkModel(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新产品物模型")
-    @PreAuthorize("@ss.hasPermission('iot:product-think-model:update')")
-    public CommonResult<Boolean> updateProductThinkModel(@Valid @RequestBody IotProductThinkModelSaveReqVO updateReqVO) {
-        thinkModelFunctionService.updateProductThinkModel(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除产品物模型")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('iot:product-think-model:delete')")
-    public CommonResult<Boolean> deleteProductThinkModel(@RequestParam("id") Long id) {
-        thinkModelFunctionService.deleteProductThinkModel(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得产品物模型")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('iot:product-think-model:query')")
-    public CommonResult<IotProductThinkModelRespVO> getProductThinkModel(@RequestParam("id") Long id) {
-        IotProductThinkModelDO function = thinkModelFunctionService.getProductThinkModel(id);
-        return success(IotProductThinkModelConvert.INSTANCE.convert(function));
-    }
-
-    @GetMapping("/list-by-product-id")
-    @Operation(summary = "获得产品物模型")
-    @Parameter(name = "productId", description = "产品ID", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('iot:product-think-model:query')")
-    public CommonResult<List<IotProductThinkModelRespVO>> getProductThinkModelListByProductId(@RequestParam("productId") Long productId) {
-        List<IotProductThinkModelDO> list = thinkModelFunctionService.getProductThinkModelListByProductId(productId);
-        return success(IotProductThinkModelConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得产品物模型分页")
-    @PreAuthorize("@ss.hasPermission('iot:product-think-model:query')")
-    public CommonResult<PageResult<IotProductThinkModelRespVO>> getProductThinkModelPage(@Valid IotProductThinkModelPageReqVO pageReqVO) {
-        PageResult<IotProductThinkModelDO> pageResult = thinkModelFunctionService.getProductThinkModelPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, IotProductThinkModelRespVO.class));
-    }
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/device/IotDeviceDataConvert.java

@@ -12,7 +12,7 @@ public interface IotDeviceDataConvert {
 //    default  List<IotDeviceDataRespVO> convert(Map<String, Object> deviceData, IotDeviceDO device){
 //        List<IotDeviceDataRespVO> list = new ArrayList<>();
 //        deviceData.forEach((identifier, value) -> {
-////            ThinkModelProperty property = ThinkModelService.INSTANCE.getProperty(device.getProductId(), identifier);
+////            ThingModelProperty property = ThingModelService.INSTANCE.getProperty(device.getProductId(), identifier);
 ////            if (Objects.isNull(property)) {
 ////                return;
 ////            }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/thingmodel/IotProductThingModelConvert.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.iot.convert.thingmodel;
+
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelEvent;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelService;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelSaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.Objects;
+
+@Mapper
+public interface IotProductThingModelConvert {
+
+    IotProductThingModelConvert INSTANCE = Mappers.getMapper(IotProductThingModelConvert.class);
+
+    // 将 SaveReqVO 转换为 DO
+    @Mapping(target = "property", expression = "java(convertToProperty(bean))")
+    @Mapping(target = "event", expression = "java(convertToEvent(bean))")
+    @Mapping(target = "service", expression = "java(convertToService(bean))")
+    IotProductThingModelDO convert(IotProductThingModelSaveReqVO bean);
+
+    // 将 DO 转换为 RespVO
+    @Mapping(target = "property", source = "property")
+    @Mapping(target = "event", source = "event")
+    @Mapping(target = "service", source = "service")
+    IotProductThingModelRespVO convert(IotProductThingModelDO bean);
+
+    // 批量转换
+    List<IotProductThingModelRespVO> convertList(List<IotProductThingModelDO> list);
+
+    @Named("convertToProperty")
+    default ThingModelProperty convertToProperty(IotProductThingModelSaveReqVO bean) {
+        if (Objects.equals(bean.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
+            return bean.getProperty();
+        }
+        return null;
+    }
+
+    @Named("convertToEvent")
+    default ThingModelEvent convertToEvent(IotProductThingModelSaveReqVO bean) {
+        if (Objects.equals(bean.getType(), IotProductThingModelTypeEnum.EVENT.getType())) {
+            return bean.getEvent();
+        }
+        return null;
+    }
+
+    @Named("convertToService")
+    default ThingModelService convertToService(IotProductThingModelSaveReqVO bean) {
+        if (Objects.equals(bean.getType(), IotProductThingModelTypeEnum.SERVICE.getType())) {
+            return bean.getService();
+        }
+        return null;
+    }
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/thinkmodel/IotProductThinkModelConvert.java

@@ -1,62 +0,0 @@
-package cn.iocoder.yudao.module.iot.convert.thinkmodel;
-
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelEvent;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelService;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelRespVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelSaveReqVO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Named;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-import java.util.Objects;
-
-@Mapper
-public interface IotProductThinkModelConvert {
-
-    IotProductThinkModelConvert INSTANCE = Mappers.getMapper(IotProductThinkModelConvert.class);
-
-    // 将 SaveReqVO 转换为 DO
-    @Mapping(target = "property", expression = "java(convertToProperty(bean))")
-    @Mapping(target = "event", expression = "java(convertToEvent(bean))")
-    @Mapping(target = "service", expression = "java(convertToService(bean))")
-    IotProductThinkModelDO convert(IotProductThinkModelSaveReqVO bean);
-
-    // 将 DO 转换为 RespVO
-    @Mapping(target = "property", source = "property")
-    @Mapping(target = "event", source = "event")
-    @Mapping(target = "service", source = "service")
-    IotProductThinkModelRespVO convert(IotProductThinkModelDO bean);
-
-    // 批量转换
-    List<IotProductThinkModelRespVO> convertList(List<IotProductThinkModelDO> list);
-
-    @Named("convertToProperty")
-    default ThinkModelProperty convertToProperty(IotProductThinkModelSaveReqVO bean) {
-        if (Objects.equals(bean.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
-            return bean.getProperty();
-        }
-        return null;
-    }
-
-    @Named("convertToEvent")
-    default ThinkModelEvent convertToEvent(IotProductThinkModelSaveReqVO bean) {
-        if (Objects.equals(bean.getType(), IotProductThinkModelTypeEnum.EVENT.getType())) {
-            return bean.getEvent();
-        }
-        return null;
-    }
-
-    @Named("convertToService")
-    default ThinkModelService convertToService(IotProductThinkModelSaveReqVO bean) {
-        if (Objects.equals(bean.getType(), IotProductThinkModelTypeEnum.SERVICE.getType())) {
-            return bean.getService();
-        }
-        return null;
-    }
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.iot.dal.dataobject.device;
 
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,9 +30,9 @@ public class IotDeviceDataDO {
     /**
      * 物模型编号
      * <p>
-     * 关联 {@link IotProductThinkModelDO#getId()}
+     * 关联 {@link IotProductThingModelDO#getId()}
      */
-    private Long thinkModelId;
+    private Long thingModelId;
 
     /**
      * 产品标识
@@ -51,21 +51,21 @@ public class IotDeviceDataDO {
     /**
      * 属性标识符
      * <p>
-     * 关联 {@link IotProductThinkModelDO#getIdentifier()}
+     * 关联 {@link IotProductThingModelDO#getIdentifier()}
      */
     private String identifier;
 
     /**
      * 属性名称
      * <p>
-     * 关联 {@link IotProductThinkModelDO#getName()}
+     * 关联 {@link IotProductThingModelDO#getName()}
      */
     private String name;
 
     /**
      * 数据类型
      * <p>
-     * 关联 {@link IotProductThinkModelDO#getProperty()#getDataType()}
+     * 关联 {@link IotProductThingModelDO#getProperty()#getDataType()}
      */
     private String dataType;
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/FieldParser.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
 
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelRespVO;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,7 +33,7 @@ public class FieldParser {
      * @param property 物模型属性
      * @return TdField对象
      */
-    public static TdFieldDO parse(ThinkModelProperty property) {
+    public static TdFieldDO parse(ThingModelProperty property) {
         String fieldName = property.getIdentifier().toLowerCase();
 
         // 将物模型字段类型映射为td字段类型
@@ -53,7 +53,7 @@ public class FieldParser {
      * @param thingModel 物模型响应对象
      * @return 字段列表
      */
-    public static List<TdFieldDO> parse(ThinkModelRespVO thingModel) {
+    public static List<TdFieldDO> parse(ThingModelRespVO thingModel) {
         return thingModel.getModel().getProperties().stream()
                 .map(FieldParser::parse)
                 .collect(Collectors.toList());

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/ThingModelMessage.java

@@ -15,7 +15,7 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class ThinkModelMessage {
+public class ThingModelMessage {
 
     /**
      * 消息ID

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/thingmodel/IotProductThingModelDO.java

@@ -1,11 +1,11 @@
-package cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel;
+package cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelEvent;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelEvent;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelService;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelService;
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -19,17 +19,17 @@ import lombok.NoArgsConstructor;
 /**
  * IoT 产品物模型功能 DO
  * <p>
- * 每个 {@link IotProductDO} 和 {@link IotProductThinkModelDO} 是“一对多”的关系，它的每个属性、事件、服务都对应一条记录
+ * 每个 {@link IotProductDO} 和 {@link IotProductThingModelDO} 是“一对多”的关系，它的每个属性、事件、服务都对应一条记录
  *
  * @author 芋道源码
  */
-@TableName(value = "iot_product_think_model", autoResultMap = true)
+@TableName(value = "iot_product_thing_model", autoResultMap = true)
-@KeySequence("iot_product_think_model_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@KeySequence("iot_product_thing_model_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class IotProductThinkModelDO extends BaseDO {
+public class IotProductThingModelDO extends BaseDO {
 
     /**
      * 物模型功能编号
@@ -66,7 +66,7 @@ public class IotProductThinkModelDO extends BaseDO {
     /**
      * 功能类型
      * <p>
-     * 枚举 {@link IotProductThinkModelTypeEnum}
+     * 枚举 {@link IotProductThingModelTypeEnum}
      */
     private Integer type;
 
@@ -74,18 +74,18 @@ public class IotProductThinkModelDO extends BaseDO {
      * 属性
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private ThinkModelProperty property;
+    private ThingModelProperty property;
 
     /**
      * 事件
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private ThinkModelEvent event;
+    private ThingModelEvent event;
 
     /**
      * 服务
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private ThinkModelService service;
+    private ThingModelService service;
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thingmodel/IotProductThingModelMapper.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.iot.dal.mysql.thingmodel;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelPageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * IoT 产品物模型 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface IotProductThingModelMapper extends BaseMapperX<IotProductThingModelDO> {
+
+    default PageResult<IotProductThingModelDO> selectPage(IotProductThingModelPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotProductThingModelDO>()
+                .eqIfPresent(IotProductThingModelDO::getIdentifier, reqVO.getIdentifier())
+                .likeIfPresent(IotProductThingModelDO::getName, reqVO.getName())
+                .eqIfPresent(IotProductThingModelDO::getType, reqVO.getType())
+                .eqIfPresent(IotProductThingModelDO::getProductId, reqVO.getProductId())
+                .notIn(IotProductThingModelDO::getIdentifier, "get", "set", "post")
+                .orderByDesc(IotProductThingModelDO::getId));
+    }
+
+    default IotProductThingModelDO selectByProductIdAndIdentifier(Long productId, String identifier) {
+        return selectOne(IotProductThingModelDO::getProductId, productId,
+                IotProductThingModelDO::getIdentifier, identifier);
+    }
+
+    default List<IotProductThingModelDO> selectListByProductId(Long productId) {
+        return selectList(IotProductThingModelDO::getProductId, productId);
+    }
+
+    default List<IotProductThingModelDO> selectListByProductIdAndType(Long productId, Integer type) {
+        return selectList(IotProductThingModelDO::getProductId, productId,
+                IotProductThingModelDO::getType, type);
+    }
+
+    default List<IotProductThingModelDO> selectListByProductIdAndIdentifiersAndTypes(Long productId,
+                                                                                     List<String> identifiers,
+                                                                                     List<Integer> types) {
+        return selectList(new LambdaQueryWrapperX<IotProductThingModelDO>()
+                .eq(IotProductThingModelDO::getProductId, productId)
+                .in(IotProductThingModelDO::getIdentifier, identifiers)
+                .in(IotProductThingModelDO::getType, types));
+    }
+
+    default IotProductThingModelDO selectByProductIdAndName(Long productId, String name) {
+        return selectOne(IotProductThingModelDO::getProductId, productId,
+                IotProductThingModelDO::getName, name);
+    }
+
+    default List<IotProductThingModelDO> selectListByProductKey(String productKey) {
+        return selectList(IotProductThingModelDO::getProductKey, productKey);
+    }
+
+}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thinkmodel/IotProductThinkModelMapper.java

@@ -1,62 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.mysql.thinkmodel;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelPageReqVO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * IoT 产品物模型 Mapper
- *
- * @author 芋道源码
- */
-@Mapper
-public interface IotProductThinkModelMapper extends BaseMapperX<IotProductThinkModelDO> {
-
-    default PageResult<IotProductThinkModelDO> selectPage(IotProductThinkModelPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<IotProductThinkModelDO>()
-                .eqIfPresent(IotProductThinkModelDO::getIdentifier, reqVO.getIdentifier())
-                .likeIfPresent(IotProductThinkModelDO::getName, reqVO.getName())
-                .eqIfPresent(IotProductThinkModelDO::getType, reqVO.getType())
-                .eqIfPresent(IotProductThinkModelDO::getProductId, reqVO.getProductId())
-                .notIn(IotProductThinkModelDO::getIdentifier, "get", "set", "post")
-                .orderByDesc(IotProductThinkModelDO::getId));
-    }
-
-    default IotProductThinkModelDO selectByProductIdAndIdentifier(Long productId, String identifier) {
-        return selectOne(IotProductThinkModelDO::getProductId, productId,
-                IotProductThinkModelDO::getIdentifier, identifier);
-    }
-
-    default List<IotProductThinkModelDO> selectListByProductId(Long productId) {
-        return selectList(IotProductThinkModelDO::getProductId, productId);
-    }
-
-    default List<IotProductThinkModelDO> selectListByProductIdAndType(Long productId, Integer type) {
-        return selectList(IotProductThinkModelDO::getProductId, productId,
-                IotProductThinkModelDO::getType, type);
-    }
-
-    default List<IotProductThinkModelDO> selectListByProductIdAndIdentifiersAndTypes(Long productId,
-                                                                                     List<String> identifiers,
-                                                                                     List<Integer> types) {
-        return selectList(new LambdaQueryWrapperX<IotProductThinkModelDO>()
-                .eq(IotProductThinkModelDO::getProductId, productId)
-                .in(IotProductThinkModelDO::getIdentifier, identifiers)
-                .in(IotProductThinkModelDO::getType, types));
-    }
-
-    default IotProductThinkModelDO selectByProductIdAndName(Long productId, String name) {
-        return selectOne(IotProductThinkModelDO::getProductId, productId,
-                IotProductThinkModelDO::getName, name);
-    }
-
-    default List<IotProductThinkModelDO> selectListByProductKey(String productKey) {
-        return selectList(IotProductThinkModelDO::getProductKey, productKey);
-    }
-
-}

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java

@@ -8,14 +8,14 @@ import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDevi
 import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThinkModelMessage;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
 import cn.iocoder.yudao.module.iot.dal.redis.deviceData.DeviceDataRedisDAO;
 import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDMLMapper;
 import cn.iocoder.yudao.module.iot.enums.IotConstants;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
-import cn.iocoder.yudao.module.iot.service.tdengine.IotThinkModelMessageService;
+import cn.iocoder.yudao.module.iot.service.tdengine.IotThingModelMessageService;
-import cn.iocoder.yudao.module.iot.service.thinkmodel.IotProductThinkModelService;
+import cn.iocoder.yudao.module.iot.service.thingmodel.IotProductThingModelService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
@@ -40,9 +40,9 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
     @Resource
     private IotDeviceService deviceService;
     @Resource
-    private IotThinkModelMessageService thingModelMessageService;
+    private IotThingModelMessageService thingModelMessageService;
     @Resource
-    private IotProductThinkModelService thinkModelFunctionService;
+    private IotProductThingModelService thingModelService;
     @Resource
     private TdEngineDMLMapper tdEngineDMLMapper;
 
@@ -56,7 +56,7 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
         // 2. 解析消息，保存数据
         JSONObject jsonObject = new JSONObject(message);
         log.info("[saveDeviceData][productKey({}) deviceName({}) data({})]", productKey, deviceName, jsonObject);
-        ThinkModelMessage thingModelMessage = ThinkModelMessage.builder()
+        ThingModelMessage thingModelMessage = ThingModelMessage.builder()
                 .id(jsonObject.getStr("id"))
                 .sys(jsonObject.get("sys"))
                 .method(jsonObject.getStr("method"))
@@ -66,7 +66,7 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
                 .deviceName(deviceName)
                 .deviceKey(device.getDeviceKey())
                 .build();
-        thingModelMessageService.saveThinkModelMessage(device, thingModelMessage);
+        thingModelMessageService.saveThingModelMessage(device, thingModelMessage);
     }
 
     @Override
@@ -75,31 +75,31 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
         // 1. 获取设备信息
         IotDeviceDO device = deviceService.getDevice(deviceDataReqVO.getDeviceId());
         // 2. 获取设备属性最新数据
-        List<IotProductThinkModelDO> thinkModelList = thinkModelFunctionService.getProductThinkModelListByProductKey(device.getProductKey());
+        List<IotProductThingModelDO> thingModelList = thingModelService.getProductThingModelListByProductKey(device.getProductKey());
-        thinkModelList = filterList(thinkModelList, thinkModel -> IotProductThinkModelTypeEnum.PROPERTY.getType()
+        thingModelList = filterList(thingModelList, thingModel -> IotProductThingModelTypeEnum.PROPERTY.getType()
-                .equals(thinkModel.getType()));
+                .equals(thingModel.getType()));
 
         // 3. 过滤标识符和属性名称
         if (deviceDataReqVO.getIdentifier() != null) {
-            thinkModelList = filterList(thinkModelList, thinkModel -> thinkModel.getIdentifier()
+            thingModelList = filterList(thingModelList, thingModel -> thingModel.getIdentifier()
                     .toLowerCase().contains(deviceDataReqVO.getIdentifier().toLowerCase()));
         }
         if (deviceDataReqVO.getName() != null) {
-            thinkModelList = filterList(thinkModelList, thinkModel -> thinkModel.getName()
+            thingModelList = filterList(thingModelList, thingModel -> thingModel.getName()
                     .toLowerCase().contains(deviceDataReqVO.getName().toLowerCase()));
         }
         // 4. 获取设备属性最新数据
-        thinkModelList.forEach(thinkModel -> {
+        thingModelList.forEach(thingModel -> {
-            IotDeviceDataDO deviceData = deviceDataRedisDAO.get(device.getProductKey(), device.getDeviceName(), thinkModel.getIdentifier());
+            IotDeviceDataDO deviceData = deviceDataRedisDAO.get(device.getProductKey(), device.getDeviceName(), thingModel.getIdentifier());
             if (deviceData == null) {
                 deviceData = new IotDeviceDataDO();
                 deviceData.setProductKey(device.getProductKey());
                 deviceData.setDeviceName(device.getDeviceName());
-                deviceData.setIdentifier(thinkModel.getIdentifier());
+                deviceData.setIdentifier(thingModel.getIdentifier());
                 deviceData.setDeviceId(deviceDataReqVO.getDeviceId());
-                deviceData.setThinkModelId(thinkModel.getId());
+                deviceData.setThingModelId(thingModel.getId());
-                deviceData.setName(thinkModel.getName());
+                deviceData.setName(thingModel.getName());
-                deviceData.setDataType(thinkModel.getProperty().getDataType());
+                deviceData.setDataType(thingModel.getProperty().getDataType());
             }
             list.add(deviceData);
         });

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java

@@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProduc
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
 import cn.iocoder.yudao.module.iot.dal.mysql.product.IotProductMapper;
 import cn.iocoder.yudao.module.iot.enums.product.IotProductStatusEnum;
-import cn.iocoder.yudao.module.iot.service.thinkmodel.IotProductThinkModelService;
+import cn.iocoder.yudao.module.iot.service.thingmodel.IotProductThingModelService;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -34,7 +34,7 @@ public class IotProductServiceImpl implements IotProductService {
 
     @Resource
     @Lazy
-    private IotProductThinkModelService thinkModelFunctionService;
+    private IotProductThingModelService thingModelService;
 
     @Override
     public Long createProduct(IotProductSaveReqVO createReqVO) {
@@ -115,7 +115,7 @@ public class IotProductServiceImpl implements IotProductService {
         // 3. 产品是发布状态
         if (Objects.equals(status, IotProductStatusEnum.PUBLISHED.getStatus())) {
             // 3.1 创建超级表数据模型
-            thinkModelFunctionService.createSuperTableDataModel(id);
+            thingModelService.createSuperTableDataModel(id);
         }
         productMapper.updateById(updateObj);
     }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.iot.service.tdengine;
 
 
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
 
 import java.util.List;
 
@@ -14,5 +14,6 @@ public interface IotSuperTableService {
     /**
      * 创建超级表数据模型
      */
-    void createSuperTableDataModel(IotProductDO product, List<IotProductThinkModelDO> functionList);
+    void createSuperTableDataModel(IotProductDO product, List<IotProductThingModelDO> thingModelList);
+
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java

@@ -2,15 +2,15 @@ package cn.iocoder.yudao.module.iot.service.tdengine;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelRespVO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.FieldParser;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
 import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDDLMapper;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -33,8 +33,8 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
     private String url;
 
     @Override
-    public void createSuperTableDataModel(IotProductDO product, List<IotProductThinkModelDO> functionList) {
+    public void createSuperTableDataModel(IotProductDO product, List<IotProductThingModelDO> thingModelList) {
-        ThinkModelRespVO thingModel = buildThinkModel(product, functionList);
+        ThingModelRespVO thingModel = buildThingModel(product, thingModelList);
 
         if (thingModel.getModel() == null || CollUtil.isEmpty(thingModel.getModel().getProperties())) {
             log.warn("物模型属性列表为空，不创建超级表");
@@ -56,7 +56,7 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
     /**
      * 创建超级表
      */
-    private void createSuperTable(ThinkModelRespVO thingModel, Integer deviceType) {
+    private void createSuperTable(ThingModelRespVO thingModel, Integer deviceType) {
         // 解析物模型，获取字段列表
         List<TdFieldDO> schemaFields = new ArrayList<>();
         schemaFields.add(TdFieldDO.builder()
@@ -84,7 +84,7 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
     /**
      * 更新超级表
      */
-    private void updateSuperTable(ThinkModelRespVO thingModel, Integer deviceType) {
+    private void updateSuperTable(ThingModelRespVO thingModel, Integer deviceType) {
         String superTableName = getSuperTableName(deviceType, thingModel.getProductKey());
         try {
             List<TdFieldDO> oldFields = getTableFields(superTableName);
@@ -210,18 +210,18 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
     /**
      * 构建物模型
      */
-    private ThinkModelRespVO buildThinkModel(IotProductDO product, List<IotProductThinkModelDO> functionList) {
+    private ThingModelRespVO buildThingModel(IotProductDO product, List<IotProductThingModelDO> thingModelList) {
-        ThinkModelRespVO thingModel = new ThinkModelRespVO();
+        ThingModelRespVO thingModel = new ThingModelRespVO();
         thingModel.setId(product.getId());
         thingModel.setProductKey(product.getProductKey());
 
-        List<ThinkModelProperty> properties = functionList.stream()
+        List<ThingModelProperty> properties = thingModelList.stream()
-                .filter(function -> IotProductThinkModelTypeEnum.PROPERTY.equals(
+                .filter(item -> IotProductThingModelTypeEnum.PROPERTY.equals(
-                        IotProductThinkModelTypeEnum.valueOfType(function.getType())))
+                        IotProductThingModelTypeEnum.valueOfType(item.getType())))
-                .map(this::buildThinkModelProperty)
+                .map(this::buildThingModelProperty)
                 .collect(Collectors.toList());
 
-        ThinkModelRespVO.Model model = new ThinkModelRespVO.Model();
+        ThingModelRespVO.Model model = new ThingModelRespVO.Model();
         model.setProperties(properties);
         thingModel.setModel(model);
 
@@ -231,9 +231,9 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
     /**
      * 构建物模型属性
      */
-    private ThinkModelProperty buildThinkModelProperty(IotProductThinkModelDO function) {
+    private ThingModelProperty buildThingModelProperty(IotProductThingModelDO thingModel) {
-        ThinkModelProperty property = BeanUtil.copyProperties(function, ThinkModelProperty.class);
+        ThingModelProperty property = BeanUtil.copyProperties(thingModel, ThingModelProperty.class);
-        property.setDataType(function.getProperty().getDataType());
+        property.setDataType(thingModel.getProperty().getDataType());
         return property;
     }
 

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageService.java

@@ -1,12 +1,12 @@
 package cn.iocoder.yudao.module.iot.service.tdengine;
 
 import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThinkModelMessage;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
 
 /**
  * 物模型消息 Service
  */
-public interface IotThinkModelMessageService {
+public interface IotThingModelMessageService {
 
     /**
      * 保存物模型消息
@@ -14,5 +14,5 @@ public interface IotThinkModelMessageService {
      * @param device            设备
      * @param thingModelMessage 物模型消息
      */
-    void saveThinkModelMessage(IotDeviceDO device, ThinkModelMessage thingModelMessage);
+    void saveThingModelMessage(IotDeviceDO device, ThingModelMessage thingModelMessage);
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java

@@ -10,16 +10,16 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.FieldParser;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
 import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThinkModelMessage;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
 import cn.iocoder.yudao.module.iot.dal.redis.deviceData.DeviceDataRedisDAO;
 import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDDLMapper;
 import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDMLMapper;
 import cn.iocoder.yudao.module.iot.enums.IotConstants;
 import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStatusEnum;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
 import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
-import cn.iocoder.yudao.module.iot.service.thinkmodel.IotProductThinkModelService;
+import cn.iocoder.yudao.module.iot.service.thingmodel.IotProductThingModelService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,12 +28,14 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+
 /**
  * 物模型消息 Service 实现类
  */
 @Slf4j
 @Service
-public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageService {
+public class IotThingModelMessageServiceImpl implements IotThingModelMessageService {
 
     private static final String TAG_NOTE = "TAG";
     private static final String NOTE = "note";
@@ -47,7 +49,7 @@ public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageServ
     private String url;
 
     @Resource
-    private IotProductThinkModelService iotProductThinkModelService;
+    private IotProductThingModelService iotProductThingModelService;
     @Resource
     private IotDeviceService iotDeviceService;
     @Resource
@@ -61,7 +63,7 @@ public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageServ
     // TODO @haohao：这个方法，可以考虑加下 1. 2. 3. 更有层次感
     @Override
     @TenantIgnore
-    public void saveThinkModelMessage(IotDeviceDO device, ThinkModelMessage thingModelMessage) {
+    public void saveThingModelMessage(IotDeviceDO device, ThingModelMessage thingModelMessage) {
         // 1. 判断设备状态，如果为未激活状态，创建数据表并更新设备状态
         if (IotDeviceStatusEnum.INACTIVE.getStatus().equals(device.getStatus())) {
             createDeviceTable(device.getDeviceType(), device.getProductKey(), device.getDeviceName(), device.getDeviceKey());
@@ -71,13 +73,13 @@ public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageServ
 
         // 2. 获取设备属性并进行物模型校验，过滤非物模型属性
         Map<String, Object> params = thingModelMessage.dataToMap();
-        List<IotProductThinkModelDO> functionList = getValidFunctionList(thingModelMessage.getProductKey());
+        List<IotProductThingModelDO> thingModelList = getValidThingModelList(thingModelMessage.getProductKey());
-        if (functionList.isEmpty()) {
+        if (thingModelList.isEmpty()) {
             return;
         }
 
         // 3. 过滤并收集有效的属性字段，缓存设备属性
-        List<TdFieldDO> schemaFieldValues = filterAndCollectValidFields(params, functionList, device, thingModelMessage.getTime());
+        List<TdFieldDO> schemaFieldValues = filterAndCollectValidFields(params, thingModelList, device, thingModelMessage.getTime());
         if (schemaFieldValues.size() == 1) { // 仅有时间字段，无需保存
             return;
         }
@@ -90,21 +92,17 @@ public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageServ
                 .build());
     }
 
-    private List<IotProductThinkModelDO> getValidFunctionList(String productKey) {
+    private List<IotProductThingModelDO> getValidThingModelList(String productKey) {
-        return iotProductThinkModelService
+        return filterList(iotProductThingModelService.getProductThingModelListByProductKey(productKey),
-                .getProductThinkModelListByProductKey(productKey)
+                thingModel -> IotProductThingModelTypeEnum.PROPERTY.getType().equals(thingModel.getType()));
-                .stream()
-                .filter(function -> IotProductThinkModelTypeEnum.PROPERTY.getType().equals(function.getType()))
-                .toList();
     }
 
-    private List<TdFieldDO> filterAndCollectValidFields(Map<String, Object> params, List<IotProductThinkModelDO> functionList, IotDeviceDO device, Long time) {
+    private List<TdFieldDO> filterAndCollectValidFields(Map<String, Object> params, List<IotProductThingModelDO> thingModelList, IotDeviceDO device, Long time) {
         // 1. 获取属性标识符集合
-        Set<String> propertyIdentifiers = CollectionUtils.convertSet(functionList, IotProductThinkModelDO::getIdentifier);
+        Set<String> propertyIdentifiers = convertSet(thingModelList, IotProductThingModelDO::getIdentifier);
 
         // 2. 构建属性标识符和属性的映射
-        Map<String, IotProductThinkModelDO> functionMap = functionList.stream()
+        Map<String, IotProductThingModelDO> thingModelMap = convertMap(thingModelList, IotProductThingModelDO::getIdentifier);
-                .collect(Collectors.toMap(IotProductThinkModelDO::getIdentifier, function -> function));
 
         // 3. 过滤并收集有效的属性字段
         List<TdFieldDO> schemaFieldValues = new ArrayList<>();
@@ -114,7 +112,7 @@ public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageServ
                 schemaFieldValues.add(new TdFieldDO(key.toLowerCase(), val));
                 // 缓存设备属性
                 // TODO @haohao：这个缓存的写入，可以使用的时候 cache 么？被动读
-                setDeviceDataCache(device, functionMap.get(key), val, time);
+                setDeviceDataCache(device, thingModelMap.get(key), val, time);
             }
         });
         return schemaFieldValues;
@@ -124,21 +122,21 @@ public class IotThinkModelMessageServiceImpl implements IotThinkModelMessageServ
      * 缓存设备属性
      *
      * @param device                 设备信息
-     * @param iotProductThinkModelDO 物模型属性
+     * @param iotProductThingModelDO 物模型属性
      * @param val                    属性值
      * @param time                   时间
      */
-    private void setDeviceDataCache(IotDeviceDO device, IotProductThinkModelDO iotProductThinkModelDO, Object val, Long time) {
+    private void setDeviceDataCache(IotDeviceDO device, IotProductThingModelDO iotProductThingModelDO, Object val, Long time) {
         IotDeviceDataDO deviceData = IotDeviceDataDO.builder()
                 .productKey(device.getProductKey())
                 .deviceName(device.getDeviceName())
-                .identifier(iotProductThinkModelDO.getIdentifier())
+                .identifier(iotProductThingModelDO.getIdentifier())
                 .value(val != null ? val.toString() : null)
                 .updateTime(DateUtil.toLocalDateTime(new Date(time)))
                 .deviceId(device.getId())
-                .thinkModelId(iotProductThinkModelDO.getId())
+                .thingModelId(iotProductThingModelDO.getId())
-                .name(iotProductThinkModelDO.getName())
+                .name(iotProductThingModelDO.getName())
-                .dataType(iotProductThinkModelDO.getProperty().getDataType())
+                .dataType(iotProductThingModelDO.getProperty().getDataType())
                 .build();
         deviceDataRedisDAO.set(deviceData);
     }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotProductThingModelService.java

@@ -1,9 +1,9 @@
-package cn.iocoder.yudao.module.iot.service.thinkmodel;
+package cn.iocoder.yudao.module.iot.service.thingmodel;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelPageReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelSaveReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelSaveReqVO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
 import jakarta.validation.Valid;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  *
  * @author 芋道源码
  */
-public interface IotProductThinkModelService {
+public interface IotProductThingModelService {
 
     /**
      * 创建产品物模型
@@ -21,21 +21,21 @@ public interface IotProductThinkModelService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createProductThinkModel(@Valid IotProductThinkModelSaveReqVO createReqVO);
+    Long createProductThingModel(@Valid IotProductThingModelSaveReqVO createReqVO);
 
     /**
      * 更新产品物模型
      *
      * @param updateReqVO 更新信息
      */
-    void updateProductThinkModel(@Valid IotProductThinkModelSaveReqVO updateReqVO);
+    void updateProductThingModel(@Valid IotProductThingModelSaveReqVO updateReqVO);
 
     /**
      * 删除产品物模型
      *
      * @param id 编号
      */
-    void deleteProductThinkModel(Long id);
+    void deleteProductThingModel(Long id);
 
     /**
      * 获得产品物模型
@@ -43,7 +43,7 @@ public interface IotProductThinkModelService {
      * @param id 编号
      * @return 产品物模型
      */
-    IotProductThinkModelDO getProductThinkModel(Long id);
+    IotProductThingModelDO getProductThingModel(Long id);
 
     /**
      * 获得产品物模型列表
@@ -51,7 +51,7 @@ public interface IotProductThinkModelService {
      * @param productId 产品编号
      * @return 产品物模型列表
      */
-    List<IotProductThinkModelDO> getProductThinkModelListByProductId(Long productId);
+    List<IotProductThingModelDO> getProductThingModelListByProductId(Long productId);
 
     /**
      * 获得产品物模型分页
@@ -59,7 +59,7 @@ public interface IotProductThinkModelService {
      * @param pageReqVO 分页查询
      * @return 产品物模型分页
      */
-    PageResult<IotProductThinkModelDO> getProductThinkModelPage(IotProductThinkModelPageReqVO pageReqVO);
+    PageResult<IotProductThingModelDO> getProductThingModelPage(IotProductThingModelPageReqVO pageReqVO);
 
     /**
      * 创建超级表数据模型
@@ -74,6 +74,6 @@ public interface IotProductThinkModelService {
      * @param productKey 产品 Key
      * @return 产品物模型列表
      */
-    List<IotProductThinkModelDO> getProductThinkModelListByProductKey(String productKey);
+    List<IotProductThingModelDO> getProductThingModelListByProductKey(String productKey);
 
 }

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotProductThingModelServiceImpl.java

@@ -1,25 +1,25 @@
-package cn.iocoder.yudao.module.iot.service.thinkmodel;
+package cn.iocoder.yudao.module.iot.service.thingmodel;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelEvent;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelEvent;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelProperty;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelProperty;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.ThinkModelService;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.ThingModelService;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelArgument;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelArgument;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelArrayDataSpecs;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelArrayDataSpecs;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.model.dataType.ThinkModelDateOrTextDataSpecs;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.model.dataType.ThingModelDateOrTextDataSpecs;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelPageReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodel.vo.IotProductThinkModelSaveReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.thingmodel.vo.IotProductThingModelSaveReqVO;
-import cn.iocoder.yudao.module.iot.convert.thinkmodel.IotProductThinkModelConvert;
+import cn.iocoder.yudao.module.iot.convert.thingmodel.IotProductThingModelConvert;
 import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodel.IotProductThinkModelDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thingmodel.IotProductThingModelDO;
-import cn.iocoder.yudao.module.iot.dal.mysql.thinkmodel.IotProductThinkModelMapper;
+import cn.iocoder.yudao.module.iot.dal.mysql.thingmodel.IotProductThingModelMapper;
 import cn.iocoder.yudao.module.iot.enums.product.IotProductStatusEnum;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelAccessModeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelAccessModeEnum;
-import cn.iocoder.yudao.module.iot.enums.thinkmodel.IotProductThinkModelTypeEnum;
+import cn.iocoder.yudao.module.iot.enums.thingmodel.IotProductThingModelTypeEnum;
 import cn.iocoder.yudao.module.iot.service.product.IotProductService;
 import cn.iocoder.yudao.module.iot.service.tdengine.IotSuperTableService;
 import jakarta.annotation.Resource;
@@ -43,10 +43,10 @@ import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
 @Service
 @Validated
 @Slf4j
-public class IotProductThinkModelServiceImpl implements IotProductThinkModelService {
+public class IotProductThingModelServiceImpl implements IotProductThingModelService {
 
     @Resource
-    private IotProductThinkModelMapper productThinkModelMapper;
+    private IotProductThingModelMapper productThingModelMapper;
 
     @Resource
     private IotProductService productService;
@@ -55,7 +55,7 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long createProductThinkModel(IotProductThinkModelSaveReqVO createReqVO) {
+    public Long createProductThingModel(IotProductThingModelSaveReqVO createReqVO) {
         // 1. 校验功能标识符在同一产品下是否唯一
         validateIdentifierUnique(createReqVO.getProductId(), createReqVO.getIdentifier());
 
@@ -69,52 +69,49 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
         validateProductStatus(createReqVO.getProductId());
 
         // 5. 插入数据库
-        IotProductThinkModelDO function = IotProductThinkModelConvert.INSTANCE.convert(createReqVO);
+        IotProductThingModelDO thingModel = IotProductThingModelConvert.INSTANCE.convert(createReqVO);
-        productThinkModelMapper.insert(function);
+        productThingModelMapper.insert(thingModel);
 
         // 6. 如果创建的是属性，需要更新默认的事件和服务
-        if (Objects.equals(createReqVO.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
+        if (Objects.equals(createReqVO.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
             createDefaultEventsAndServices(createReqVO.getProductId(), createReqVO.getProductKey());
         }
-        return function.getId();
+        return thingModel.getId();
     }
 
     private void validateProductStatus(Long createReqVO) {
         IotProductDO product = productService.getProduct(createReqVO);
         if (Objects.equals(product.getStatus(), IotProductStatusEnum.PUBLISHED.getStatus())) {
-            throw exception(PRODUCT_STATUS_NOT_ALLOW_FUNCTION);
+            throw exception(PRODUCT_STATUS_NOT_ALLOW_THING_MODEL);
         }
     }
 
     private void validateNotDefaultEventAndService(String identifier) {
         // set, get, post, property, event, time, value 是系统保留字段，不能用于标识符定义
         if (CollUtil.containsAny(Arrays.asList("set", "get", "post", "property", "event", "time", "value"), Collections.singletonList(identifier))) {
-            throw exception(THINK_MODEL_FUNCTION_IDENTIFIER_INVALID);
+            throw exception(THING_MODEL_IDENTIFIER_INVALID);
         }
-//        if (CollUtil.containsAny(Arrays.asList("post", "set", "get"), identifier)) {
-//            throw exception(THINK_MODEL_FUNCTION_IDENTIFIER_INVALID);
-//        }
     }
 
     private void validateNameUnique(Long productId, String name) {
-        IotProductThinkModelDO function = productThinkModelMapper.selectByProductIdAndName(productId, name);
+        IotProductThingModelDO thingModel = productThingModelMapper.selectByProductIdAndName(productId, name);
-        if (function != null) {
+        if (thingModel != null) {
-            throw exception(THINK_MODEL_FUNCTION_NAME_EXISTS);
+            throw exception(THING_MODEL_NAME_EXISTS);
         }
     }
 
     private void validateIdentifierUnique(Long productId, String identifier) {
-        IotProductThinkModelDO function = productThinkModelMapper.selectByProductIdAndIdentifier(productId, identifier);
+        IotProductThingModelDO thingModel = productThingModelMapper.selectByProductIdAndIdentifier(productId, identifier);
-        if (function != null) {
+        if (thingModel != null) {
-            throw exception(THINK_MODEL_FUNCTION_IDENTIFIER_EXISTS);
+            throw exception(THING_MODEL_IDENTIFIER_EXISTS);
         }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateProductThinkModel(IotProductThinkModelSaveReqVO updateReqVO) {
+    public void updateProductThingModel(IotProductThingModelSaveReqVO updateReqVO) {
         // 1. 校验功能是否存在
-        validateProductThinkModelMapperExists(updateReqVO.getId());
+        validateProductThingModelMapperExists(updateReqVO.getId());
 
         // 2. 校验功能标识符是否唯一
         validateIdentifierUniqueForUpdate(updateReqVO.getId(), updateReqVO.getProductId(), updateReqVO.getIdentifier());
@@ -123,40 +120,40 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
         validateProductStatus(updateReqVO.getProductId());
 
         // 4. 更新数据库
-        IotProductThinkModelDO productThinkModelDO = IotProductThinkModelConvert.INSTANCE.convert(updateReqVO);
+        IotProductThingModelDO thingModel = IotProductThingModelConvert.INSTANCE.convert(updateReqVO);
-        productThinkModelMapper.updateById(productThinkModelDO);
+        productThingModelMapper.updateById(thingModel);
 
         // 5. 如果更新的是属性，需要更新默认的事件和服务
-        if (Objects.equals(updateReqVO.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
+        if (Objects.equals(updateReqVO.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
             createDefaultEventsAndServices(updateReqVO.getProductId(), updateReqVO.getProductKey());
         }
     }
 
     private void validateIdentifierUniqueForUpdate(Long id, Long productId, String identifier) {
-        IotProductThinkModelDO function = productThinkModelMapper.selectByProductIdAndIdentifier(productId, identifier);
+        IotProductThingModelDO thingModel = productThingModelMapper.selectByProductIdAndIdentifier(productId, identifier);
-        if (function != null && ObjectUtil.notEqual(function.getId(), id)) {
+        if (thingModel != null && ObjectUtil.notEqual(thingModel.getId(), id)) {
-            throw exception(THINK_MODEL_FUNCTION_IDENTIFIER_EXISTS);
+            throw exception(THING_MODEL_IDENTIFIER_EXISTS);
         }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteProductThinkModel(Long id) {
+    public void deleteProductThingModel(Long id) {
         // 1. 校验功能是否存在
-        IotProductThinkModelDO functionDO = productThinkModelMapper.selectById(id);
+        IotProductThingModelDO thingModel = productThingModelMapper.selectById(id);
-        if (functionDO == null) {
+        if (thingModel == null) {
-            throw exception(THINK_MODEL_FUNCTION_NOT_EXISTS);
+            throw exception(THING_MODEL_NOT_EXISTS);
         }
 
         // 3. 校验产品状态，发布状态下，不允许操作功能
-        validateProductStatus(functionDO.getProductId());
+        validateProductStatus(thingModel.getProductId());
 
         // 2. 删除功能
-        productThinkModelMapper.deleteById(id);
+        productThingModelMapper.deleteById(id);
 
         // 3. 如果删除的是属性，需要更新默认的事件和服务
-        if (Objects.equals(functionDO.getType(), IotProductThinkModelTypeEnum.PROPERTY.getType())) {
+        if (Objects.equals(thingModel.getType(), IotProductThingModelTypeEnum.PROPERTY.getType())) {
-            createDefaultEventsAndServices(functionDO.getProductId(), functionDO.getProductKey());
+            createDefaultEventsAndServices(thingModel.getProductId(), thingModel.getProductKey());
         }
     }
 
@@ -165,25 +162,25 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
      *
      * @param id 功能编号
      */
-    private void validateProductThinkModelMapperExists(Long id) {
+    private void validateProductThingModelMapperExists(Long id) {
-        if (productThinkModelMapper.selectById(id) == null) {
+        if (productThingModelMapper.selectById(id) == null) {
-            throw exception(THINK_MODEL_FUNCTION_NOT_EXISTS);
+            throw exception(THING_MODEL_NOT_EXISTS);
         }
     }
 
     @Override
-    public IotProductThinkModelDO getProductThinkModel(Long id) {
+    public IotProductThingModelDO getProductThingModel(Long id) {
-        return productThinkModelMapper.selectById(id);
+        return productThingModelMapper.selectById(id);
     }
 
     @Override
-    public List<IotProductThinkModelDO> getProductThinkModelListByProductId(Long productId) {
+    public List<IotProductThingModelDO> getProductThingModelListByProductId(Long productId) {
-        return productThinkModelMapper.selectListByProductId(productId);
+        return productThingModelMapper.selectListByProductId(productId);
     }
 
     @Override
-    public PageResult<IotProductThinkModelDO> getProductThinkModelPage(IotProductThinkModelPageReqVO pageReqVO) {
+    public PageResult<IotProductThingModelDO> getProductThingModelPage(IotProductThingModelPageReqVO pageReqVO) {
-        return productThinkModelMapper.selectPage(pageReqVO);
+        return productThingModelMapper.selectPage(pageReqVO);
     }
 
     @Override
@@ -192,15 +189,15 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
         IotProductDO product = productService.getProduct(productId);
 
         // 2. 查询产品的物模型功能列表
-        List<IotProductThinkModelDO> functionList = productThinkModelMapper.selectListByProductId(productId);
+        List<IotProductThingModelDO> thingModelList = productThingModelMapper.selectListByProductId(productId);
 
         // 3. 生成 TDengine 的数据模型
-        dbStructureDataService.createSuperTableDataModel(product, functionList);
+        dbStructureDataService.createSuperTableDataModel(product, thingModelList);
     }
 
     @Override
-    public List<IotProductThinkModelDO> getProductThinkModelListByProductKey(String productKey) {
+    public List<IotProductThingModelDO> getProductThingModelListByProductKey(String productKey) {
-        return productThinkModelMapper.selectListByProductKey(productKey);
+        return productThingModelMapper.selectListByProductKey(productKey);
     }
 
     /**
@@ -208,124 +205,124 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
      */
     public void createDefaultEventsAndServices(Long productId, String productKey) {
         // 1. 获取当前属性列表
-        List<IotProductThinkModelDO> propertyList = productThinkModelMapper
+        List<IotProductThingModelDO> propertyList = productThingModelMapper
-                .selectListByProductIdAndType(productId, IotProductThinkModelTypeEnum.PROPERTY.getType());
+                .selectListByProductIdAndType(productId, IotProductThingModelTypeEnum.PROPERTY.getType());
 
         // 2. 生成新的事件和服务列表
-        List<IotProductThinkModelDO> newFunctionList = new ArrayList<>();
+        List<IotProductThingModelDO> newThingModelList = new ArrayList<>();
         // 生成属性上报事件
-        ThinkModelEvent propertyPostEvent = generatePropertyPostEvent(propertyList);
+        ThingModelEvent propertyPostEvent = generatePropertyPostEvent(propertyList);
         if (propertyPostEvent != null) {
-            IotProductThinkModelDO eventFunction = buildEventFunctionDO(productId, productKey, propertyPostEvent);
+            IotProductThingModelDO eventThingModel = buildEventThingModelDO(productId, productKey, propertyPostEvent);
-            newFunctionList.add(eventFunction);
+            newThingModelList.add(eventThingModel);
         }
         // 生成属性设置服务
-        ThinkModelService propertySetService = generatePropertySetService(propertyList);
+        ThingModelService propertySetService = generatePropertySetService(propertyList);
         if (propertySetService != null) {
-            IotProductThinkModelDO setServiceFunction = buildServiceFunctionDO(productId, productKey, propertySetService);
+            IotProductThingModelDO setServiceThingModel = buildServiceThingModelDO(productId, productKey, propertySetService);
-            newFunctionList.add(setServiceFunction);
+            newThingModelList.add(setServiceThingModel);
         }
         // 生成属性获取服务
-        ThinkModelService propertyGetService = generatePropertyGetService(propertyList);
+        ThingModelService propertyGetService = generatePropertyGetService(propertyList);
         if (propertyGetService != null) {
-            IotProductThinkModelDO getServiceFunction = buildServiceFunctionDO(productId, productKey, propertyGetService);
+            IotProductThingModelDO getServiceThingModel = buildServiceThingModelDO(productId, productKey, propertyGetService);
-            newFunctionList.add(getServiceFunction);
+            newThingModelList.add(getServiceThingModel);
         }
 
         // 3. 获取数据库中的默认的旧事件和服务列表
-        List<IotProductThinkModelDO> oldFunctionList = productThinkModelMapper.selectListByProductIdAndIdentifiersAndTypes(
+        List<IotProductThingModelDO> oldThingModelList = productThingModelMapper.selectListByProductIdAndIdentifiersAndTypes(
                 productId,
                 Arrays.asList("post", "set", "get"),
-                Arrays.asList(IotProductThinkModelTypeEnum.EVENT.getType(), IotProductThinkModelTypeEnum.SERVICE.getType())
+                Arrays.asList(IotProductThingModelTypeEnum.EVENT.getType(), IotProductThingModelTypeEnum.SERVICE.getType())
         );
 
         // 3.1 使用 diffList 方法比较新旧列表
-        List<List<IotProductThinkModelDO>> diffResult = diffList(oldFunctionList, newFunctionList,
+        List<List<IotProductThingModelDO>> diffResult = diffList(oldThingModelList, newThingModelList,
                 // 继续使用 identifier 和 type 进行比较：这样可以准确地匹配对应的功能对象。
                 (oldFunc, newFunc) -> Objects.equals(oldFunc.getIdentifier(), newFunc.getIdentifier())
                         && Objects.equals(oldFunc.getType(), newFunc.getType()));
-        List<IotProductThinkModelDO> createList = diffResult.get(0); // 需要新增的
+        List<IotProductThingModelDO> createList = diffResult.get(0); // 需要新增的
-        List<IotProductThinkModelDO> updateList = diffResult.get(1); // 需要更新的
+        List<IotProductThingModelDO> updateList = diffResult.get(1); // 需要更新的
-        List<IotProductThinkModelDO> deleteList = diffResult.get(2); // 需要删除的
+        List<IotProductThingModelDO> deleteList = diffResult.get(2); // 需要删除的
 
         // 3.2 批量执行数据库操作
         // 新增数据库中的新事件和服务列表
         if (CollUtil.isNotEmpty(createList)) {
-            productThinkModelMapper.insertBatch(createList);
+            productThingModelMapper.insertBatch(createList);
         }
         // 更新数据库中的事件和服务列表
         if (CollUtil.isNotEmpty(updateList)) {
             // 首先，为每个需要更新的对象设置其对应的 ID
             updateList.forEach(updateFunc -> {
-                IotProductThinkModelDO oldFunc = findFunctionByIdentifierAndType(
+                IotProductThingModelDO oldFunc = findThingModelByIdentifierAndType(
-                        oldFunctionList, updateFunc.getIdentifier(), updateFunc.getType());
+                        oldThingModelList, updateFunc.getIdentifier(), updateFunc.getType());
                 if (oldFunc != null) {
                     updateFunc.setId(oldFunc.getId());
                 }
             });
             // 过滤掉没有设置 ID 的对象
-            List<IotProductThinkModelDO> validUpdateList = updateList.stream()
+            List<IotProductThingModelDO> validUpdateList = updateList.stream()
                     .filter(func -> func.getId() != null)
                     .collect(Collectors.toList());
             // 执行批量更新
             if (CollUtil.isNotEmpty(validUpdateList)) {
-                productThinkModelMapper.updateBatch(validUpdateList);
+                productThingModelMapper.updateBatch(validUpdateList);
             }
         }
 
         // 删除数据库中的旧事件和服务列表
         if (CollUtil.isNotEmpty(deleteList)) {
-            Set<Long> idsToDelete = CollectionUtils.convertSet(deleteList, IotProductThinkModelDO::getId);
+            Set<Long> idsToDelete = CollectionUtils.convertSet(deleteList, IotProductThingModelDO::getId);
-            productThinkModelMapper.deleteByIds(idsToDelete);
+            productThingModelMapper.deleteByIds(idsToDelete);
         }
     }
 
     /**
      * 根据标识符和类型查找功能对象
      */
-    private IotProductThinkModelDO findFunctionByIdentifierAndType(List<IotProductThinkModelDO> functionList,
+    private IotProductThingModelDO findThingModelByIdentifierAndType(List<IotProductThingModelDO> thingModelList,
                                                                      String identifier, Integer type) {
-        return CollUtil.findOne(functionList, func ->
+        return CollUtil.findOne(thingModelList, func ->
                 Objects.equals(func.getIdentifier(), identifier) && Objects.equals(func.getType(), type));
     }
 
     /**
      * 构建事件功能对象
      */
-    private IotProductThinkModelDO buildEventFunctionDO(Long productId, String productKey, ThinkModelEvent event) {
+    private IotProductThingModelDO buildEventThingModelDO(Long productId, String productKey, ThingModelEvent event) {
-        return new IotProductThinkModelDO()
+        return new IotProductThingModelDO()
                 .setProductId(productId)
                 .setProductKey(productKey)
                 .setIdentifier(event.getIdentifier())
                 .setName(event.getName())
                 .setDescription(event.getDescription())
-                .setType(IotProductThinkModelTypeEnum.EVENT.getType())
+                .setType(IotProductThingModelTypeEnum.EVENT.getType())
                 .setEvent(event);
     }
 
     /**
      * 构建服务功能对象
      */
-    private IotProductThinkModelDO buildServiceFunctionDO(Long productId, String productKey, ThinkModelService service) {
+    private IotProductThingModelDO buildServiceThingModelDO(Long productId, String productKey, ThingModelService service) {
-        return new IotProductThinkModelDO()
+        return new IotProductThingModelDO()
                 .setProductId(productId)
                 .setProductKey(productKey)
                 .setIdentifier(service.getIdentifier())
                 .setName(service.getName())
                 .setDescription(service.getDescription())
-                .setType(IotProductThinkModelTypeEnum.SERVICE.getType())
+                .setType(IotProductThingModelTypeEnum.SERVICE.getType())
                 .setService(service);
     }
 
     /**
      * 生成属性上报事件
      */
-    private ThinkModelEvent generatePropertyPostEvent(List<IotProductThinkModelDO> propertyList) {
+    private ThingModelEvent generatePropertyPostEvent(List<IotProductThingModelDO> propertyList) {
         if (CollUtil.isEmpty(propertyList)) {
             return null;
         }
 
-        ThinkModelEvent event = new ThinkModelEvent()
+        ThingModelEvent event = new ThingModelEvent()
                 .setIdentifier("post")
                 .setName("属性上报")
                 .setType("info")
@@ -333,13 +330,13 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
                 .setMethod("thing.event.property.post");
 
         // 将属性列表转换为事件的输出参数
-        List<ThinkModelArgument> outputData = new ArrayList<>();
+        List<ThingModelArgument> outputData = new ArrayList<>();
-        for (IotProductThinkModelDO thinkModel : propertyList) {
+        for (IotProductThingModelDO thingModel : propertyList) {
-            ThinkModelArgument arg = new ThinkModelArgument()
+            ThingModelArgument arg = new ThingModelArgument()
-                    .setIdentifier(thinkModel.getIdentifier())
+                    .setIdentifier(thingModel.getIdentifier())
-                    .setName(thinkModel.getName())
+                    .setName(thingModel.getName())
-                    .setProperty(thinkModel.getProperty())
+                    .setProperty(thingModel.getProperty())
-                    .setDescription(thinkModel.getDescription())
+                    .setDescription(thingModel.getDescription())
                     .setDirection("output"); // 设置为输出参数
             outputData.add(arg);
         }
@@ -350,16 +347,16 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
     /**
      * 生成属性设置服务
      */
-    private ThinkModelService generatePropertySetService(List<IotProductThinkModelDO> propertyList) {
+    private ThingModelService generatePropertySetService(List<IotProductThingModelDO> propertyList) {
         if (propertyList == null || propertyList.isEmpty()) {
             return null;
         }
 
-        List<ThinkModelArgument> inputData = new ArrayList<>();
+        List<ThingModelArgument> inputData = new ArrayList<>();
-        for (IotProductThinkModelDO thinkModel : propertyList) {
+        for (IotProductThingModelDO thingModel : propertyList) {
-            ThinkModelProperty property = thinkModel.getProperty();
+            ThingModelProperty property = thingModel.getProperty();
-            if (IotProductThinkModelAccessModeEnum.READ_WRITE.getMode().equals(property.getAccessMode())) {
+            if (IotProductThingModelAccessModeEnum.READ_WRITE.getMode().equals(property.getAccessMode())) {
-                ThinkModelArgument arg = new ThinkModelArgument()
+                ThingModelArgument arg = new ThingModelArgument()
                         .setIdentifier(property.getIdentifier())
                         .setName(property.getName())
                         .setProperty(property)
@@ -374,7 +371,7 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
         }
 
         // 属性设置服务一般不需要输出参数
-        return new ThinkModelService()
+        return new ThingModelService()
                 .setIdentifier("set")
                 .setName("属性设置")
                 .setCallType("async")
@@ -388,17 +385,17 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
     /**
      * 生成属性获取服务
      */
-    private ThinkModelService generatePropertyGetService(List<IotProductThinkModelDO> propertyList) {
+    private ThingModelService generatePropertyGetService(List<IotProductThingModelDO> propertyList) {
         if (propertyList == null || propertyList.isEmpty()) {
             return null;
         }
 
-        List<ThinkModelArgument> outputData = new ArrayList<>();
+        List<ThingModelArgument> outputData = new ArrayList<>();
-        for (IotProductThinkModelDO functionDO : propertyList) {
+        for (IotProductThingModelDO thingModelDO : propertyList) {
-            ThinkModelProperty property = functionDO.getProperty();
+            ThingModelProperty property = thingModelDO.getProperty();
             if (ObjectUtils.equalsAny(property.getAccessMode(),
-                    IotProductThinkModelAccessModeEnum.READ_ONLY.getMode(), IotProductThinkModelAccessModeEnum.READ_WRITE.getMode())) {
+                    IotProductThingModelAccessModeEnum.READ_ONLY.getMode(), IotProductThingModelAccessModeEnum.READ_WRITE.getMode())) {
-                ThinkModelArgument arg = new ThinkModelArgument()
+                ThingModelArgument arg = new ThingModelArgument()
                         .setIdentifier(property.getIdentifier())
                         .setName(property.getName())
                         .setProperty(property)
@@ -412,7 +409,7 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
             return null;
         }
 
-        ThinkModelService service = new ThinkModelService()
+        ThingModelService service = new ThingModelService()
                 .setIdentifier("get")
                 .setName("属性获取")
                 .setCallType("async")
@@ -420,21 +417,21 @@ public class IotProductThinkModelServiceImpl implements IotProductThinkModelServ
                 .setMethod("thing.service.property.get");
 
         // 定义输入参数：属性标识符列表
-        ThinkModelArgument inputArg = new ThinkModelArgument()
+        ThingModelArgument inputArg = new ThingModelArgument()
                 .setIdentifier("properties")
                 .setName("属性标识符列表")
                 .setDescription("需要获取的属性标识符列表")
                 .setDirection("input"); // 设置为输入参数
 
         // 创建数组类型，元素类型为文本类型（字符串）TODO @puhui999: 还得研究研究
-        ThinkModelArrayDataSpecs arrayType = new ThinkModelArrayDataSpecs();
+        ThingModelArrayDataSpecs arrayType = new ThingModelArrayDataSpecs();
         arrayType.setDataType("array");
-        inputArg.setProperty(new ThinkModelProperty().setIdentifier(inputArg.getIdentifier()).setName(inputArg.getName())
+        inputArg.setProperty(new ThingModelProperty().setIdentifier(inputArg.getIdentifier()).setName(inputArg.getName())
                 .setDescription(inputArg.getDescription()).setDataSpecs(arrayType));
 
-        ThinkModelDateOrTextDataSpecs textType = new ThinkModelDateOrTextDataSpecs();
+        ThingModelDateOrTextDataSpecs textType = new ThingModelDateOrTextDataSpecs();
         textType.setDataType("text");
-        inputArg.setProperty(new ThinkModelProperty().setIdentifier(inputArg.getIdentifier()).setName(inputArg.getName())
+        inputArg.setProperty(new ThingModelProperty().setIdentifier(inputArg.getIdentifier()).setName(inputArg.getName())
                 .setDescription(inputArg.getDescription()).setDataSpecs(textType));
 
         service.setInputData(Collections.singletonList(inputArg));