chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
s2042968 2025-03-20 13:28:21 +08:00
parent 1f0bff89ca
commit d299e347e4
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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;
@ -1439,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());
@ -1450,7 +1463,7 @@ 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( (e.getPrjDir()== DataOwnEnum.USER_FILE.code && 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()

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

@ -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));
}
}

2
electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml
View File

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