处理移动时的重名

doc-biz/src/main/java/com/doc/biz/service/impl/DocInfoServiceImpl.java

@@ -2,9 +2,11 @@ package com.doc.biz.service.impl;
 
 import com.doc.biz.domain.DocFavorite;
 import com.doc.biz.domain.DocInfo;
-import com.doc.biz.domain.DocRecent;
 import com.doc.biz.mapper.DocInfoMapper;
-import com.doc.biz.service.*;
+import com.doc.biz.service.IDocFavoriteService;
+import com.doc.biz.service.IDocInfoService;
+import com.doc.biz.service.IDocSpaceService;
+import com.doc.biz.service.IElasticSearchService;
 import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.StringUtils;
@@ -92,6 +94,22 @@ public class DocInfoServiceImpl implements IDocInfoService {
     @Override
     public int insertDocInfo(DocInfo docInfo) {
         docInfo.setCreateTime(DateUtils.getNowDate());
+
+        checkDuplicateNames(docInfo);
+
+        int i = docInfoMapper.insertDocInfo(docInfo);
+        elasticSearchService.save(docInfo);
+        //改变空间容量
+        spaceService.updateUsedCap(docInfo.getSpaceId());
+        return i;
+    }
+
+    /**
+     * 检查重名
+     *
+     * @param docInfo 文件信息
+     */
+    private void checkDuplicateNames(DocInfo docInfo) {
         DocInfo query = new DocInfo();
         query.setDirId(docInfo.getDirId());
         query.setFileName(docInfo.getFileName());
@@ -102,11 +120,6 @@ public class DocInfoServiceImpl implements IDocInfoService {
             docInfo.setFileName(fileName);
         }
 
-        int i = docInfoMapper.insertDocInfo(docInfo);
-        elasticSearchService.save(docInfo);
-        //改变空间容量
-        spaceService.updateUsedCap(docInfo.getSpaceId());
-        return i;
     }
 
     /**
@@ -117,7 +130,10 @@ public class DocInfoServiceImpl implements IDocInfoService {
      */
     @Override
     public int updateDocInfo(DocInfo docInfo) {
+        checkDuplicateNames(docInfo);
+
         docInfo.setUpdateTime(DateUtils.getNowDate());
+
         int i = docInfoMapper.updateDocInfo(docInfo);
 
         if (StringUtils.isNotEmpty(docInfo.getFileId())) {