调整资源依赖关系

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/UnifyAttachmentEnum.java

@@ -0,0 +1,8 @@
+package com.siwei.apply.common;
+
+public interface UnifyAttachmentEnum {
+    String getName();
+    String getCode();
+    String getRelationName();
+    String getParentName();
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsgcghxkController.java

@@ -104,7 +104,7 @@ public class JsgcghxkController extends BaseController {
     /**
      * 更新建设工程规划许可的上链状态
      */
-    @PutMapping("/onchain")
+    @PutMapping("ain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
             if(CollectionUtils.isEmpty(onChainVo.getIds())){

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeAttachmentController.java

@@ -134,10 +134,9 @@ public class NodeAttachmentController extends BaseController {
             if (nodeId == null || nodeId.trim().isEmpty()) {
                 return R.fail("nodeId不能为空");
             }
-
-            NodeAttachment nodeAttachment = nodeAttachmentService.getByNodeId(nodeId);
+            //获取附件信息及依赖关系
+            NodeAttachment nodeAttachment = nodeAttachmentService.getNodeAttachmentData(nodeId);
             return R.ok(nodeAttachment);
-
         } catch (Exception e) {
             logger.error("查询节点附件信息异常", e);
             return R.fail("查询节点附件信息异常：" + e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/AloneWorkFlowEnum.java

@@ -0,0 +1,37 @@
+package com.siwei.apply.enums;
+
+/**
+ * 流程表名枚举
+ */
+public enum AloneWorkFlowEnum {
+    NODE_0("0", "用地预审与选址","t_ydysyxz"),
+    NODE_1("1", "用地报批","t_ydbp"),
+    NODE_2("2", "土地供应","t_tdgy"),
+    NODE_3("3", "国有建设用地使用权首次登记","t_gyjsydscdj"),
+    NODE_4("4", "建设用地规划许可","t_jsydghxk"),
+    NODE_5("5", "建设工程规划许可","t_jsgcghxk"),
+    NODE_6("6", "土地核验与规划核实","t_tdhyhs"),
+    NODE_7("7", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfw");
+
+    private final String index;
+    private final String name;
+    private final String tableName;
+
+    AloneWorkFlowEnum(String index, String name,String tableName)
+    {
+        this.index = index;
+        this.name = name;
+        this.tableName = tableName;
+    }
+    public String getIndex() {
+        return index;
+    }
+    public String getName() {
+        return name;
+    }
+    public String getTableName() {
+        return tableName;
+    }
+
+
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/BatchWorkFlowEnum.java

@@ -0,0 +1,37 @@
+package com.siwei.apply.enums;
+
+/**
+ * 流程表名枚举
+ */
+public enum BatchWorkFlowEnum {
+    NODE_0("0", "规划条件与用地红线出具","t_tjyydhx"),
+    NODE_0_5("0.5", "用地报批","t_ydbp_data"),
+    NODE_1("1", "土地供应","t_tdgy"),
+    NODE_2("2", "国有建设用地使用权首次登记","t_gyjsydscdj"),
+    NODE_3("3", "建设用地规划许可","t_jsydghxk"),
+    NODE_4("4", "建设工程规划许可","t_jsgcghxk"),
+    NODE_5("5", "土地核验与规划核实","t_tdhyhs"),
+    NODE_6("6", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfwscdj");
+
+    private final String index;
+    private final String name;
+    private final String tableName;
+
+    BatchWorkFlowEnum(String index, String name, String tableName)
+    {
+        this.index = index;
+        this.name = name;
+        this.tableName = tableName;
+    }
+    public String getIndex() {
+        return index;
+    }
+    public String getName() {
+        return name;
+    }
+    public String getTableName() {
+        return tableName;
+    }
+
+
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/GyjsydjfwscdjAttachmentNameEnum.java

@@ -1,11 +1,13 @@
 package com.siwei.apply.enums;
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  *
  * 国有建设用地使用权及房屋所有权首次登记
  *
  */
-public enum GyjsydjfwscdjAttachmentNameEnum {
+public enum GyjsydjfwscdjAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "主体资格文件", "主体资格文件", "国有建设用地使用权及房屋所有权首次登记"),
     NAME_2("2", "权属来源证明", "登记结果", "国有建设用地使用权及房屋所有权首次登记"),
     NAME_3("3", "竣工验收材料", "核实后材料", "国有建设用地使用权及房屋所有权首次登记"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/GyjsydscdjAttachmentNameEnum.java

@@ -1,10 +1,12 @@
 package com.siwei.apply.enums;
 
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 国有建设用地使用权首次登记阶段
  */
-public enum GyjsydscdjAttachmentNameEnum {
+public enum GyjsydscdjAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "申请表及询问笔录", "", "国有建设用地使用权首次登记阶段资料"),
     NAME_2("2", "主体资格文件", "主体资格文件", "国有建设用地使用权首次登记阶段资料"),
     NAME_3("3", "测绘成果", "出让图形|规划红线图", "国有建设用地使用权首次登记阶段资料"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/JsgcghxkAttachmentNameEnum.java

@@ -1,12 +1,13 @@
 package com.siwei.apply.enums;
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
 import lombok.Getter;
 
 /**
  * 建设工程规划许可阶段
  */
 @Getter
-public enum JsgcghxkAttachmentNameEnum {
+public enum JsgcghxkAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "建设工程规划许可申请表", "", "建设工程规划许可阶段"),
     NAME_2("2", "建设项目批准、核准、备案文件", "建设项目批准、核准、备案文件", "建设工程规划许可阶段"),
     NAME_3("3", "使用土地的有关证明文件", "土地出让合同", "建设工程规划许可阶段"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/JsydghxkAttachmentNameEnum.java

@@ -1,9 +1,11 @@
 package com.siwei.apply.enums;
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 建设用地规划许可阶段
  */
-public enum JsydghxkAttachmentNameEnum {
+public enum JsydghxkAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "建设用地规划许可申请表", "", "建设用地规划许可阶段"),
     NAME_2("2", "建设项目批准、核准、备案文件", "", "建设用地规划许可阶段"),
     NAME_3("3", "使用土地的有关证明文件", "土地出让合同", "建设用地规划许可阶段"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/TdgyAttachmentNameEnum.java

@@ -1,10 +1,12 @@
 package com.siwei.apply.enums;
 
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 土地供应阶段
  */
-public enum TdgyAttachmentNameEnum {
+public enum TdgyAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "土地权属来源文件", "用地批复", "土地供应阶段"),
     NAME_2("2", "规划条件出具", "用地红线|规划条件出具", "土地供应阶段"),
     NAME_3("3", "出让图形", "用地红线", "土地供应阶段"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/TdhyhsAttachmentNameEnum.java

@@ -1,9 +1,11 @@
 package com.siwei.apply.enums;
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 土地核验与规划核实阶段
  */
-public enum TdhyhsAttachmentNameEnum {
+public enum TdhyhsAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "建设工程土地核验与规划核实申请表", "", "土地核验与规划核实阶段"),
     NAME_2("2", "规划许可证", "办理结果", "土地核验与规划核实阶段"),
     NAME_3("3", "土地权属证明材料", "GyjsydjfwscdjAttachmentNameEnum-登记结果|土地出让合同", "土地核验与规划核实阶段"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/TjyydhxAttachmentNameEnum.java

@@ -1,10 +1,12 @@
 package com.siwei.apply.enums;
 
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 规划条件与用地红线出具
  */
-public enum TjyydhxAttachmentNameEnum {
+public enum TjyydhxAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "建设用地涉及的详细规划批复及图则", "", "规划条件与用地红线出具"),
     NAME_2("2", "用地红线", "", "规划条件与用地红线出具"),
     NAME_3("3", "规划红线图", "", "规划条件与用地红线出具"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/YdbpAttachmentNameEnum.java

@@ -1,9 +1,11 @@
 package com.siwei.apply.enums;
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 用地报批阶段
  */
-public enum YdbpAttachmentNameEnum {
+public enum YdbpAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "项目红线", "", "用地报批阶段资料"),
     NAME_2("2", "权属情况", "", "用地报批阶段资料"),
     NAME_3("3", "公告文件", "", "用地报批阶段资料"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/YdysyxzAttachmentNameEnum.java

@@ -1,10 +1,12 @@
 package com.siwei.apply.enums;
 
 
+import com.siwei.apply.common.UnifyAttachmentEnum;
+
 /**
  * 用地预审选址附件名称枚举
  */
-public enum YdysyxzAttachmentNameEnum {
+public enum YdysyxzAttachmentNameEnum implements UnifyAttachmentEnum {
     NAME_1("1", "建设项目用地预审(选址意见书)申请报告", "", "预审与选址意见书阶段资料"),
     NAME_2("2", "项目建设依据", "", "预审与选址意见书阶段资料"),
     NAME_3("3", "测量报告", "", "预审与选址意见书阶段资料"),

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/NodeAttachmentService.java

@@ -54,4 +54,7 @@ public interface NodeAttachmentService {
 
     List<NodeAttachment> getByNodeIdList(List<String> nodeIdList);
 
-}
+    NodeAttachment getNodeAttachmentData(String nodeId);
+
+
+    }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/NodeAttachmentImpl.java

@@ -1,9 +1,21 @@
 package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.NodeAttachment;
+import com.siwei.apply.domain.Project;
+import com.siwei.apply.domain.ProjectWorkflow;
+import com.siwei.apply.domain.res.TdgyRes;
+import com.siwei.apply.enums.*;
 import com.siwei.apply.mapper.NodeAttachmentMapper;
+import com.siwei.apply.mapper.ProjectMapper;
+import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.service.NodeAttachmentService;
+import com.siwei.apply.service.TdgyService;
 import com.siwei.apply.utils.FileExtractUtil;
+import com.siwei.apply.utils.ServiceUtil;
+import com.siwei.common.core.domain.R;
+import com.siwei.common.core.exception.ServiceException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.nio.file.*;
 import java.util.*;
 
+import static com.siwei.apply.utils.ServiceUtil.assemblyAttachment;
+
 /**
  * 记录流程对应的附件材料 服务实现类
  */
@@ -24,6 +38,15 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
     @Autowired
     private NodeAttachmentMapper nodeAttachmentMapper;
 
+    @Autowired
+    private ProjectWorkflowMapper projectWorkflowMapper;
+
+    @Autowired
+    private ProjectMapper projectMapper;
+
+    @Autowired
+    private TdgyService tdgyService;
+
     /**
      * 根据ID查询附件信息
      * @param id 附件ID
@@ -275,5 +298,109 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
 
 
 
+    /**
+     * 根据节点ID获取当前节点的附件信息
+     * 这里需要合并依赖关系的附件资料引用复用等
+     * @param nodeId 节点ID
+     * @return
+     */
+    /**
+     *
+     *
+     *             1.先判断，当前节点是否存在引用关系。
+     *             2.如果不存在直接返回。
+     *             3.查询出当前节点信息，解析object对象
+     *             4.如果存在引用关系，查询出所有被引用节点的附件信息
+     *             5.重新组装object信息并且生成json对象展示。
+     *
+     *              找到当前枚举类，
+     *              查看其依赖关系
+     *              根据依赖关系把其它数据进行整理。
+     *
+     *
+     */
+    @Override
+    public NodeAttachment getNodeAttachmentData(String nodeId) {
+        try {
+            NodeAttachment nodeAttachment = this.getByNodeId(nodeId);
+            ProjectWorkflow projectWorkflow = null;
+            //根据节点获取表名
+            List<ProjectWorkflow> projectWorkflowList = projectWorkflowMapper.selectByNodeId(nodeId,null);
+            if(CollectionUtils.isNotEmpty(projectWorkflowList) && Objects.nonNull(projectWorkflowList.get(0))) {
+                projectWorkflow = projectWorkflowList.get(0);
+            }
+            if(Objects.isNull(projectWorkflow)) {
+                throw new ServiceException("未查询到节点对应的流程信息，nodeId: " + nodeId);
+            }
+            String nodeTableName = projectWorkflow.getNodeTableName();
+            Project project =projectMapper.get(projectWorkflow.getProjectId());
+            Integer projectType = project.getProjectType();
+
+            //最终结果集合
+            Map <String, List<String>> currentNodeAttachmentMap = new LinkedHashMap<>();
+            Map <String, List<String>> relationNodeAttachmentMap = new LinkedHashMap<>();
+
+            //单独选址
+            if(ProjectType.ALONE.getCode().equals(String.valueOf(projectType))){
+                nodeTableName = "t_ydbp";
+            }else if(ProjectType.BATCH.getCode().equals(String.valueOf(projectType))){
+                if(AloneWorkFlowEnum.NODE_2.getTableName().equalsIgnoreCase(nodeTableName)){
+                    //规划条件，用地红线出具：查找所有的批次报批节点进行合并
+                    //取当前节点数据内容；
+                    TdgyRes tdgy = tdgyService.getById(nodeId);
+                    String gdType = tdgy.getGdType();
+                    if("出让".equals(gdType)) {
+                        //处理-规划条件出具依赖
+                        currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(TdgyAttachmentNameEnum.NAME_2,currentNodeAttachmentMap,relationNodeAttachmentMap);
+                        //处理-出让图形依赖
+                        relationNodeAttachmentMap = new LinkedHashMap<>();
+                        currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(TdgyAttachmentNameEnum.NAME_3,currentNodeAttachmentMap,relationNodeAttachmentMap);
+
+                    }else if("划拨".equals(gdType)) {
+
+                    }
+                } else if(AloneWorkFlowEnum.NODE_3.getTableName().equalsIgnoreCase(nodeTableName)){
+                    //处理-规划条件出具依赖
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(GyjsydscdjAttachmentNameEnum.NAME_2,currentNodeAttachmentMap,relationNodeAttachmentMap);
+
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(GyjsydscdjAttachmentNameEnum.NAME_3,currentNodeAttachmentMap,relationNodeAttachmentMap);
+
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(GyjsydscdjAttachmentNameEnum.NAME_4,currentNodeAttachmentMap,relationNodeAttachmentMap);
+
+                } else if(AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(nodeTableName)){
+                    //处理-规划条件出具依赖
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(JsydghxkAttachmentNameEnum.NAME_3,currentNodeAttachmentMap,relationNodeAttachmentMap);
+
+                } else if(AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(nodeTableName)){
+                    //处理-规划条件出具依赖
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(JsgcghxkAttachmentNameEnum.NAME_2,currentNodeAttachmentMap,relationNodeAttachmentMap);
+
+                } else if(AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(nodeTableName)){
+                    //处理-规划条件出具依赖
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(TdhyhsAttachmentNameEnum.NAME_2,currentNodeAttachmentMap,relationNodeAttachmentMap);
+                }else if(AloneWorkFlowEnum.NODE_7.getTableName().equalsIgnoreCase(nodeTableName)){
+                    //处理-规划条件出具依赖
+                    relationNodeAttachmentMap = new LinkedHashMap<>();
+                    currentNodeAttachmentMap = ServiceUtil.assemblyAttachment(GyjsydjfwscdjAttachmentNameEnum.NAME_1,currentNodeAttachmentMap,relationNodeAttachmentMap);
+                }
+            }
+
+
+
+            return null;
+        } catch (Exception e) {
+            logger.error("查询节点附件信息异常，nodeId: {}", nodeId, e);
+            return null;
+        }
+    }
+
+
+
 
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/utils/ServiceUtil.java

@@ -0,0 +1,97 @@
+package com.siwei.apply.utils;
+
+import com.siwei.apply.common.UnifyAttachmentEnum;
+import com.siwei.apply.enums.GyjsydjfwscdjAttachmentNameEnum;
+import com.siwei.apply.enums.TdhyhsAttachmentNameEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+
+/**
+ * 服务类工具
+ */
+public class ServiceUtil {
+    /**
+     * 传递一个表名称，获取当前枚举对象
+     */
+    public static String getEnumName(String tableName) throws Exception {
+        Map<String , GyjsydjfwscdjAttachmentNameEnum> enumMap = new HashMap<>();
+        //enumMap.put("aaa", GyjsydjfwscdjAttachmentNameEnum);
+        Map<String,Class<TdhyhsAttachmentNameEnum>> map = new HashMap<>();
+        map.put("dd", TdhyhsAttachmentNameEnum.class);
+        Class<TdhyhsAttachmentNameEnum> zz =  map.get("dd");
+        TdhyhsAttachmentNameEnum obj = zz.getDeclaredConstructor().newInstance();
+        obj.values();
+
+
+//        GyjsydjfwscdjAttachmentNameEnum 国有建设用地使用权及房屋所有权首次登记
+//        GyjsydscdjAttachmentNameEnum        国有建设用地使用权首次登记阶段
+//        JsgcghxkAttachmentNameEnum          建设工程规划许可阶段
+//        JsydghxkAttachmentNameEnum          建设用地规划许可阶段
+//        ProjectType                         (未在项目中找到定义，可能表示项目类型枚举)
+//        RegistrationProcessType             (未在项目中找到定义，可能表示登记流程类型枚举)
+//        TdgyAttachmentNameEnum              土地供应阶段
+//        TdhyhsAttachmentNameEnum            土地核验与规划核实阶段
+//        TjyydhxAttachmentNameEnum           规划条件与用地红线出具
+//        YdbpAttachmentNameEnum              用地报批阶段
+//        YdysyxzAttachmentNameEnum           用地预审选址附件名称枚举
+
+        return null;
+    }
+
+    /**
+     * 组装附件信息,处理依赖关系
+     * @param attachmentEnum
+     * @param currentNodeAttachmentMap
+     * @param relationNodeAttachmentMap
+     * @return
+     */
+    public static Map <String, List<String>>  assemblyAttachment(UnifyAttachmentEnum attachmentEnum,Map <String, List<String>> currentNodeAttachmentMap, Map <String, List<String>> relationNodeAttachmentMap){
+        String name =  attachmentEnum.getName();
+        List<String> relationNameList = new ArrayList();
+        String relationNameStr =  attachmentEnum.getRelationName();
+        if(StringUtils.isNotBlank(relationNameStr)){
+            relationNameList = Arrays.asList(relationNameStr.split("\\|"));
+        }
+        /**
+         *
+         * 这里处理依赖关系
+         * 先判断当前是否存在该资料
+         * 1.如果当前节点附件信息不包含该资料，则进行合并
+         * 获取依赖的map，写一个方法：
+         *
+         *
+         */
+        List<String> currentAttachmentList = new ArrayList<>();
+        if(!currentNodeAttachmentMap.containsKey(name) || CollectionUtils.isEmpty(currentNodeAttachmentMap.get(name))) {
+            //这里需要查询并整理所有批次报批节点，查询，
+            if(CollectionUtils.isNotEmpty(relationNameList)) {
+                for(String relationName : relationNameList) {
+                    if (relationNodeAttachmentMap.containsKey(relationName) && CollectionUtils.isNotEmpty(relationNodeAttachmentMap.get(relationName))){
+                        currentAttachmentList.addAll(relationNodeAttachmentMap.get(relationName));
+                    }
+                }
+            }
+        }
+        //第一个依赖关系解决
+        currentNodeAttachmentMap.put(name,currentAttachmentList);
+        return currentNodeAttachmentMap;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}