业务逻辑优化调整.

荆蔚杰
Showing 4 changed files with 14 additions and 12 deletions
src/main/java/com/pashanhoo/file/service/impl/DgFileServiceImpl.java
src/main/java/com/pashanhoo/modify/service/impl/DgArchivesModifyServiceImpl.java
src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java
src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java
--- a/src/main/java/com/pashanhoo/file/service/impl/DgFileServiceImpl.java
View file @ca3bd7a
+++ b/src/main/java/com/pashanhoo/file/service/impl/DgFileServiceImpl.java
View file @ca3bd7a
@@ -11,8 +11,6 @@ import com.pashanhoo.file.entity.DgFileDO;
 import com.pashanhoo.file.entity.vo.*;
 import com.pashanhoo.file.mapper.DgFileMapper;
 import com.pashanhoo.file.service.DgFileService;
-import io.minio.Result;
-import io.minio.messages.DeleteError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
--- a/src/main/java/com/pashanhoo/modify/service/impl/DgArchivesModifyServiceImpl.java
View file @ca3bd7a
+++ b/src/main/java/com/pashanhoo/modify/service/impl/DgArchivesModifyServiceImpl.java
View file @ca3bd7a
 package com.pashanhoo.modify.service.impl;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.lang.UUID;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
--- a/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java
View file @ca3bd7a
+++ b/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java
View file @ca3bd7a
@@ -68,6 +68,11 @@ public class DgArchivesReplenishController {
    @GetMapping("doReplenishArchive")
    @ApiOperation(value = "归档")
    public Result doReplenishArchive(@ApiParam("档案补录标识码") @RequestParam String bsmModify,@ApiParam("档案标识码") @RequestParam String bsmArchive){
-        return Result.ok(dgarchivesreplenishService.doReplenishArchive(bsmModify,bsmArchive));
+        boolean flag = dgarchivesreplenishService.doReplenishArchive(bsmModify, bsmArchive);
+        if (flag) {
+            return Result.ok("归档成功");
+        } else {
+            return Result.error("归档失败");
+        }
    }
 }
--- a/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java
View file @ca3bd7a
+++ b/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java
View file @ca3bd7a
 package com.pashanhoo.replenish.service.impl;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pashanhoo.archive.entity.ArchiveStatus;
 import com.pashanhoo.archive.entity.DgArchivesConverter;
 import com.pashanhoo.archive.entity.DgArchivesDO;
 import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
@@ -31,10 +30,12 @@ import com.pashanhoo.common.util.fileupload.MinioConfig;
 import com.pashanhoo.common.util.fileupload.MinioUtil;
 import com.pashanhoo.file.entity.DgFileDO;
 import com.pashanhoo.file.service.DgFileService;
-import com.pashanhoo.archive.entity.ArchiveStatus;
 import com.pashanhoo.replenish.entity.DgArchivesReplenishConverter;
 import com.pashanhoo.replenish.entity.DgArchivesReplenishDO;
-import com.pashanhoo.replenish.entity.vo.*;
+import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
+import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO;
+import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
+import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest;
 import com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper;
 import com.pashanhoo.replenish.service.DgArchivesReplenishService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -220,7 +221,6 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
        //删除卷内目录.测试环境主外键约束需要先删除附件表再删除卷内目录表.所以代码移动到这里
        dgArchivesCatalogService.remove(catalogWrapper);
        //删除档案信息表
        QueryWrapper<DgArchivesDO> archivesWrapper = new QueryWrapper<>();
        archivesWrapper.lambda().in(DgArchivesDO::getBsmArchives, bsmArchives);
@@ -237,7 +237,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
    /**
     * 补录归档
-     * 补录记录的状态为已归档和归档日期，一并修改档案记录的状态为在库,判断卷内目录和每个卷内目录对应的附件列表是否为空,如果为空不能归档
+     * 补录记录的状态为已归档和归档日期，一并修改档案记录的状态为在库,判断卷内目录和每个卷内目录对应的附件列表是否为空,如果为空不能归档.
     *
     * @param bsmModify  补录标识码
     * @param bsmArchive 档案标识码
@@ -245,7 +245,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public boolean doReplenishArchive(String bsmModify,String bsmArchive) {
+    public boolean doReplenishArchive(String bsmModify, String bsmArchive) {
        //判断卷内目录和附件是否有数据
        QueryWrapper<DgArchivesCatalogDO> catalogWrapper = new QueryWrapper<>();
@@ -272,7 +272,7 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
        DgArchivesReplenishDO replenishDO = new DgArchivesReplenishDO();
        replenishDO.setBsmModify(bsmModify);
        replenishUpdateWrapper.lambda().set(DgArchivesReplenishDO::getCreateTime, DateUtil.date()).set(DgArchivesReplenishDO::getState, "2").eq(DgArchivesReplenishDO::getBsmModify, bsmModify);
-        this.update(replenishDO,replenishUpdateWrapper);
+        this.update(replenishDO, replenishUpdateWrapper);
        //更新档案表状态
        UpdateWrapper<DgArchivesDO> archiveUpdateWrapper = new UpdateWrapper<>();