feat:收藏页点击文件夹显示文件信息

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java

@@ -49,6 +49,8 @@ public class FileInfoVO {
 
     private List<FileTagInfo> labels;
 
+    private String dataOwn;
+
     // 是否是收藏数据，1是，0否
     private Integer isFavorite;
 

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java

@@ -16,6 +16,7 @@ import cn.hutool.crypto.symmetric.AES;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -159,7 +160,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         records.forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setIsPersonal(dataOwnCode == DataOwnEnum.USER_FILE.code ? 1 : 0);
             e.setLabels(fileTagRelationService.getFileTags(e.getId()));
         });
         UserThreadLocal.setSuccessInfo("", "", "查询文件成功");
@@ -1440,10 +1440,22 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public IPage<FileInfoVO> findFavorite(String userId, FileInfoQueryDTO fileInfoQueryDTO) {
-        // 查询该用户收藏的文件id
-        LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(EdFileFavorite::getFileId).eq(EdFileFavorite::getUserId, userId);
-        List<String> fileIds = fileFavoriteService.listObjs(queryWrapper, Object::toString);
+
+        List<String> fileIds;
+
+        // 查询收藏文件夹下的文件
+        String parentId = fileInfoQueryDTO.getParentId();
+        if (StringUtils.isNotBlank(parentId)) {
+            LambdaQueryWrapper<EdFileInfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(EdFileInfo::getParentId, parentId)
+                        .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code)
+                        .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
+            fileIds = this.baseMapper.selectList(queryWrapper).stream().map(EdFileInfo::getFileId).collect(Collectors.toList());
+        } else {
+            LambdaQueryWrapper<EdFileFavorite> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.select(EdFileFavorite::getFileId).eq(EdFileFavorite::getUserId, userId);
+            fileIds = fileFavoriteService.listObjs(queryWrapper, Object::toString);
+        }
 
         // 创建分页对象
         Page<FileInfoVO> page = new Page<>(fileInfoQueryDTO.getPageNum(), fileInfoQueryDTO.getPageSize());
@@ -1451,11 +1463,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         fileInfoVOIPage.getRecords().forEach(e -> {
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
-            e.setIsPersonal(Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId()) ? 1 : 0);
+            e.setIsPersonal( (String.valueOf(DataOwnEnum.USER_FILE.code).equals(e.getDataOwn()) && Objects.equals(e.getCreatedBy(), UserThreadLocal.getUserId())) ? 1 : 0);
             // 设置权限
             Map<String, Boolean> permissions = (e.getIsPersonal() == 1)
                     ? permissionService.getPersonalPermission()
-                    : permissionService.getUserPermission(UserThreadLocal.getUserId(), e.getId(), true);
+                    : permissionService.getUserPermission(UserThreadLocal.getUserId(), getCategoryId(e.getId()), true);
             e.setPermissions(permissions);
         });
         UserThreadLocal.setSuccessInfo("", "", "查询了收藏列表");

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java

@@ -364,7 +364,6 @@ public class UserServiceImpl implements UserService {
         User user = userMapper.getSingleUser(userId);
         Assert.notNull(user, StrFormatter.format("用户不存在，ID为 {}", userId));
         String decodeOldPwd = AESUtils.decrypt(oldInputPassword, UserConstants.SECRET_KEY);
-        Assert.isTrue(matchPassword(user, decodeOldPwd), StrFormatter.format("旧密码错误，ID为 {}", userId));
-        return ElectromagneticResultUtil.success(true);
+        return ElectromagneticResultUtil.success(matchPassword(user, decodeOldPwd));
     }
 }

electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml

@@ -13,6 +13,7 @@
         <result column="parent_id" property="parentId"/>
         <result column="category_id" property="categoryId"/>
         <result column="data_type" property="dataType"/>
+        <result column="data_own" property="dataOwn"/>
         <result column="data_status" property="dataStatus"/>
         <result column="save_status" property="saveStatus"/>
         <result column="file_size" property="fileSize"/>