修改：IOT 物模型接口接口优化

安浩浩
1 parent edc6a8ad
Showing 2 changed files with 6 additions and 4 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thinkmodelfunction/IotThinkModelFunctionMapper.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
@@ -29,9 +29,10 @@ public interface IotThinkModelFunctionMapper extends BaseMapperX&lt;IotThinkModelFu
                 IotThinkModelFunctionDO::getType, type);
     }
  
-    default List<IotThinkModelFunctionDO> selectListByProductIdAndTypes(Long productId, List<Integer> list) {
+    default List<IotThinkModelFunctionDO> selectListByProductIdAndIdentifiersAndTypes(Long productId, List<String> list, List<Integer> list1){
         return selectList(new LambdaQueryWrapperX<IotThinkModelFunctionDO>()
                 .eq(IotThinkModelFunctionDO::getProductId, productId)
-                .in(IotThinkModelFunctionDO::getType, list));
+                .in(IotThinkModelFunctionDO::getIdentifier, list)
+                .in(IotThinkModelFunctionDO::getType, list1));
     }
 }
 \ No newline at end of file
@@ -175,9 +175,10 @@ public class IotThinkModelFunctionServiceImpl implements IotThinkModelFunctionSe
             newFunctionList.add(getServiceFunction);
         }
  
-        // 2. 获取数据库中的旧事件和服务列表
-        List<IotThinkModelFunctionDO> oldFunctionList = thinkModelFunctionMapper.selectListByProductIdAndTypes(
+        // 2. 获取数据库中的默认的旧事件和服务列表
+        List<IotThinkModelFunctionDO> oldFunctionList = thinkModelFunctionMapper.selectListByProductIdAndIdentifiersAndTypes(
                 productId,
+                Arrays.asList("post", "set", "get"),
                 Arrays.asList(IotThingModelTypeEnum.EVENT.getType(), IotThingModelTypeEnum.SERVICE.getType())
         );