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

优化代码，新增库文件相关功能。

This commit is contained in:
chenxudong 2025-03-07 14:20:40 +08:00
parent 83ff46efc3
commit ff2d3c3e7b
14 changed files with 424 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java
View File

@ -30,33 +30,33 @@ public class EdFileInfoController {
@Resource
private EdFileInfoService edFileInfoService;
@UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequestMapping("tree")
public ElectromagneticResult<?> tree() {
return edFileInfoService.tree(PrjQuerySource.SYS_DB.value);
}
@UserOperation(value = "创建文件夹", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "创建文件夹", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequestMapping("createFolder")
public ElectromagneticResult<?> createFolder(@RequestBody CreateFolderDTO createFolderDTO) {
return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "作废", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "作废", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.DELETE)
@RequestMapping("delete")
public ElectromagneticResult<?> delete(@RequestParam String id) {
return edFileInfoService.delete(id, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "查询文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查询文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping("info")
public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "上传文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "上传文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.UPLOAD)
@RequestMapping("upload")
public ElectromagneticResult<?> upload(@RequestParam("parentId") String parentId,
@ -65,21 +65,21 @@ public class EdFileInfoController {
return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "下载文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "下载文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.DOWNLOAD)
@RequestMapping("download")
public ResponseEntity<InputStreamResource> download(@RequestParam String id, HttpServletResponse response) {
return edFileInfoService.download(id, response, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "更新文件信息", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "更新文件信息", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.EDIT)
@RequestMapping("updateFileInfo")
public ElectromagneticResult<?> updateFileInfo(@RequestBody UpdateFileInfoDTO updateFileInfoDTO) {
return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "移动文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "移动文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.MOVE)
@RequestMapping("moveFile")
public ElectromagneticResult<?> moveFile(@RequestParam("id") String id,
@ -88,7 +88,7 @@ public class EdFileInfoController {
return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "复制文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "复制文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.MOVE)
@RequestMapping("copyFile")
public ElectromagneticResult<?> copyFile(@RequestParam("id") String id,
@ -97,27 +97,27 @@ public class EdFileInfoController {
return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "查看文件历史版本信息", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查看文件历史版本信息", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping("versionView")
public ElectromagneticResult<?> versionView(@RequestParam String fileId) {
return edFileInfoService.versionView(fileId);
}
@UserOperation(value = "回退版本", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "回退版本", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.EDIT)
@RequestMapping("versionBack")
public ElectromagneticResult<?> versionBack(@RequestParam String fileId, @RequestParam int targetVersion) {
return edFileInfoService.versionBack(fileId, targetVersion);
}
@UserOperation(value = "导出数据库", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "导出数据库", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequestMapping("batchExport")
public ResponseEntity<InputStreamResource> batchExport(@RequestParam String fileIds, HttpServletResponse response) throws IOException {
return edFileInfoService.batchExport(fileIds, response, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequestMapping(value = "/mergeChunks", method = RequestMethod.GET)
public ElectromagneticResult<?> mergeChunks(@RequestParam String identifier,
@RequestParam String fileName,
@ -125,7 +125,7 @@ public class EdFileInfoController {
return edFileInfoService.mergeChunks(identifier, fileName, totalChunks, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequestMapping(value = "/batchImport", method = RequestMethod.POST)
public ElectromagneticResult<?> batchImport(FileChunkDTO fileChunkDTO) {
return edFileInfoService.batchImport(fileChunkDTO);
@ -137,27 +137,27 @@ public class EdFileInfoController {
return edFileInfoService.checkChunkExist(fileChunkDTO);
}
@UserOperation(value = "查询发布管理", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查询发布管理", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequestMapping(value = "/uploadRecord", method = RequestMethod.GET)
public ElectromagneticResult<?> uploadRecord(@RequestParam int pageNum, @RequestParam int pageSize) {
return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "查询文件详细信息", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查询文件详细信息", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping(value = "/fileDetail", method = RequestMethod.GET)
public ElectromagneticResult<?> detail(@RequestParam String id) {
return edFileInfoService.detail(id);
}
@UserOperation(value = "查询子文件集", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查询子文件集", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "预览文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "预览文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.DOWNLOAD)
@RequestMapping(value = "preview", method = RequestMethod.GET)
public ResponseEntity<InputStreamResource> preview(@RequestParam String id, HttpServletResponse response) {
@ -171,7 +171,7 @@ public class EdFileInfoController {
* @return
*/
@GetMapping("/collection")
@UserOperation(value = "收藏了文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "收藏了文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> addFavorite(@RequestParam String id) {
String userId = UserThreadLocal.getUserId();
return ElectromagneticResultUtil.success(edFileInfoService.addFavorite(userId, id));
@ -184,7 +184,7 @@ public class EdFileInfoController {
* @return
*/
@GetMapping("/removeCollection")
@UserOperation(value = "从收藏夹移除了文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "从收藏夹移除了文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
String userId = UserThreadLocal.getUserId();
return ElectromagneticResultUtil.success(edFileInfoService.removeFavorite(userId, id));
@ -196,7 +196,7 @@ public class EdFileInfoController {
* @return
*/
@PostMapping("/listCollection")
@UserOperation(value = "查看了收藏夹", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查看了收藏夹", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> listFavorite(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
String userId = UserThreadLocal.getUserId();
return ElectromagneticResultUtil.success(edFileInfoService.findFavorite(userId, fileInfoQueryDTO));

12
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java
View File

@ -30,7 +30,7 @@ public class EdFileRelationController {
* @return
*/
@RequestMapping(value = "/create", method = RequestMethod.POST)
@UserOperation(value = "创建了文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "创建了文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
return ElectromagneticResultUtil.success(edFileRelationService.createRelation(relation));
}
@ -42,7 +42,7 @@ public class EdFileRelationController {
* @return
*/
@RequestMapping(value = "/update", method = RequestMethod.POST)
@UserOperation(value = "更新了文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "更新了文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
@ -60,7 +60,7 @@ public class EdFileRelationController {
* @return
*/
@RequestMapping(value = "/cancel/{relationId}", method = RequestMethod.GET)
@UserOperation(value = "取消了文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "取消了文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> cancelRelation(@PathVariable("relationId") String relationId) {
return ElectromagneticResultUtil.success(edFileRelationService.cancelRelation(relationId));
}
@ -69,7 +69,7 @@ public class EdFileRelationController {
* 展示文件关系
*/
@RequestMapping(value = "listRelations/{id}", method = RequestMethod.GET)
@UserOperation(value = "查看了文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查看了文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> listRelations(@PathVariable("id") String id) {
return ElectromagneticResultUtil.success(edFileRelationService.listRelations(id));
}
@ -78,7 +78,7 @@ public class EdFileRelationController {
* 检验文件名是否唯一
*/
@RequestMapping(value = "/checkFileNameExist", method = RequestMethod.POST)
@UserOperation(value = "校验文件名唯一性", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "校验文件名唯一性", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> checkFileNameExist(@RequestBody CheckNameUniqueRequest checkNameUniqueRequest) {
return ElectromagneticResultUtil.success(edFileRelationService.checkNameExist(checkNameUniqueRequest));
}
@ -87,7 +87,7 @@ public class EdFileRelationController {
* 本地上传并建立关系
*/
@RequestMapping(value = "/upload", method = RequestMethod.POST)
@UserOperation(value = "上传了文件并创建了文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "上传了文件并创建了文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> uploadRelation(@RequestParam("parentId") String parentId,
@RequestParam("file") MultipartFile file,
@RequestParam("description") String description,

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java
View File

@ -20,19 +20,19 @@ public class FileFormatController {
private FileFormatService fileFormatService;
@GetMapping("/add")
@UserOperation(value = "新增文件格式", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "新增文件格式", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> addFileFormat(@RequestParam String suffixName) {
return ElectromagneticResultUtil.success(fileFormatService.addFileFormat(suffixName));
}
@GetMapping("/delete")
@UserOperation(value = "删除文件格式", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "删除文件格式", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> deleteFileFormat(@RequestParam String id) {
return ElectromagneticResultUtil.success(fileFormatService.deleteFileFormat(id));
}
@GetMapping("/list")
@UserOperation(value = "查询文件格式列表", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查询文件格式列表", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> list() {
return ElectromagneticResultUtil.success(fileFormatService.getList());
}

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java
View File

@ -20,19 +20,19 @@ public class FileRecycleController {
private FileRecycleService fileRecycleService;
@RequestMapping("list")
@UserOperation(value = "查看回收站", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查看回收站", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> list(@RequestBody RecycleFileQueryDTO pars) {
return fileRecycleService.list(pars);
}
@RequestMapping("remove")
@UserOperation(value = "彻底清除文件", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "彻底清除文件", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> remove(@RequestParam String fileId) {
return fileRecycleService.remove(fileId);
}
@RequestMapping("recover")
@UserOperation(value = "文件恢复", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "文件恢复", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> recover(@RequestParam String fileId) {
return fileRecycleService.recover(fileId);
}

22
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java
View File

@ -28,55 +28,55 @@ public class ProjectController {
@Resource
private PermissionService permissionService;
@UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("create")
public ElectromagneticResult<?> create(@RequestParam String prjName) {
return edPrjService.createNewPrj(prjName, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("delete")
public ElectromagneticResult<?> delete(@RequestParam String prjId) {
return edPrjService.delete(prjId, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "修改层级名", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "修改层级名", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("modify")
public ElectromagneticResult<?> modifyPrjName(@RequestParam String newPrjName, @RequestParam String prjId) {
return edPrjService.modifyPrjName(prjId, newPrjName, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "查询所有层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "查询所有层级", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("queryAll")
public ElectromagneticResult<?> queryAll() {
return edPrjService.queryAllPrjInfo(PrjQuerySource.SYS_PRJ.value);
}
@UserOperation(value = "添加子集", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "添加子集", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("addFolder")
public ElectromagneticResult<?> addFolder(@RequestParam String folderName, @RequestParam String parentId) {
return edPrjService.addFolder(parentId, folderName, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "修改子集名称", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "修改子集名称", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("modifyFolder")
public ElectromagneticResult<?> modifyFolder(@RequestParam String newFolderName, @RequestParam String id) {
return edPrjService.modifyFolder(id, newFolderName, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "废除子集", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "废除子集", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("deleteFolder")
public ElectromagneticResult<?> deleteFolder(@RequestParam String id) {
return edPrjService.deleteFolder(id, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "更改层级顺序", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "更改层级顺序", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("folderResort")
public ElectromagneticResult<?> folderResort(@RequestBody List<FolderResortDTO> folderResortDTOList) {
return edPrjService.folderResort(folderResortDTOList);
}
@UserOperation(value = "发布层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "发布层级", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("publish")
public ElectromagneticResult<?> publish(@RequestParam String prjId) {
edPrjService.publish(prjId, DataOwnEnum.SYS_PRJ.code);
@ -85,13 +85,13 @@ public class ProjectController {
return ElectromagneticResultUtil.success(true);
}
@UserOperation(value = "引用层级", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "引用层级", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("follow")
public ElectromagneticResult<?> follow(@RequestParam String sourceId, @RequestParam String targetId) {
return edPrjService.follow(sourceId, targetId, DataOwnEnum.SYS_PRJ.code);
}
@UserOperation(value = "查询层级发布状态", modelName = UserOperationModuleEnum.PRJ_SETTING)
@UserOperation(value = "查询层级发布状态", modelName = UserOperationModuleEnum.SYS_PRJ_SETTING)
@RequestMapping("publishStatus")
public ElectromagneticResult<?> publishStatus(@RequestBody QueryPublishStatus queryPublishStatus) {
return edPrjService.publishStatus(queryPublishStatus, DataOwnEnum.SYS_PRJ.code);

204
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileInfoController.java Normal file
View File

@ -0,0 +1,204 @@
package com.electromagnetic.industry.software.manage.controller;
import com.electromagnetic.industry.software.common.annotations.RequiredPermission;
import com.electromagnetic.industry.software.common.annotations.UserOperation;
import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
import com.electromagnetic.industry.software.common.enums.FilePermission;
import com.electromagnetic.industry.software.common.enums.PrjQuerySource;
import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.pojo.req.CreateFolderDTO;
import com.electromagnetic.industry.software.manage.pojo.req.FileChunkDTO;
import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO;
import com.electromagnetic.industry.software.manage.pojo.req.UpdateFileInfoDTO;
import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@RestController
@RequestMapping("/data/ed/repo/file")
public class RepoEdFileInfoController {
@Resource
private EdFileInfoService edFileInfoService;
@UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequestMapping("tree")
public ElectromagneticResult<?> tree() {
return edFileInfoService.tree(PrjQuerySource.REPO_DB.value);
}
@UserOperation(value = "创建文件夹", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequestMapping("createFolder")
public ElectromagneticResult<?> createFolder(@RequestBody CreateFolderDTO createFolderDTO) {
return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "作废", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.DELETE)
@RequestMapping("delete")
public ElectromagneticResult<?> delete(@RequestParam String id) {
return edFileInfoService.delete(id, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "查询文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping("info")
public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "上传文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.UPLOAD)
@RequestMapping("upload")
public ElectromagneticResult<?> upload(@RequestParam("parentId") String parentId,
@RequestParam("file") MultipartFile file,
@RequestParam("strategy") Integer strategy) {
return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "下载文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.DOWNLOAD)
@RequestMapping("download")
public ResponseEntity<InputStreamResource> download(@RequestParam String id, HttpServletResponse response) {
return edFileInfoService.download(id, response, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "更新文件信息", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.EDIT)
@RequestMapping("updateFileInfo")
public ElectromagneticResult<?> updateFileInfo(@RequestBody UpdateFileInfoDTO updateFileInfoDTO) {
return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "移动文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.MOVE)
@RequestMapping("moveFile")
public ElectromagneticResult<?> moveFile(@RequestParam("id") String id,
@RequestParam("targetFolderId") String targetFolderId,
@RequestParam("strategy") Integer strategy) {
return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "复制文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.MOVE)
@RequestMapping("copyFile")
public ElectromagneticResult<?> copyFile(@RequestParam("id") String id,
@RequestParam("targetFolderId") String targetFolderId,
@RequestParam("strategy") Integer strategy) {
return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "查看文件历史版本信息", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping("versionView")
public ElectromagneticResult<?> versionView(@RequestParam String fileId) {
return edFileInfoService.versionView(fileId);
}
@UserOperation(value = "回退版本", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.EDIT)
@RequestMapping("versionBack")
public ElectromagneticResult<?> versionBack(@RequestParam String fileId, @RequestParam int targetVersion) {
return edFileInfoService.versionBack(fileId, targetVersion);
}
@UserOperation(value = "导出数据库", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequestMapping("batchExport")
public ResponseEntity<InputStreamResource> batchExport(@RequestParam String fileIds, HttpServletResponse response) throws IOException {
return edFileInfoService.batchExport(fileIds, response, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequestMapping(value = "/mergeChunks", method = RequestMethod.GET)
public ElectromagneticResult<?> mergeChunks(@RequestParam String identifier,
@RequestParam String fileName,
@RequestParam Integer totalChunks) {
return edFileInfoService.mergeChunks(identifier, fileName, totalChunks, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequestMapping(value = "/batchImport", method = RequestMethod.POST)
public ElectromagneticResult<?> batchImport(FileChunkDTO fileChunkDTO) {
return edFileInfoService.batchImport(fileChunkDTO);
}
@UserOperation(value = "批量上传数据库")
@RequestMapping(value = "/batchImport", method = RequestMethod.GET)
public ElectromagneticResult<?> checkChunkExist(FileChunkDTO fileChunkDTO) {
return edFileInfoService.checkChunkExist(fileChunkDTO);
}
@UserOperation(value = "查询发布管理", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequestMapping(value = "/uploadRecord", method = RequestMethod.GET)
public ElectromagneticResult<?> uploadRecord(@RequestParam int pageNum, @RequestParam int pageSize) {
return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "查询文件详细信息", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping(value = "/fileDetail", method = RequestMethod.GET)
public ElectromagneticResult<?> detail(@RequestParam String id) {
return edFileInfoService.detail(id);
}
@UserOperation(value = "查询子文件集", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.VIEW)
@RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.SYS_FILE.code);
}
@UserOperation(value = "预览文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
@RequiredPermission(value = FilePermission.DOWNLOAD)
@RequestMapping(value = "preview", method = RequestMethod.GET)
public ResponseEntity<InputStreamResource> preview(@RequestParam String id, HttpServletResponse response) {
return edFileInfoService.preview(id, response, DataOwnEnum.SYS_FILE.code);
}
/**
* 添加进收藏夹
*
* @param id 文件id
* @return
*/
@GetMapping("/collection")
@UserOperation(value = "收藏了文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
public ElectromagneticResult<?> addFavorite(@RequestParam String id) {
String userId = UserThreadLocal.getUserId();
return ElectromagneticResultUtil.success(edFileInfoService.addFavorite(userId, id));
}
/**
* 从收藏夹移除
*
* @param id 文件id
* @return
*/
@GetMapping("/removeCollection")
@UserOperation(value = "从收藏夹移除了文件", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
public ElectromagneticResult<?> removeFavorite(@RequestParam String id) {
String userId = UserThreadLocal.getUserId();
return ElectromagneticResultUtil.success(edFileInfoService.removeFavorite(userId, id));
}
/**
* 展示当前用户收藏夹文件
*
* @return
*/
@PostMapping("/listCollection")
@UserOperation(value = "查看了收藏夹", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
public ElectromagneticResult<?> listFavorite(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
String userId = UserThreadLocal.getUserId();
return ElectromagneticResultUtil.success(edFileInfoService.findFavorite(userId, fileInfoQueryDTO));
}
}

91
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoPrjController.java Normal file
View File

@ -0,0 +1,91 @@
package com.electromagnetic.industry.software.manage.controller;
import com.electromagnetic.industry.software.common.annotations.UserOperation;
import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
import com.electromagnetic.industry.software.common.enums.PrjQuerySource;
import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO;
import com.electromagnetic.industry.software.manage.pojo.req.QueryPublishStatus;
import com.electromagnetic.industry.software.manage.service.EdPrjService;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/data/ed/repo/prj")
public class RepoPrjController {
@Resource
private EdPrjService edPrjService;
@UserOperation(value = "创建层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("create")
public ElectromagneticResult<?> create(@RequestParam String prjName) {
return edPrjService.createNewPrj(prjName, DataOwnEnum.USER_PRJ.code);
}
@UserOperation(value = "删除层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("delete")
public ElectromagneticResult<?> delete(@RequestParam String prjId) {
return edPrjService.delete(prjId, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "修改层级名", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("modify")
public ElectromagneticResult<?> modifyPrjName(@RequestParam String newPrjName, @RequestParam String prjId) {
return edPrjService.modifyPrjName(prjId, newPrjName, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "查询所有层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("queryAll")
public ElectromagneticResult<?> queryAll() {
return edPrjService.queryAllPrjInfo(PrjQuerySource.REPO_PRJ.value);
}
@UserOperation(value = "添加子集", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("addFolder")
public ElectromagneticResult<?> addFolder(@RequestParam String folderName, @RequestParam String parentId) {
return edPrjService.addFolder(parentId, folderName, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "修改子集名称", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("modifyFolder")
public ElectromagneticResult<?> modifyFolder(@RequestParam String newFolderName, @RequestParam String id) {
return edPrjService.modifyFolder(id, newFolderName, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "废除子集", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("deleteFolder")
public ElectromagneticResult<?> deleteFolder(@RequestParam String id) {
return edPrjService.deleteFolder(id, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "更改层级顺序", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("folderResort")
public ElectromagneticResult<?> folderResort(@RequestBody List<FolderResortDTO> folderResortDTOList) {
return edPrjService.folderResort(folderResortDTOList);
}
@UserOperation(value = "发布层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("publish")
public ElectromagneticResult<?> publish(@RequestParam String prjId) {
return edPrjService.publish(prjId, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "引用层级", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("follow")
public ElectromagneticResult<?> follow(@RequestParam String sourceId, @RequestParam String targetId) {
return edPrjService.follow(sourceId, targetId, DataOwnEnum.REPO_PRJ.code);
}
@UserOperation(value = "查询层级发布状态", modelName = UserOperationModuleEnum.REPO_PRJ_SETTING)
@RequestMapping("publishStatus")
public ElectromagneticResult<?> publishStatus(@RequestBody QueryPublishStatus queryPublishStatus) {
return edPrjService.publishStatus(queryPublishStatus, DataOwnEnum.REPO_PRJ.code);
}
}

12
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileRelationController.java
View File

@ -30,7 +30,7 @@ public class UserEdFileRelationController {
* @return
*/
@RequestMapping(value = "/create", method = RequestMethod.POST)
@UserOperation(value = "创建文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "创建文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
return ElectromagneticResultUtil.success(edFileRelationService.createRelation(relation));
}
@ -42,7 +42,7 @@ public class UserEdFileRelationController {
* @return
*/
@RequestMapping(value = "/update", method = RequestMethod.POST)
@UserOperation(value = "更新文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "更新文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> updateRelation(@RequestBody UpdateRelationDTO updateRelation) {
LambdaUpdateWrapper<EdFileRelation> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EdFileRelation::getId, updateRelation.getRelationId()).set(EdFileRelation::getRelationship, updateRelation.getRelationship());
@ -60,7 +60,7 @@ public class UserEdFileRelationController {
* @return
*/
@RequestMapping(value = "/cancel/{relationId}", method = RequestMethod.GET)
@UserOperation(value = "取消文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "取消文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> cancelRelation(@PathVariable("relationId") String relationId) {
return ElectromagneticResultUtil.success(edFileRelationService.cancelRelation(relationId));
}
@ -69,7 +69,7 @@ public class UserEdFileRelationController {
* 展示文件关系
*/
@RequestMapping(value = "listRelations/{id}", method = RequestMethod.GET)
@UserOperation(value = "查看文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "查看文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> listRelations(@PathVariable("id") String id) {
return ElectromagneticResultUtil.success(edFileRelationService.listRelations(id));
}
@ -78,7 +78,7 @@ public class UserEdFileRelationController {
* 检验文件名是否唯一
*/
@RequestMapping(value = "/checkFileNameExist", method = RequestMethod.POST)
@UserOperation(value = "校验文件名唯一性", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "校验文件名唯一性", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> checkFileNameExist(@RequestBody CheckNameUniqueRequest checkNameUniqueRequest) {
return ElectromagneticResultUtil.success(edFileRelationService.checkNameExist(checkNameUniqueRequest));
}
@ -87,7 +87,7 @@ public class UserEdFileRelationController {
* 本地上传并建立关系
*/
@RequestMapping(value = "/upload", method = RequestMethod.POST)
@UserOperation(value = "上传了文件并创建文件关系", modelName = UserOperationModuleEnum.DATABASE)
@UserOperation(value = "上传了文件并创建文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
public ElectromagneticResult<?> uploadRelation(@RequestParam("parentId") String parentId,
@RequestParam("file") MultipartFile file,
@RequestParam("description") String description,

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

@ -261,10 +261,10 @@ public class CommonService {
*
* @param querySource 0：询管理员从层级定义处查。 2.用户从数据库管理界面查询。
* @param accessibleIds
* @param obj
* @param returnType
* @return
*/
public Map<Integer, List<String>> querySysPrjTree(int querySource, List<String> accessibleIds, Object obj) {
public Map<Integer, List<String>> querySysPrjTree(int querySource, List<String> accessibleIds, Object returnType) {
/**
* querySource=SYS_PRJ（从层级定义处查询） querySource=SYS_DB（从数据库界面处查询）
@ -308,7 +308,7 @@ public class CommonService {
prjQueryWrapper.ne(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code);
}
List<EdFileInfo> edFileInfos = edFileInfoMapper.selectList(prjQueryWrapper);
String jsonTree = createTree(edFileInfos, obj);
String jsonTree = createTree(edFileInfos, returnType);
List<String> list = map.getOrDefault(querySource, new ArrayList<>());
list.add(jsonTree);
map.put(querySource, list);
@ -321,7 +321,7 @@ public class CommonService {
return map;
}
public Map<Integer, List<String>> queryUserPrjTree(int querySource, Object object) {
public Map<Integer, List<String>> queryUserPrjTree(int querySource, Object returnType) {
Map<Integer, List<String>> map = new HashMap<>();
try {
@ -329,6 +329,7 @@ public class CommonService {
LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
.select(EdFileInfo::getId)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getDataOwn, DataOwnEnum.USER_PRJ.code)
.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId())
.eq(EdFileInfo::getParentId, PRJ_PARENT_ID);
List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
@ -349,7 +350,49 @@ public class CommonService {
}
List<EdFileInfo> edFileInfos = edFileInfoMapper.selectList(prjQueryWrapper);
String jsonTree = createTree(edFileInfos, object);
String jsonTree = createTree(edFileInfos, returnType);
List<String> list = map.getOrDefault(querySource, new ArrayList<>());
list.add(jsonTree);
map.put(querySource, list);
}
} catch (Exception e) {
String info = "查询用户层级信息失败";
log.error(info, e);
throw new BizException(info);
}
return map;
}
public Map<Integer, List<String>> queryRepoPrjTree(int querySource, Object returnType) {
Map<Integer, List<String>> map = new HashMap<>();
try {
// 首先查出所有的工程id
LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
.select(EdFileInfo::getId)
.eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId())
.eq(EdFileInfo::getParentId, PRJ_PARENT_ID);
List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
for (String id : prjIds) {
LambdaQueryWrapper<EdFileInfo> prjQueryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getDataOwn, DataOwnEnum.REPO_PRJ.code)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.likeRight(EdFileInfo::getFilePath, id);
if (querySource == PrjQuerySource.REPO_DB.value) {
prjQueryWrapper.and(qr -> qr.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code)
.or()
.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code));
} else {
prjQueryWrapper.ne(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code);
}
List<EdFileInfo> edFileInfos = edFileInfoMapper.selectList(prjQueryWrapper);
String jsonTree = createTree(edFileInfos, returnType);
List<String> list = map.getOrDefault(querySource, new ArrayList<>());
list.add(jsonTree);
map.put(querySource, list);

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

@ -204,11 +204,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId())
.eq(EdFileInfo::getParentId, PRJ_PARENT_ID)).stream().map(EdFileInfo::getId).collect(Collectors.toList());
}
Map<Integer, List<String>> map = (querySource == PrjQuerySource.SYS_DB.value) ?
commonService.querySysPrjTree(querySource, accessibleIds, new FileProjectVO()) :
commonService.queryUserPrjTree(querySource, new FileProjectVO());
Map<Integer, List<String>> map;
if (querySource == PrjQuerySource.SYS_DB.value) {
map = commonService.querySysPrjTree(querySource, accessibleIds, new FileProjectVO());
} else if (querySource == PrjQuerySource.USER_DB.value) {
map = commonService.queryUserPrjTree(querySource, new FileProjectVO());
} else {
map = commonService.queryRepoPrjTree(querySource, new FileProjectVO());
}
List<String> strings = map.getOrDefault(querySource, new ArrayList<>());
List<FileProjectVO> res = new ArrayList<>();
strings.forEach(e -> {

15
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -232,13 +232,16 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
public ElectromagneticResult<?> queryAllPrjInfo(int querySource) {
/**
* querySource=SYS_PRJ（管理员从层级定义处查询） querySource=USER_PRJ（用户从自定义层级结构处查询
* querySource=SYS_PRJ（管理员从层级定义处查询） querySource=USER_PRJ（用户从自定义层级结构处查询 querySource=REPO_PRJ
*/
Map<Integer, List<String>> map = (querySource == PrjQuerySource.SYS_PRJ.value) ?
commonService.querySysPrjTree(querySource, null, new ProjectVO()) :
commonService.queryUserPrjTree(querySource, new ProjectVO());
Map<Integer, List<String>> map;
if (querySource == PrjQuerySource.SYS_PRJ.value) {
map = commonService.querySysPrjTree(querySource, null, new ProjectVO());
} else if (querySource == PrjQuerySource.USER_PRJ.value) {
map = commonService.queryUserPrjTree(querySource, new ProjectVO());
} else {
map = commonService.queryRepoPrjTree(querySource, new ProjectVO());
}
List<String> res = map.getOrDefault(querySource, new ArrayList<>());
List<ProjectVO> projectVOS = new ArrayList<>();
res.forEach(e -> {

1
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FileRepeatEnum.java
View File

@ -8,6 +8,7 @@ public enum FileRepeatEnum {
IGNORE(1, "跳过所有冲突文件"),
REVERSION(2, "所有冲突文件版本更新"),
NEW(3, "重命名所有冲突文件, 文件后加“_1”");
public int code;
public String desc;

4
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/PrjQuerySource.java
View File

@ -8,7 +8,9 @@ public enum PrjQuerySource {
SYS_PRJ(0),
SYS_DB(1),
USER_PRJ(2),
USER_DB(3);
USER_DB(3),
REPO_PRJ(4),
REPO_DB(5);
public final int value;

16
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java
View File

@ -7,22 +7,26 @@ import java.util.Objects;
@AllArgsConstructor
public enum UserOperationModuleEnum {
PRJ_SETTING("prjSetting", "层级定义"),
SYS_PRJ_SETTING("sys_prj_setting", "数据库层级定义"),
SYS_PRJ_DATABASE("sys_prj_database", "数据库管理"),
REPO_PRJ_DATABASE("repo_prj_database", "库数据管理"),
REPO_PRJ_SETTING("repo_prj_setting", "库数据层级定义"),
USER_PRJ("user_prj", "个人数据"),
UNKNOWN("unknown", "未分组"),
DATABASE("database", "数据库管理"),
USER("user", "人员管理"),
USER_PRJ("userPrj", "个人数据"),
TAG("tag", "标签管理"),
LOG("log", "操作记录审计"),
TMP("tmp", "临时文件"),
BACKUP_FILE("backupFile", "系统文件备份"),
BACKUP_FILE("backup_file", "系统文件备份"),
PERMISSION("permission", "权限管理");
public final String key;
public final String desc;
public static String getDesc(String key) {
for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) {
if (Objects.equals(e.key, key)) {