确认上链，先校验空间数据完整

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

@@ -10,6 +10,7 @@ import com.siwei.apply.service.GyjsydjfwscdjService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -98,6 +99,9 @@ public class GyjsydjfwscdjController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            if(CollectionUtils.isEmpty(onChainVo.getIds())){
+                return R.fail(502,"节点为空，确保基本数据填写完毕");
+            }
             for (String id : onChainVo.getIds()) {
                 NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
                 if(Objects.isNull(nodeLand)){

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

@@ -10,6 +10,7 @@ import com.siwei.apply.service.GyjsydscdjService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -97,6 +98,9 @@ public class GyjsydscdjController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            if(CollectionUtils.isEmpty(onChainVo.getIds())){
+                return R.fail(502,"节点为空，确保基本数据填写完毕");
+            }
             for (String id : onChainVo.getIds()) {
                 NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
                 if(Objects.isNull(nodeLand)){

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

@@ -10,6 +10,7 @@ import com.siwei.apply.service.JsgcghxkService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -99,6 +100,9 @@ public class JsgcghxkController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            if(CollectionUtils.isEmpty(onChainVo.getIds())){
+                return R.fail(502,"节点为空，确保基本数据填写完毕");
+            }
             for (String id : onChainVo.getIds()) {
                 NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
                 if(Objects.isNull(nodeLand)){

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

@@ -10,6 +10,7 @@ import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.TdhyhsService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -97,6 +98,9 @@ public class TdhyhsController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            if(CollectionUtils.isEmpty(onChainVo.getIds())){
+                return R.fail(502,"节点为空，确保基本数据填写完毕");
+            }
             for (String id : onChainVo.getIds()) {
                 NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
                 if(Objects.isNull(nodeLand)){

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectWorkflowMapper.java

@@ -53,4 +53,14 @@ public interface ProjectWorkflowMapper {
      * 再按 workflow_name 统计数量，返回字段为 name（workflow_name）与 count
      */
     List<ProjectProcessRes> countMaxWorkflowByName(@Param("projectType") Integer projectType);
+
+
+
+    /**
+     *  查询当前项目下的某个节点ID的数据
+     *
+     */
+    List<ProjectWorkflow> selectProjectOneNodeId(@Param("nodeId") String nodeId);
+
+
 }

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

@@ -1,8 +1,11 @@
 package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.NodeLand;
+import com.siwei.apply.domain.ProjectWorkflow;
 import com.siwei.apply.mapper.NodeLandMapper;
+import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.service.NodeLandService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +24,13 @@ public class NodeLandImpl implements NodeLandService {
     
     @Autowired
     private NodeLandMapper nodeLandMapper;
+
+    @Autowired
+    private ProjectWorkflowMapper projectWorkflowMapper;
+
+
+
+
     
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -138,11 +148,19 @@ public class NodeLandImpl implements NodeLandService {
         }
     }
 
-
     @Override
     public NodeLand getNodeLandByNodeId(String nodeId) {
         // 获取地块ID
         NodeLand nodeLand = nodeLandMapper.selectByNodeId(nodeId);
+        if(Objects.isNull(nodeLand)){
+            //获取当前项目下的固定节点
+            List<ProjectWorkflow>  useProjectWorkflowList =  projectWorkflowMapper.selectProjectOneNodeId(nodeId);
+            if(CollectionUtils.isNotEmpty(useProjectWorkflowList)){
+                String useNodeId = useProjectWorkflowList.get(0).getNodeId();
+                nodeLand = nodeLandMapper.selectByNodeId(useNodeId);
+            }
+            logger.info("未找到项目----固定节点对应的地块信息，nodeId={}", nodeId);
+        }
         if(Objects.isNull(nodeLand)){
             logger.info("未找到节点对应的地块信息，nodeId={}", nodeId);
         }
@@ -152,7 +170,4 @@ public class NodeLandImpl implements NodeLandService {
 
 
 
-
-
-
 }

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectWorkflowMapper.xml

@@ -129,4 +129,26 @@
         ) t
         GROUP BY t.workflow_name
     </select>
+
+
+    <select id="selectProjectOneNodeId" parameterType="map" resultMap="ProjectWorkflowResultMap">
+        SELECT
+            flow2.id,
+            flow2.project_id,
+            flow2.workflow_id,
+            flow2.parent_id,
+            flow2.node_id,
+            flow2.node_table_name,
+            flow2.workflow_name,
+            flow2.created_at,
+            flow2.updated_at
+        FROM "public"."t_project_workflow"  flow1
+        LEFT JOIN "public"."t_project_workflow"  flow2
+        on flow1.project_id=flow2.project_id and  flow2.node_table_name='t_ydbp'
+        WHERE flow1.node_id = #{projectId}
+    </select>
+
+
+
+
 </mapper>