迁移问题处理

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/constants/Constants.java

@@ -161,11 +161,21 @@ public class Constants {
      * 关闭
      */
     public static final String CLOSE = "Close";
+    /**
+     * 全部关闭
+     */
+    public static final String CLOSE_ALL = "qbgb";
     /**
      * 已完成
      */
     public static final String COMPLETED = "completed";
 
+    /**
+     * 已终止
+     */
+    public static final String STATUS_END = "end";
+
+
     /**
      * 未完成
      */

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/constants/SignConstants.java

 package com.yonde.dcs.core.constants;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -81,4 +82,42 @@ public final class SignConstants {
      * 定义流程路由常量
      */
     public final static List WfRoutingList = Arrays.asList("通过", "提交");
+    /**
+     * 流程 节点名称
+     */
+    public static final HashMap<String, String> SignNodeMap = new HashMap(){{
+        put("编制", "BKBZ");
+        put("校对", "BKJD");
+
+        put("审定", "BKSD");
+        put("标检", "BKBJ");
+        put("数据审核", "BKSJ");
+        put("管理审核", "BKGL");
+        put("资料员审核", "BKZL");
+        put("标审", "BKBS");
+        put("会签", "BKHQ");
+
+        put("工艺室分发辅制会签", "BKFZ");
+        put("工艺主制会签", "BKZZ");
+
+        put("审核", "BKSH");
+        put("批准", "BKPZ");
+        put("待审阅", "BKDS");
+        put("设总签审", "BKSZ");
+        put("总体室签审", "BKZT");
+        put("总体室接口工程师签审设总综合检查人", "BKJK");
+        put("综合检查", "BKZH");
+    }};
+    /**
+     * 流程 节点名称
+     */
+    public static final HashMap<String, String> InterfaceSignNodeMap = new HashMap(){
+        {
+            put("审核", "TKSK");
+            put("提资方设总签审", "TKSZ");
+            put("提资中", "TKTJ");
+            put("总体室接口工程师签审", "TKZT");
+        }};
+
+
 }
\ No newline at end of file

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/service/ExtAutoTaskService.java

@@ -7,6 +7,7 @@ import com.yonde.dcs.common.vo.ExtInterfaceVO;
 import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
 import com.yonde.dcs.feign.ExtAutoTaskServiceFeign;
 import com.yonde.dcs.plan.common.vo.ExtPlanVO;
+import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 import lombok.SneakyThrows;
 
 import java.util.Map;
@@ -135,8 +136,8 @@ public interface ExtAutoTaskService extends ExtAutoTaskServiceFeign {
      * @param iterationObject
      */
 
-    // TODO: 2024/7/31  DxIterationVO在4.1不存在
-//    void endProcess(DxIterationVO iterationObject);
+    // TODO: xpc DxIterationVO不存在改为DxIterationVOHolder
+    void endProcess(DxIterationVOHolder iterationObject);
 
     /**
      * 生成过时文件通知单word

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/service/ExtDocService.java

@@ -122,7 +122,7 @@ public interface ExtDocService {
      * @param activityName
      * @return
      */
-   // TODO: xpc 将WfTaskDefinitionVO改为DxWfActivityVO
+    // TODO: xpc 将WfTaskDefinitionVO改为DxWfActivityVO
     String getSignImage(List<DxWfActivityVO> activities, String activityName);
 
     /**

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/util/FileUtils.java

@@ -9,6 +9,7 @@ import com.yonde.dcs.core.constants.Constants;
 import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
 import com.yonde.dex.basedata.entity.data.OperatorType;
 import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.exception.DxBusinessException;
 import com.yonde.dex.dfs.handler.ContentHolder;
 import com.yonde.dex.dfs.vo.ObjFileLinkVO;
 import lombok.SneakyThrows;
@@ -33,6 +34,28 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 public class FileUtils {
+
+
+    /**
+     * 保存到本地目录
+     * @param inputStream
+     * @param fileUrl   文件绝对路径
+     */
+    public static void inputToFile(InputStream inputStream, String fileUrl){
+        OutputStream outputStream = null;
+        try {
+            try {
+                outputStream = new FileOutputStream(fileUrl);
+            } catch (FileNotFoundException e) {
+                log.info("保存到本地临时目录失败：{}！", fileUrl);
+                throw new DxBusinessException("500", "保存文件到本地临时目录失败：" + fileUrl);
+            }
+            IoUtil.copy(inputStream, outputStream);
+        } finally {
+            IoUtil.close(inputStream);
+            IoUtil.close(outputStream);
+        }
+    }
     /**
      * MultipartFile转fie
      *

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/util/ObjFileLinkUtil.java

@@ -4,6 +4,7 @@ import com.yonde.dex.basedata.entity.data.OperatorType;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.dfs.handler.ContentHolder;
 import com.yonde.dex.dfs.vo.ObjFileLinkVO;
+import com.yonde.dex.dfs.vo.RepoFileVO;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -46,17 +47,17 @@ public class ObjFileLinkUtil {
 //        addFile(holder, fileVO, fileType);
 //    }
 //
-//    public static <T extends IdVO & ContentHolder> void addFile(T holder, PapersVO fileVO, String fileType) {
-//        if (CollectionUtils.isEmpty(((ContentHolder)holder).getObjFileLinks())) {
-//            ((ContentHolder)holder).setObjFileLinks(new ArrayList());
-//        }
-//
-//        ObjFileLinkVO linkVo = new ObjFileLinkVO();
-//        linkVo.setTarget(fileVO);
-//        linkVo.setOperator(OperatorType.ADD);
-//        linkVo.setContentType(fileType);
-//        ((ContentHolder)holder).getObjFileLinks().add(linkVo);
-//    }
+    public static <T extends IdVO & ContentHolder> void addFile(T holder, RepoFileVO fileVO, String fileType) {
+        if (CollectionUtils.isEmpty(((ContentHolder)holder).getObjFileLinks())) {
+            ((ContentHolder)holder).setObjFileLinks(new ArrayList());
+        }
+
+        ObjFileLinkVO linkVo = new ObjFileLinkVO();
+        linkVo.setTarget(fileVO);
+        linkVo.setOperator(OperatorType.ADD);
+        linkVo.setContentType(fileType);
+        ((ContentHolder)holder).getObjFileLinks().add(linkVo);
+    }
 
 
     /**
@@ -148,15 +149,16 @@ public class ObjFileLinkUtil {
      * @param <T>
      * @return
      */
-//    public static <T extends IdVO & ContentHolder> List<PapersVO> getAppointTypeFile(T holder, String fileType) {
-//        if (!Objects.isNull(holder) && !CollectionUtils.isEmpty(((ContentHolder) holder).getObjFileLinks())) {
-//            List<ObjFileLinkVO> fileLinkVOList = holder.getObjFileLinks().stream().filter(o -> o.getContentType().equalsIgnoreCase(fileType)).collect(Collectors.toList());
-//            if (!CollectionUtils.isEmpty(fileLinkVOList)) {
-//                return fileLinkVOList.stream().map(ObjFileLinkVO::getTarget).collect(Collectors.toList());
-//            }
-//        }
-//        return null;
-//    }
+
+    public static <T extends IdVO & ContentHolder> List<RepoFileVO> getAppointTypeFile(T holder, String fileType) {
+        if (!Objects.isNull(holder) && !CollectionUtils.isEmpty(((ContentHolder) holder).getObjFileLinks())) {
+            List<ObjFileLinkVO> fileLinkVOList = holder.getObjFileLinks().stream().filter(o -> o.getContentType().equalsIgnoreCase(fileType)).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(fileLinkVOList)) {
+                return fileLinkVOList.stream().map(ObjFileLinkVO::getTarget).collect(Collectors.toList());
+            }
+        }
+        return null;
+    }
 
     /**
      * 获取对象指定 类型的file

dcs-doc-expand-core/src/main/java/com/yonde/dcs/core/util/WorkFlowUtil.java

@@ -45,10 +45,7 @@ public class WorkFlowUtil {
      * @param iterationVO
      * @return
      */
-    // TODO: 2024/8/1  DxIterationVO不存在
-
-
-    // TODO: xpc WfProcessInstVO不存在改为DxWfProcessVO，IterationVO不存在改为DxIterationVOHolder
+    // TODO: xpc WfProcessInstVO不存在改为DxWfProcessVO，DxIterationVO不存在改为DxIterationVOHolder
     public DxWfProcessVO getWfProcessInst(DxIterationVOHolder iterationVO) {
         // TODO:  getProcessInstList方法不存在改为getProcessList
 //        DxWfProcessSearchVO wfProcessInstSearchVO = new DxWfProcessSearchVO();