设备资料库调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotDeviceServiceImpl.java

@@ -84,16 +84,19 @@ public class IotDeviceServiceImpl implements IotDeviceService {
             iotTreeMapper.insert(iotTreeDO);
         }
         //维护品牌
-        List<IotModelDO> iotModelDOS = iotModelMapper.selectByMap(ImmutableMap.of("brand", createReqVO.getBrand(), "name", createReqVO.getModel()));
-        if (CollUtil.isEmpty(iotModelDOS)) {
-            IotModelDO iotModelDO = new IotModelDO();
-            iotModelDO.setBrand(createReqVO.getBrand());
-            DictDataDO dictData = dictDataService.getDictData(createReqVO.getBrand());
-            iotModelDO.setBrandName(Objects.nonNull(dictData)?dictData.getLabel():"");
-            iotModelDO.setName(createReqVO.getModel());
-            iotModelDO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-            iotModelMapper.insert(iotModelDO);
+        if(Objects.nonNull(createReqVO.getModel())) {
+            List<IotModelDO> iotModelDOS = iotModelMapper.selectByMap(ImmutableMap.of("brand", createReqVO.getBrand(), "name", createReqVO.getModel()));
+            if (CollUtil.isEmpty(iotModelDOS)) {
+                IotModelDO iotModelDO = new IotModelDO();
+                iotModelDO.setBrand(createReqVO.getBrand());
+                DictDataDO dictData = dictDataService.getDictData(createReqVO.getBrand());
+                iotModelDO.setBrandName(Objects.nonNull(dictData)?dictData.getLabel():"");
+                iotModelDO.setName(createReqVO.getModel());
+                iotModelDO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+                iotModelMapper.insert(iotModelDO);
+            }
         }
+
         // 返回
         return iotDevice.getId();
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotInfoClassifyServiceImpl.java

@@ -72,10 +72,13 @@ public class IotInfoClassifyServiceImpl implements IotInfoClassifyService {
         iotTreeDO.setName(infoClassifyDO.getName());
         iotTreeDO.setDeptId(infoClassifyDO.getDeptId());
         List<IotTreeDO> iotTreeDOS = iotTreeMapper.selectListByOriginId(infoClassifyDO.getDeviceId(),"device");
-        if (CollUtil.isNotEmpty(iotTreeDOS)) {
+        List<IotTreeDO> iotTreeDOSs = iotTreeMapper.selectListByOriginId(infoClassifyDO.getParentId(),"file");
+        if (CollUtil.isEmpty(iotTreeDOSs)) {
             iotTreeDO.setParentId(Objects.nonNull(iotTreeDOS.get(0)) ? iotTreeDOS.get(0).getId() : 0);
-            iotTreeMapper.insert(iotTreeDO);
+        } else {
+            iotTreeDO.setParentId(iotTreeDOSs.get(0).getId());
         }
+        iotTreeMapper.insert(iotTreeDO);
         return infoClassifyDO.getId();
     }