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

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

@@ -1,11 +1,13 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.GyjsydjfwscdjRes;
 import com.siwei.apply.domain.res.GyjsydjfwscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjVo;
 import com.siwei.apply.domain.vo.OnChainVo;
 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.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 国有建设用地使用权及房屋所有权首次登记 控制器
@@ -24,6 +27,8 @@ import java.util.Map;
 public class GyjsydjfwscdjController extends BaseController {
     @Autowired
     private GyjsydjfwscdjService gyjsydjfwscdjService;
+    @Autowired
+    NodeLandService nodeLandService;
 
     /**
      * 添加国有建设用地使用权及房屋所有权首次登记
@@ -93,6 +98,12 @@ public class GyjsydjfwscdjController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            for (String id : onChainVo.getIds()) {
+                NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+                if(Objects.isNull(nodeLand)){
+                    return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+                }
+            }
             for (String id : onChainVo.getIds()) {
                 gyjsydjfwscdjService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }

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

@@ -1,11 +1,13 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.GyjsydscdjRes;
 import com.siwei.apply.domain.res.GyjsydscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydscdjVo;
 import com.siwei.apply.domain.vo.OnChainVo;
 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.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 国有建设用地使用权首次登记 控制器
@@ -24,7 +27,8 @@ import java.util.Map;
 public class GyjsydscdjController extends BaseController {
     @Autowired
     private GyjsydscdjService gyjsydscdjService;
-
+    @Autowired
+    NodeLandService nodeLandService;
     /**
      * 添加国有建设用地使用权首次登记
      */
@@ -93,6 +97,12 @@ public class GyjsydscdjController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            for (String id : onChainVo.getIds()) {
+                NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+                if(Objects.isNull(nodeLand)){
+                    return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+                }
+            }
             for (String id : onChainVo.getIds()) {
                 gyjsydscdjService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }

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

@@ -1,11 +1,13 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.JsgcghxkRes;
 import com.siwei.apply.domain.res.JsgcghxkSinglRes;
 import com.siwei.apply.domain.vo.JsgcghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsgcghxkVo;
 import com.siwei.apply.domain.vo.OnChainVo;
 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.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 建设工程规划许可 控制器
@@ -25,7 +28,8 @@ public class JsgcghxkController extends BaseController {
 
     @Autowired
     private JsgcghxkService jsgcghxkService;
-
+    @Autowired
+    NodeLandService nodeLandService;
     /**
      * 添加建设工程规划许可
      */
@@ -95,6 +99,12 @@ public class JsgcghxkController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            for (String id : onChainVo.getIds()) {
+                NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+                if(Objects.isNull(nodeLand)){
+                    return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+                }
+            }
             for (String id : onChainVo.getIds()) {
                 jsgcghxkService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }

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

@@ -1,9 +1,11 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.JsydghxkRes;
 import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsydghxkVo;
 import com.siwei.apply.service.JsydghxkService;
+import com.siwei.apply.service.NodeLandService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 建设用地规划许可 控制器
@@ -22,6 +25,8 @@ import java.util.Map;
 public class JsydghxkController extends BaseController {
     @Autowired
     private JsydghxkService jsydghxkService;
+    @Autowired
+    NodeLandService nodeLandService;
 
     /**
      * 添加建设用地规划许可
@@ -93,6 +98,10 @@ public class JsydghxkController extends BaseController {
         try {
             String id = (String) params.get("id");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
+            NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+            if(Objects.isNull(nodeLand)){
+                return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+            }
             jsydghxkService.updateHasOnchain(id, hasOnchain);
             return R.ok();
         } catch (Exception e) {

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

@@ -10,6 +10,7 @@ import com.siwei.apply.domain.vo.ProjectVo;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,8 +36,15 @@ public class ProjectController extends BaseController {
     @PostMapping("")
     public R<Map<String, String>> Add(@RequestBody ProjectVo projectVo) {
         try {
-            String id = projectService.add(projectVo);
             Map<String, String> map = new HashMap<>();
+            //校验项目code
+            String regex = "\\d{4}-\\d{6}-\\d{2}-\\d{2}-\\d{6}";
+            String code = projectVo.getCode();
+            if(StringUtils.isNotBlank(code) && !code.matches(regex)){
+                return R.fail(501,"项目编码格式不正确，正确格式为：YYYY-XXXXXX-XX-XX-XXXXXX，例如：2023-123456-01-01-000001");
+            }
+
+            String id = projectService.add(projectVo);
             map.put("id", id);
             return R.ok(map);
         } catch (Exception e) {
@@ -106,6 +114,12 @@ public class ProjectController extends BaseController {
     @PutMapping("")
     public R<Void> Update(@RequestBody ProjectUpdateVo projectUpdateVo) {
         try {
+            //校验项目code
+            String regex = "\\d{4}-\\d{6}-\\d{2}-\\d{2}-\\d{6}";
+            String code = projectUpdateVo.getCode();
+            if(StringUtils.isNotBlank(code) && !code.matches(regex)){
+                return R.fail(501,"项目编码格式不正确，正确格式为：YYYY-XXXXXX-XX-XX-XXXXXX，例如：2023-123456-01-01-000001");
+            }
             projectService.update(projectUpdateVo);
             return R.ok();
         } catch (Exception e) {

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

@@ -1,9 +1,11 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.LandTypeTreeRes;
 import com.siwei.apply.domain.res.TdgyRes;
 import com.siwei.apply.domain.vo.TdgyUpdateVo;
 import com.siwei.apply.domain.vo.TdgyVo;
+import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.TdgyService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 土地供应 控制器
@@ -24,7 +27,8 @@ import java.util.Map;
 public class TdgyController extends BaseController {
     @Autowired
     private TdgyService tdgyService;
-
+    @Autowired
+    NodeLandService nodeLandService;
     /**
      * 添加土地供应
      */
@@ -108,6 +112,11 @@ public class TdgyController extends BaseController {
         try {
             String id = (String) params.get("id");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
+            NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+            if(Objects.isNull(nodeLand)){
+                return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+            }
+
             tdgyService.updateHasOnchain(id, hasOnchain);
             return R.ok();
         } catch (Exception e) {

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

@@ -1,10 +1,12 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.TdhyhsRes;
 import com.siwei.apply.domain.res.TdhyhsSinglRes;
 import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.domain.vo.TdhyhsUpdateVo;
 import com.siwei.apply.domain.vo.TdhyhsVo;
+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;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 土地核验与规划核实 控制器
@@ -24,7 +27,8 @@ import java.util.Map;
 public class TdhyhsController extends BaseController {
     @Autowired
     private TdhyhsService tdhyhsService;
-
+    @Autowired
+    NodeLandService nodeLandService;
     /**
      * 添加土地核验与规划核实
      */
@@ -93,6 +97,12 @@ public class TdhyhsController extends BaseController {
     @PutMapping("/onchain")
     public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
+            for (String id : onChainVo.getIds()) {
+                NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+                if(Objects.isNull(nodeLand)){
+                    return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+                }
+            }
             for (String id : onChainVo.getIds()) {
                 tdhyhsService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }

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

@@ -1,8 +1,10 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.YdbpRes;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdbpVo;
+import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.YdbpService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 用地报批 控制器
@@ -21,7 +24,8 @@ import java.util.Map;
 public class YdbpController extends BaseController {
     @Autowired
     private YdbpService ydbpService;
-
+    @Autowired
+    NodeLandService nodeLandService;
     /**
      * 添加用地报批
      */
@@ -92,6 +96,10 @@ public class YdbpController extends BaseController {
         try {
             String id = (String) params.get("id");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
+            NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+            if(Objects.isNull(nodeLand)){
+                return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+            }
             ydbpService.updateHasOnchain(id, hasOnchain);
             return R.ok();
         } catch (Exception e) {

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

@@ -1,8 +1,10 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.domain.res.YdysyxzRes;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzVo;
+import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.YdysyxzService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 用地预审与选址 控制器
@@ -21,7 +24,8 @@ import java.util.Map;
 public class YdysyxzController extends BaseController {
     @Autowired
     private YdysyxzService ydysyxzService;
-
+    @Autowired
+    NodeLandService nodeLandService;
     /**
      * 添加用地预审与选址信息
      */
@@ -94,6 +98,10 @@ public class YdysyxzController extends BaseController {
         try {
             String id = (String) params.get("id");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
+            NodeLand nodeLand = nodeLandService.getNodeLandByNodeId(id);
+            if(Objects.isNull(nodeLand)){
+                return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
+            }
             ydysyxzService.updateHasOnchain(id, hasOnchain);
             return R.ok();
         } catch (Exception e) {

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

@@ -1,5 +1,7 @@
 package com.siwei.apply.service;
 
+import com.siwei.apply.domain.NodeLand;
+
 import java.util.List;
 import java.util.Map;
 
@@ -40,4 +42,7 @@ public interface NodeLandService {
      * @return 地块几何信息Map，结构同getGeomByNodeId返回
      */
     Map<String, Object> getGeomByProjectAndNodeTable(String projectId, String nodeTableName);
+
+    NodeLand getNodeLandByNodeId(String nodeId) ;
+
 }

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

@@ -40,6 +40,7 @@ public class JsgcghxkImpl implements JsgcghxkService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    @Autowired
     LandOneCodeService landOneCodeService;
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.siwei.apply.service.impl;
 
+import com.siwei.apply.domain.NodeLand;
 import com.siwei.apply.mapper.NodeLandMapper;
 import com.siwei.apply.service.NodeLandService;
 import org.slf4j.Logger;
@@ -136,4 +137,22 @@ public class NodeLandImpl implements NodeLandService {
             return null;
         }
     }
+
+
+    @Override
+    public NodeLand getNodeLandByNodeId(String nodeId) {
+        // 获取地块ID
+        NodeLand nodeLand = nodeLandMapper.selectByNodeId(nodeId);
+        if(Objects.isNull(nodeLand)){
+            logger.info("未找到节点对应的地块信息，nodeId={}", nodeId);
+        }
+        return nodeLand;
+    }
+
+
+
+
+
+
+
 }