编码分类处理

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotTreeController.java

@@ -161,4 +161,10 @@ public class IotTreeController {
         }
         return success(iotDeviceTree.get(0).getId());
     }
+
+    @GetMapping("/init/code")
+    @PermitAll
+    public void initTreeCode() {
+        iotTreeService.initTreeCode();
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

@@ -30,6 +30,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
     default PageResult<IotDeviceDO> selectPage(IotDevicePageReqVO reqVO, Collection<Long> deptIds, SortablePageParam sortablePageParam) {
 //        return selectPage(reqVO, new LambdaQueryWrapperX<IotDeviceDO>()
         return selectPage(sortablePageParam, new LambdaQueryWrapperX<IotDeviceDO>()
+                .likeIfPresent(IotDeviceDO::getYfDeviceCode, reqVO.getYfDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
                 .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(IotDeviceDO::getBrand, reqVO.getBrand())

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

@@ -59,6 +59,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.xingyuv.captcha.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -320,7 +321,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         IotTreeDO iotTreeDO = new IotTreeDO();
         iotTreeDO.setType("device");
         iotTreeDO.setOriginId(iotDevice.getId());
-        iotTreeDO.setName(iotDevice.getDeviceName());
+        iotTreeDO.setName(StringUtils.isNotBlank(iotDevice.getYfDeviceCode())?iotDevice.getYfDeviceCode():iotDevice.getDeviceCode()+iotDevice.getDeviceName());
         iotTreeDO.setDeptId(iotDevice.getDeptId());
         List<IotTreeDO> iotTreeDOS = iotTreeMapper.selectListByOriginId(iotDevice.getDeptId(),"dept");
         if (CollUtil.isNotEmpty(iotTreeDOS)) {
@@ -365,7 +366,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
             throw new ServiceException(ErrorCodeConstants.DEPT_NOT_FOUND.getCode(),"无资料库信息");
         }
         IotTreeDO iotTreeDO = iotTreeDOS.get(0);
-        iotTreeDO.setName(updateObj.getDeviceName());
+        iotTreeDO.setName(StringUtils.isNotBlank(updateObj.getYfDeviceCode())?updateObj.getYfDeviceCode():updateObj.getDeviceCode() +updateObj.getDeviceName());
         iotTreeDO.setDeptId(updateObj.getDeptId());
         iotTreeMapper.updateById(iotTreeDO);
     }

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

@@ -21,6 +21,7 @@ import java.util.List;
  * @author 芋道源码
  */
 public interface IotTreeService {
+    void initTreeCode();
     List<IotTreeDO> getIotDeviceTree(Long deviceId);
     List<IotTreeDO> getIotTreeList(IotTreeListReqVO reqVO);
     void addDeptDeal(DeptDO deptDO);

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

@@ -55,6 +55,19 @@ public class IotTreeServiceImpl implements IotTreeService {
     @Autowired
     private IotInfoMapper iotInfoMapper;
 
+    @Override
+    public void initTreeCode() {
+        List<IotTreeDO> iotTreeDOS = iotTreeMapper.selectList();
+        List<IotTreeDO> devices = iotTreeDOS.stream().filter(e -> "device".equals(e.getType())).collect(Collectors.toList());
+        devices.forEach(device -> {
+            Long deviceOriginId = device.getOriginId();
+            IotDeviceDO iotDevice = iotDeviceService.getIotDevice(deviceOriginId);
+            device.setDeviceCode(iotDevice.getDeviceCode());
+            device.setName(device.getDeviceCode()+iotDevice.getDeviceName());
+            iotTreeMapper.updateById(device);
+        });
+    }
+
     @Override
     public List<IotTreeDO> getIotDeviceTree(Long deviceId) {
         IotTreeListReqVO reqVO = new IotTreeListReqVO();