修改存在的bug

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileInfoController.java

@@ -14,6 +14,7 @@ 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 com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileRelationServiceImpl;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,8 @@ public class RepoEdFileInfoController {
 
     @Resource
     private EdFileInfoService edFileInfoService;
+    @Resource
+    private EdFileRelationServiceImpl edFileRelationService;
 
     @UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.REPO_PRJ_DATABASE)
     @RequestMapping("tree")

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/RepoEdFileRelationController.java

@@ -0,0 +1,97 @@
+package com.electromagnetic.industry.software.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.electromagnetic.industry.software.common.annotations.UserOperation;
+import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
+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.models.EdFileRelation;
+import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
+import com.electromagnetic.industry.software.manage.pojo.req.UpdateRelationDTO;
+import com.electromagnetic.industry.software.manage.service.serviceimpl.EdFileRelationServiceImpl;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/data/ed/repo/relation")
+public class RepoEdFileRelationController {
+
+    @Resource
+    EdFileRelationServiceImpl edFileRelationService;
+
+    /**
+     * 创建文件关系
+     *
+     * @param relation
+     * @return
+     */
+    @RequestMapping(value = "/create", method = RequestMethod.POST)
+    @UserOperation(value = "创建文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
+    public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
+        return ElectromagneticResultUtil.success(edFileRelationService.createRelation(relation));
+    }
+
+    /**
+     * 更新文件关系
+     *
+     * @param updateRelation
+     * @return
+     */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @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());
+        boolean isUpdated = edFileRelationService.update(wrapper);
+        if (isUpdated) {
+            UserThreadLocal.setSuccessInfo("", updateRelation.getRelationId(), "更新了文件关系");
+        }
+        return ElectromagneticResultUtil.success(isUpdated);
+    }
+
+    /**
+     * 取消文件关系
+     *
+     * @param relationId 关系主键id
+     * @return
+     */
+    @RequestMapping(value = "/cancel/{relationId}", method = RequestMethod.GET)
+    @UserOperation(value = "取消文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
+    public ElectromagneticResult<?> cancelRelation(@PathVariable("relationId") String relationId) {
+        return ElectromagneticResultUtil.success(edFileRelationService.cancelRelation(relationId));
+    }
+
+    /**
+     * 展示文件关系
+     */
+    @RequestMapping(value = "listRelations/{id}", method = RequestMethod.GET)
+    @UserOperation(value = "查看文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
+    public ElectromagneticResult<?> listRelations(@PathVariable("id") String id) {
+        return ElectromagneticResultUtil.success(edFileRelationService.listRelations(id));
+    }
+
+    /**
+     * 检验文件名是否唯一
+     */
+    @RequestMapping(value = "/checkFileNameExist", method = RequestMethod.POST)
+    @UserOperation(value = "校验文件名唯一性", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
+    public ElectromagneticResult<?> checkFileNameExist(@RequestBody CheckNameUniqueRequest checkNameUniqueRequest) {
+        return ElectromagneticResultUtil.success(edFileRelationService.checkNameExist(checkNameUniqueRequest));
+    }
+
+    /**
+     * 本地上传并建立关系
+     */
+    @RequestMapping(value = "/upload", method = RequestMethod.POST)
+    @UserOperation(value = "上传了文件并创建文件关系", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE)
+    public ElectromagneticResult<?> uploadRelation(@RequestParam("parentId") String parentId,
+                                                   @RequestParam("file") MultipartFile file,
+                                                   @RequestParam("description") String description,
+                                                   @RequestParam("id") String id) {
+        return ElectromagneticResultUtil.success(edFileRelationService.uploadFileAndRelation(parentId, id, file, description, DataOwnEnum.SYS_FILE.code));
+    }
+}

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileRelationController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping("/data/ed/relation")
-public class EdFileRelationController {
+public class SysEdFileRelationController {
 
     @Resource
     EdFileRelationServiceImpl edFileRelationService;

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

@@ -44,7 +44,9 @@ public class FileBackLogServiceImpl extends ServiceImpl<FileBackupLogMapper, Fil
     @Override
     public ElectromagneticResult<?> query(Integer pageNumber, Integer pageSize) {
 
-        Page<FileBackupLog> fileBackupLogPage = this.baseMapper.selectPage(new Page<>(pageNumber, pageSize), Wrappers.<FileBackupLog>lambdaQuery().eq(FileBackupLog::getSource, FileBackupSource.SYS_BACKUP.code));
+        Page<FileBackupLog> fileBackupLogPage = this.baseMapper.selectPage(new Page<>(pageNumber, pageSize), Wrappers.<FileBackupLog>lambdaQuery()
+                .orderByDesc(FileBackupLog::getFileId)
+                .eq(FileBackupLog::getSource, FileBackupSource.SYS_BACKUP.code));
         List<FileBackupLog> records = fileBackupLogPage.getRecords();
 
         if (CollUtil.isEmpty(records)) {