设备资料库与设备台账详情文件上传调整

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

@@ -76,8 +76,8 @@ public class IotInfoController {
     @Operation(summary = "获得资料分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-info:query')")
     public CommonResult<PageResult<IotInfoRespVO>> getIotInfoPage(@Valid IotInfoPageReqVO pageReqVO) {
-        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
-        pageReqVO.setCreator(String.valueOf(loginUserId));
+//        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+//        pageReqVO.setCreator(String.valueOf(loginUserId));
         PageResult<IotInfoDO> pageResult = iotInfoService.getIotInfoPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, IotInfoRespVO.class));
     }
@@ -86,8 +86,8 @@ public class IotInfoController {
     @Operation(summary = "获得资料分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-info:query')")
     public CommonResult<PageResult<IotInfoRespVO>> getIotInfoFilePage(@Valid IotInfoPageReqVO pageReqVO) {
-        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
-        pageReqVO.setCreator(String.valueOf(loginUserId));
+//        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+//        pageReqVO.setCreator(String.valueOf(loginUserId));
         PageResult<IotInfoDO> pageResult = iotInfoService.getIotInfoFilePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, IotInfoRespVO.class));
     }

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

@@ -44,4 +44,6 @@ public class IotInfoSaveReqVO {
 
     @Schema(description = "文件列表")
     private List<Map<String, String>> fileList;
+
+    private String type;
 }

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

@@ -25,7 +25,8 @@ public interface IotTreeMapper extends BaseMapperX<IotTreeDO> {
     default List<IotTreeDO> selectList(IotTreeListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IotTreeDO>()
                 .likeIfPresent(IotTreeDO::getName, reqVO.getName())
-
+                .eqIfPresent(IotTreeDO::getOriginId, reqVO.getOriginId())
+                .eqIfPresent(IotTreeDO::getType, reqVO.getType())
                 .eqIfPresent(IotTreeDO::getStatus, reqVO.getStatus()));
     }
     default PageResult<IotTreeDO> selectPage(IotTreePageReqVO reqVO) {

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

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotInfoClassifyListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotInfoPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotInfoSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.vo.IotTreeListReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotInfoClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotInfoDO;
@@ -63,6 +64,20 @@ public class IotInfoServiceImpl implements IotInfoService {
             double mb = size / (1024.0 * 1024.0);
             iotInfo.setFileSize(String.format("%.2f MB", mb));
             iotInfo.setDeleted(false);
+            if ("book".equals(createReqVO.getType())) {
+                IotInfoClassifyDO classify = iotInfoClassifyService.getIotInfoClassify(classId);
+                //如果是设备的话
+                IotTreeListReqVO reqVO = new IotTreeListReqVO();
+                if (classify.getParentId()==0) {
+                    reqVO.setType("device").setOriginId(classId);
+                } else {
+                    reqVO.setType("file").setOriginId(classId);
+                }
+                List<IotTreeDO> iotTreeList = iotTreeService.getIotTreeList(reqVO);
+                if (CollUtil.isNotEmpty(iotTreeList)) {
+                    iotInfo.setClassId(iotTreeList.get(0).getId());
+                }
+            }
             return iotInfo;
         }).collect(Collectors.toList());
 
@@ -106,6 +121,18 @@ public class IotInfoServiceImpl implements IotInfoService {
 
     @Override
     public PageResult<IotInfoDO> getIotInfoPage(IotInfoPageReqVO pageReqVO) {
+        IotInfoClassifyDO classify = iotInfoClassifyService.getIotInfoClassify(pageReqVO.getClassId());
+        //如果是设备的话
+        IotTreeListReqVO reqVO = new IotTreeListReqVO();
+        if (classify.getParentId()==0) {
+            reqVO.setType("device").setOriginId(classify.getDeviceId());
+        } else {
+            reqVO.setType("file").setOriginId(pageReqVO.getClassId());
+        }
+        List<IotTreeDO> iotTreeList = iotTreeService.getIotTreeList(reqVO);
+        if (CollUtil.isNotEmpty(iotTreeList)) {
+            pageReqVO.setClassId(iotTreeList.get(0).getId());
+        }
         return iotInfoMapper.selectPage(pageReqVO, getInfoCondition(pageReqVO.getClassId()));
     }
 
@@ -122,17 +149,18 @@ public class IotInfoServiceImpl implements IotInfoService {
         if (Objects.isNull(iotTree)) {
             throw exception(IOT_INFO_NOT_EXISTS);
         }
-        Set<Long> fileIds = convertSet(iotTreeService.getChildTreeList(classId), IotTreeDO::getOriginId);
+        Set<Long> fileIds = convertSet(iotTreeService.getChildTreeList(classId), IotTreeDO::getId);
         //如果是设备的话
         if ("device".equals(iotTree.getType())) {
-            IotInfoClassifyListReqVO iotInfoClassifyListReqVO = new IotInfoClassifyListReqVO();
-            IotInfoClassifyListReqVO classifyListReqVO = iotInfoClassifyListReqVO.setDeviceId(iotTree.getOriginId());
-            List<IotInfoClassifyDO> iotInfoClassifyList = iotInfoClassifyService.getIotInfoClassifyList(classifyListReqVO);
-            if (CollUtil.isNotEmpty(iotInfoClassifyList)) {
-                fileIds.add(iotInfoClassifyList.get(0).getId());
-            }
+//            IotInfoClassifyListReqVO iotInfoClassifyListReqVO = new IotInfoClassifyListReqVO();
+//            IotInfoClassifyListReqVO classifyListReqVO = iotInfoClassifyListReqVO.setDeviceId(iotTree.getOriginId());
+//            List<IotInfoClassifyDO> iotInfoClassifyList = iotInfoClassifyService.getIotInfoClassifyList(classifyListReqVO);
+//            if (CollUtil.isNotEmpty(iotInfoClassifyList)) {
+//                fileIds.add(iotInfoClassifyList.get(0).getId());
+//            }
+            fileIds.add(iotTree.getId());
         } else {
-            fileIds.add(iotTree.getOriginId()); // 包括自身
+            fileIds.add(iotTree.getId()); // 包括自身
         }
 
         return fileIds;