From 52a51c8e1b49702bd13d3e2b499b577c8e6538e9 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 3 Jan 2025 14:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceimpl/CommonService.java | 14 ++++++++------ .../serviceimpl/EdFileInfoServiceImpl.java | 8 ++++++++ .../service/serviceimpl/EdPrjServiceImpl.java | 18 ++++++++++++------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index dbc356c..39b7b25 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -210,7 +210,7 @@ public class CommonService { } } - public List queryAllPrjInfo(boolean isAdminQuery) { + public List queryAllPrjInfo(boolean isAdminQuery) { try { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) @@ -222,7 +222,7 @@ public class CommonService { } List ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList()); - List projectVOS = new ArrayList<>(); + List projectVOS = new ArrayList<>(); for (String id : ids) { List edFileInfos = selectAllAdminFolder(id); @@ -246,8 +246,9 @@ public class CommonService { treeNode.putExtra(ProjectVO.Fields.dataStatus, obj.getDataStatus()); })); String jsonStr = JSONUtil.toJsonStr(trees); - ProjectVO projectVO = JSONUtil.toList(jsonStr, ProjectVO.class).get(0); - projectVOS.add(projectVO); + projectVOS.add(jsonStr); +// ProjectVO projectVO = JSONUtil.toList(jsonStr, ProjectVO.class).get(0); +// projectVOS.add(projectVO); } else { TreeNodeConfig config = new TreeNodeConfig(); config.setIdKey(FileProjectVO.Fields.categoryId); @@ -261,8 +262,9 @@ public class CommonService { treeNode.putExtra(FileProjectVO.Fields.dataStatus, obj.getDataStatus()); })); String jsonStr = JSONUtil.toJsonStr(trees); - FileProjectVO fileProjectVO = JSONUtil.toList(jsonStr, FileProjectVO.class).get(0); - projectVOS.add(fileProjectVO); + projectVOS.add(jsonStr); +// FileProjectVO fileProjectVO = JSONUtil.toList(jsonStr, FileProjectVO.class).get(0); +// projectVOS.add(fileProjectVO); } } return projectVOS; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 42e8dc6..c4d91d1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -28,6 +28,7 @@ import com.electromagnetic.industry.software.manage.pojo.other.FileInfoVO; import com.electromagnetic.industry.software.manage.pojo.other.UploadRecordDTO; import com.electromagnetic.industry.software.manage.pojo.req.*; import com.electromagnetic.industry.software.manage.pojo.resp.FileInfoQueryPageVO; +import com.electromagnetic.industry.software.manage.pojo.resp.FileProjectVO; import com.electromagnetic.industry.software.manage.pojo.resp.FileVersionViewVO; import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO; import com.electromagnetic.industry.software.manage.service.EdFileInfoService; @@ -165,6 +166,13 @@ public class EdFileInfoServiceImpl extends ServiceImpl tree() { + List strings = commonService.queryAllPrjInfo(false); + List res = new ArrayList<>(); + strings.forEach(e -> { + FileProjectVO fileProjectVO = JSONUtil.toList(e, FileProjectVO.class).get(0); + res.add(fileProjectVO); + }); + res.sort(Comparator.comparing(FileProjectVO::getSort)); return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(false)); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index 9ebe8ee..a7f83e5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.StrFormatter; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -20,6 +21,7 @@ import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper; import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo; import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO; +import com.electromagnetic.industry.software.manage.pojo.resp.ProjectVO; import com.electromagnetic.industry.software.manage.service.EdPrjService; import com.electromagnetic.industry.software.manage.service.FileSystemService; import org.springframework.beans.factory.annotation.Value; @@ -28,10 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; @@ -215,7 +214,14 @@ public class EdPrjServiceImpl extends ServiceImpl */ @Override public ElectromagneticResult queryAllPrjInfo() { - return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(true)); + List res = commonService.queryAllPrjInfo(true); + List projectVOS = new ArrayList<>(); + res.forEach(e -> { + ProjectVO projectVO = JSONUtil.toList(e, ProjectVO.class).get(0); + projectVOS.add(projectVO); + }); + projectVOS.sort(Comparator.comparing(ProjectVO::getSort)); + return ElectromagneticResultUtil.success(projectVOS); } /** @@ -349,7 +355,7 @@ public class EdPrjServiceImpl extends ServiceImpl .setFileTime(nowTimeStr) .setDataType(EleDataTypeEnum.FOLDER.code) .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) - .setEffectFlag(EffectFlagEnum.NOT_EFFECTIVE.code) + .setEffectFlag(EffectFlagEnum.EFFECT.code) .setFileCode(fileCode) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(targetParentFile.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId)