修改目录重名规则

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

@@ -95,23 +95,32 @@ public class DocDirServiceImpl implements IDocDirService {
     @Override
     public int insertDocDir(DocDir docDir) {
         docDir.setCreateTime(DateUtils.getNowDate());
+        checkDuplicateNames(docDir);
+        //如果设置了访问码，则需要加密存储
+        if (StringUtils.isNotEmpty(docDir.getAccessCode())) {
+            String pass = SecurityUtils.encryptPassword(docDir.getAccessCode());
+            docDir.setAccessCode(pass);
+        }
+
+        return docDirMapper.insertDocDir(docDir);
+    }
+
+    /**
+     * 检查重名
+     *
+     * @param docDir 目录信息
+     */
+    private void checkDuplicateNames(DocDir docDir) {
         DocDir query = new DocDir();
         query.setParentId(docDir.getParentId());
         query.setSearchValue(docDir.getDirName());
         List list = selectDocDirList(query);
         if (list.size() > 0) {
             String dirName = docDir.getDirName();
-            dirName = DateUtils.dateTimeNow() + "-" + dirName;
+            dirName = dirName + "-" + DateUtils.dateTimeNow();
             docDir.setDirName(dirName);
         }
 
-        //如果设置了访问码，则需要加密存储
-        if (StringUtils.isNotEmpty(docDir.getAccessCode())) {
-            String pass = SecurityUtils.encryptPassword(docDir.getAccessCode());
-            docDir.setAccessCode(pass);
-        }
-
-        return docDirMapper.insertDocDir(docDir);
     }
 
     /**
@@ -122,6 +131,7 @@ public class DocDirServiceImpl implements IDocDirService {
      */
     @Override
     public int updateDocDir(DocDir docDir) {
+        checkDuplicateNames(docDir);
         docDir.setUpdateTime(DateUtils.getNowDate());
         return docDirMapper.updateDocDir(docDir);
     }