文件上传补充注释

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java

@@ -154,7 +154,9 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         String projectId = planinfoService.getById(planinfoid).getProjectId();
         HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
         // 提交试运行阶段的时候自动创建 计划
-        if("试运行阶段".equals(taskName) && !projectinfoService.queryIsSubProject(projectId)){
+        List<String> taskNames = Arrays.asList("提交终验申请","联合验收审批");
+        Boolean flag1 = checkTaskNamesExist(taskNames, projectId);
+        if("试运行阶段".equals(taskName) && !projectinfoService.queryIsSubProject(projectId) && !flag1){
             LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfo.getProjectId());
             queryWrapper.eq(HuzhouPlaninfo::getTaskName,"试运行阶段");
@@ -186,7 +188,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             }
         }
         // 不存在子项目则会自动创建流程
-        if ("终验阶段".equals(taskName) && !projectinfoService.queryIsSubProject(projectId)) {
+        Boolean flag2 = checkTaskNamesExist(Arrays.asList("提交核验申请","部门集中核验","上传核验报告"), projectId);
+        if ("终验阶段".equals(taskName) && !projectinfoService.queryIsSubProject(projectId) && !flag2) {
             autoCreatPlanAfterFinal(planinfo);
         }
 
@@ -349,6 +352,24 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         }
     }
 
+    /**
+     * 判断指定任务是否已经存在(避免重复创建)
+     * @param taskNames
+     * @param projectId
+     */
+    private Boolean checkTaskNamesExist(List<String> taskNames, String projectId) {
+        LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(HuzhouPlaninfo::getProjectId, projectId);
+        queryWrapper.in(HuzhouPlaninfo::getTaskName, taskNames);
+        List<HuzhouPlaninfo> planinfoList = planinfoMapper.selectList(queryWrapper);
+        if (planinfoList.size() > 0){
+            // 指定的流程已经存在
+            return true;
+        }else {
+            return false;
+        }
+    }
+
     private void basicFlowUpdate(String planinfoid, ArrayList<String> strings, WorkFlow workFlow) {
         Task task = workFlow.getTask();
         String taskId = task.getId();

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouRegulationlabServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.easy.admin.auth.model.SysUser;
 import com.easy.admin.modules.huzhou.dao.HuzhouRegulationlabMapper;
 import com.easy.admin.util.ShiroUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import com.easy.admin.common.util.CommonUtils;
 import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab;
@@ -29,7 +30,7 @@ import java.util.zip.ZipOutputStream;
 
 @Service
 @Transactional
-
+@Slf4j
 public class HuzhouRegulationlabServiceImpl extends ServiceImpl<HuzhouRegulationlabMapper, HuzhouRegulationlab> implements IHuzhouRegulationlabService {
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -77,6 +78,7 @@ public class HuzhouRegulationlabServiceImpl extends ServiceImpl<HuzhouRegulation
     public Boolean deleteRegulationlab(HuzhouRegulationlab regulationlab) {
         String id = regulationlab.getId();
         regulationlab = this.getById(id);
+        // 根据路径删除
         File file = new File(regulationlab.getDocumentPath());
         if(file.delete()){
             this.removeById(id);
@@ -120,21 +122,29 @@ public class HuzhouRegulationlabServiceImpl extends ServiceImpl<HuzhouRegulation
         String currentDay = dateFormat.format(new Date());
         SysUser currentUser = ShiroUtil.getCurrentUser();
         String nickname = currentUser.getNickname();
+        String separator = File.separator;
+        log.info(separator);
         File filePath = new File(uploadpath +File.separator+"regulationlab"+ File.separator+nickname+ File.separator+currentDay+File.separator);
         //文件夹不存在则创建
         if (!filePath.exists()) {
             // 创建文件根目录
             filePath.mkdirs();
         }
+        log.info("文件根目录{}",filePath);
         String fileName =null;
         String originalFilename = file.getOriginalFilename();
-        originalFilename = CommonUtils.getFileName(originalFilename);
-        if(originalFilename.indexOf(".")!=-1){
-            fileName = originalFilename.substring(0, originalFilename.lastIndexOf(".")) + "_" + System.currentTimeMillis() + originalFilename.substring(originalFilename.lastIndexOf("."));
-        }else{
-            fileName = originalFilename+ "_" + System.currentTimeMillis();
+        if (originalFilename != null){
+            originalFilename = CommonUtils.getFileName(originalFilename);
+            if(originalFilename.contains(".")){
+                fileName = originalFilename.substring(0, originalFilename.lastIndexOf(".")) + "_" + System.currentTimeMillis() + originalFilename.substring(originalFilename.lastIndexOf("."));
+            }else{
+                fileName = originalFilename+ "_" + System.currentTimeMillis();
+            }
         }
+
         String savePath = filePath.getPath() + File.separator + fileName;
+        log.info("文件保存路径{}",savePath);
+
         File savefile = new File(savePath);
         FileCopyUtils.copy(file.getBytes(), savefile);//保存文件
         regulationlab.setDocumentName(originalFilename);//未加工过的文件名称