查询排序

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

@@ -210,7 +210,7 @@ public class CommonService {
         }
     }
 
-    public List<ProjectVO> queryAllPrjInfo(boolean isAdminQuery) {
+    public List<String> queryAllPrjInfo(boolean isAdminQuery) {
 
         try {
             LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
@@ -222,7 +222,7 @@ public class CommonService {
             }
             List<String> ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
 
-            List projectVOS = new ArrayList<>();
+            List<String> projectVOS = new ArrayList<>();
 
             for (String id : ids) {
                 List<EdFileInfo> 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(jsonStr);
-                    projectVOS.add(projectVO);
+//                    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(jsonStr);
-                    projectVOS.add(fileProjectVO);
+//                    FileProjectVO fileProjectVO = JSONUtil.toList(jsonStr, FileProjectVO.class).get(0);
+//                    projectVOS.add(fileProjectVO);
                 }
             }
             return projectVOS;

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<EdFileInfoMapper, EdFileI
      */
     @Override
     public ElectromagneticResult<?> tree() {
+        List<String> strings = commonService.queryAllPrjInfo(false);
+        List<FileProjectVO> 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));
     }
 

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.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*;
@@ -215,7 +214,14 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
      */
     @Override
     public ElectromagneticResult<?> queryAllPrjInfo() {
-        return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(true));
+        List<String> res = commonService.queryAllPrjInfo(true);
+        List<ProjectVO> 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<EdFileInfoMapper, EdFileInfo>
                                 .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)