Merge branch 'test' into develop

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/aop/RoleCheckAspect.java

@@ -8,7 +8,6 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 
-
 @Component
 @Aspect
 public class RoleCheckAspect {

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java

@@ -116,6 +116,16 @@ public class EdFileInfo extends BaseModel {
     @TableField(value = "prj_dir")
     private Boolean prjDir;
 
+    /** 当一个文件作废时，其所有的历史文件也会跟着作废，此时该文件及其历史文件的all_deleted=true**/
+    @TableField(value = "all_deleted")
+    private Boolean allDeleted;
+
+    /**
+     * 当文件被管理员永久物理删除，此时为true
+     */
+    @TableField(value = "permanent_deleted")
+    private Boolean permanentDeleted;
+
     public void newInit() {
         String userId = UserThreadLocal.getUserId();
         String newFileDbId = IdWorker.getSnowFlakeIdString();

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

@@ -209,7 +209,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .set(EdFileInfo::getUpdatedBy, currentUserId)
                 .set(EdFileInfo::getUpdatedTime, now)
                 .set(EdFileInfo::getEffectFlag, false)
-                .eq(EdFileInfo::getId, id));
+                .set(EdFileInfo::getAllDeleted, true)
+                .eq(EdFileInfo::getFileId, fileInfo.getFileId()));
         return ElectromagneticResultUtil.success(true);
     }
 
@@ -412,7 +413,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         AES aes = SecureUtil.aes(FILE_SEC_PASSWD.getBytes());
         try (
                 InputStream inputStream = Files.newInputStream(Paths.get(destColibPath));
-                OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath));
+                OutputStream outputStream = Files.newOutputStream(Paths.get(zipDirPath))
         ) {
             aes.decrypt(inputStream, outputStream, true);
         } catch (Exception e) {
@@ -1141,11 +1142,10 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         }
         // 合并分片
         String destColibPath = uploadDataDir + File.separator + currentUserId + File.separator + fileName;
-        File[] partFiles = FileUtil.ls(uploadDataDir + File.separator + currentUserId + File.separator + identifier);
+        String path = uploadDataDir + File.separator + currentUserId + File.separator + identifier;
-
+        BufferedOutputStream outputStream = FileUtil.getOutputStream(destColibPath);
-        for (File partFile : partFiles) {
+        for (int i = 1; i <= totalChunks; i++) {
-            try (BufferedOutputStream outputStream = FileUtil.getOutputStream(destColibPath);
+            try (BufferedInputStream inputStream = FileUtil.getInputStream(path + File.separator + i + UPLOAD_FILE_CHUNK_SUFFIX)) {
-                 BufferedInputStream inputStream = FileUtil.getInputStream(partFile)) {
                 IoUtil.copy(inputStream, outputStream);
             } catch (Exception e) {
                 FileUtil.del(destColibPath);
@@ -1154,7 +1154,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 throw new BizException(info);
             }
         }
-        Arrays.stream(partFiles).forEach(e -> FileUtil.del(e.getAbsolutePath()));
+        FileUtil.del(path);
         return destColibPath;
     }
 
@@ -1171,6 +1171,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         if(file.getId().length()<6){
             throw new StringIndexOutOfBoundsException("此文件的FILE_CODE小于六位："+id);
         }
+        if(file.getPrjDir().equals(Boolean.TRUE)){
+            return id;
+        }
         return file.getFileCode().substring(0, 6);
     }
 

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

@@ -206,7 +206,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
         Assert.isTrue(EleCommonUtil.isFileNameValid(folderName), NAME_VALID_MSG);
         // 检查当前目录下有文件，如果有则不允许添加
         long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
-                .eq(EdFileInfo::getDataStatus, EleDataTypeEnum.FILE.code)
+                .eq(EdFileInfo::getFileType, EleDataTypeEnum.FILE.code)
                 .eq(EdFileInfo::getParentId, parentId)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
         Assert.isTrue(count == 0, "该层级目录下存在文件，不允许再定义层级目录");