调整生成资源码逻辑

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

@@ -7,6 +7,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
@@ -33,6 +34,9 @@ public class GyjsydjfwscdjController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
     /**
      * 添加国有建设用地使用权及房屋所有权首次登记
      */
@@ -115,6 +119,10 @@ public class GyjsydjfwscdjController extends BaseController {
             }
             // 更新项目表的上链数量
             projectService.countOnChinaNum(onChainVo.getProjectId());
+            //这里生成资源吗
+            for (String id : onChainVo.getIds()) {
+                landOneCodeService.addOrUpdateLandOneCodeInfo(onChainVo.getProjectId(),id);
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -7,6 +7,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
@@ -33,6 +34,9 @@ public class GyjsydscdjController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
     /**
      * 添加国有建设用地使用权首次登记
      */
@@ -115,8 +119,10 @@ public class GyjsydscdjController extends BaseController {
             }
             // 更新项目表的上链数量
             projectService.countOnChinaNum(onChainVo.getProjectId());
-
-
+            //这里生成资源吗
+            for (String id : onChainVo.getIds()) {
+                landOneCodeService.addOrUpdateLandOneCodeInfo(onChainVo.getProjectId(),id);
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -7,6 +7,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
@@ -34,6 +35,9 @@ public class JsgcghxkController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
     /**
      * 添加建设工程规划许可
      */
@@ -117,6 +121,10 @@ public class JsgcghxkController extends BaseController {
             }
             // 更新项目表的上链数量
             projectService.countOnChinaNum(onChainVo.getProjectId());
+            //这里生成资源吗
+            for (String id : onChainVo.getIds()) {
+                landOneCodeService.addOrUpdateLandOneCodeInfo(onChainVo.getProjectId(),id);
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -5,6 +5,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
@@ -31,6 +32,9 @@ public class JsydghxkController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
     /**
      * 添加建设用地规划许可
      */
@@ -112,6 +116,8 @@ public class JsydghxkController extends BaseController {
             jsydghxkService.updateHasOnchain(id, hasOnchain);
             // 更新项目表的上链数量
             projectService.countOnChinaNum(projectId);
+            //这里生成资源吗
+            landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -82,8 +82,9 @@ public class LandOneCodeController extends BaseController {
     @PostMapping("/addEntity")
     public R<String> addEntity(@RequestBody LandOneCode body) {
         try {
-            service.addOrUpdateLandOneCodeInfo(body.getProjectWorkflowId());
-            return R.ok(body.getProjectWorkflowId());
+            //service.addOrUpdateLandOneCodeInfo(body.getProjectWorkflowId());
+            //return R.ok(body.getProjectWorkflowId());
+            return R.fail(502,"土地统一编码信息已自动生成，无需手动添加");
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }

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

@@ -5,6 +5,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.TdgyService;
@@ -33,6 +34,10 @@ public class TdgyController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+
+    @Autowired
+    private LandOneCodeService landOneCodeService;
+
     /**
      * 添加土地供应
      */
@@ -130,6 +135,8 @@ public class TdgyController extends BaseController {
             tdgyService.updateHasOnchain(id,projectId, hasOnchain);
             // 更新项目表的上链数量
             projectService.countOnChinaNum(projectId);
+            //这里生成资源吗
+            landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(502,e.getMessage());

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

@@ -6,6 +6,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.TdhyhsService;
@@ -33,6 +34,10 @@ public class TdhyhsController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
     /**
      * 添加土地核验与规划核实
      */
@@ -115,6 +120,10 @@ public class TdhyhsController extends BaseController {
             }
             // 更新项目表的上链数量
             projectService.countOnChinaNum(onChainVo.getProjectId());
+            //这里生成资源吗
+            for (String id : onChainVo.getIds()) {
+                landOneCodeService.addOrUpdateLandOneCodeInfo(onChainVo.getProjectId(),id);
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -3,6 +3,7 @@ package com.siwei.apply.controller;
 import com.siwei.apply.domain.res.TjyydhxRes;
 import com.siwei.apply.domain.vo.TjyydhxUpdateVo;
 import com.siwei.apply.domain.vo.TjyydhxVo;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.TjyydhxService;
 import com.siwei.common.core.domain.R;
@@ -25,6 +26,9 @@ public class TjyydhxController extends BaseController {
     private TjyydhxService tjyydhxService;
     @Autowired
     private ProjectService projectService;
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
 
     /**
      * 添加规划条件与用地红线出具
@@ -104,6 +108,8 @@ public class TjyydhxController extends BaseController {
             tjyydhxService.updateHasOnchain(id, hasOnchain);
             // 更新项目表的上链数量
             projectService.countOnChinaNum(projectId);
+            //这里生成资源吗
+            landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -4,6 +4,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.YdbpService;
@@ -30,6 +31,9 @@ public class YdbpController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
+    @Autowired
+    LandOneCodeService landOneCodeService;
+
     /**
      * 添加用地报批
      */
@@ -111,6 +115,8 @@ public class YdbpController extends BaseController {
             ydbpService.updateHasOnchain(id, hasOnchain);
             // 更新项目表的上链数量
             projectService.countOnChinaNum(projectId);
+            //这里生成资源吗
+            landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -4,6 +4,7 @@ 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.LandOneCodeService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.YdysyxzService;
@@ -30,8 +31,8 @@ public class YdysyxzController extends BaseController {
     NodeLandService nodeLandService;
     @Autowired
     ProjectService projectService;
-
-
+    @Autowired
+    LandOneCodeService landOneCodeService;
 
     /**
      * 添加用地预审与选址信息
@@ -116,6 +117,8 @@ public class YdysyxzController extends BaseController {
             ydysyxzService.updateHasOnchain(id, hasOnchain);
             // 更新项目表的上链数量
             projectService.countOnChinaNum(projectId);
+            //这里生成资源吗
+            landOneCodeService.addOrUpdateLandOneCodeInfo(projectId,id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -3,6 +3,9 @@ package com.siwei.apply.service;
 import com.siwei.apply.domain.LandOneCode;
 import com.siwei.apply.domain.ProjectWorkflow;
 import com.siwei.apply.domain.vo.LandOneCodeVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 土地统一编码 服务接口
@@ -22,7 +25,8 @@ public interface LandOneCodeService {
 
     String getBusinessCode(String projectWorkflowId, Integer ProjectType);
 
-    String addOrUpdateLandOneCodeInfo(String projectWorkflowId);
+    String addOrUpdateLandOneCodeInfo(String projectId,String nodeId);
+
 
     LandOneCodeVo getLandOneCodeByWorkflowId(String projectWorkflowId);
 

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

@@ -77,9 +77,6 @@ public class Gyjsydjfwscdjmpl implements GyjsydjfwscdjService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return gyjsydjfwscdj.getId();
     }
 

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

@@ -79,8 +79,6 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return gyjsydscdj.getId();
     }
 

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

@@ -78,8 +78,6 @@ public class JsgcghxkImpl implements JsgcghxkService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getTableName());
         projectWorkflowMapper.add(projectWorkflow);
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return jsgcghxk.getId();
     }
 

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

@@ -73,9 +73,6 @@ public class JsydghxkImpl implements JsydghxkService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return jsydghxk.getId();
     }
 

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

@@ -267,15 +267,21 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
 
     /**
      * 各个环节新增时，新增一条地块一码信息
-     * @param projectWorkflowId
+     * @param
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addOrUpdateLandOneCodeInfo(String projectWorkflowId) {
-        ProjectWorkflow  projectWorkflow= projectWorkflowMapper.selectById(projectWorkflowId);
-        String nodeId = projectWorkflow.getNodeId();
-        String projectId = projectWorkflow.getProjectId();
+    public String addOrUpdateLandOneCodeInfo(String projectId,String nodeId){
+        //ProjectWorkflow  projectWorkflow= projectWorkflowMapper.selectById(projectWorkflowId);
+        String projectWorkflowId = null;
+        List<ProjectWorkflow> projectWorkflowList = projectWorkflowMapper.selectByNodeId(nodeId,null);
+        if(CollectionUtils.isNotEmpty(projectWorkflowList) && Objects.nonNull(projectWorkflowList.get(0))) {
+            ProjectWorkflow projectWorkflow = projectWorkflowList.get(0);
+            projectWorkflowId = projectWorkflow.getId();
+        }
+        //String nodeId = projectWorkflow.getNodeId();
+        //String projectId = projectWorkflow.getProjectId();
         Project project =projectMapper.get(projectId);
         Integer projectType = project.getProjectType();
         // 获取地块ID
@@ -346,7 +352,6 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
         return landOneCodeVo;
     }
 
-
     //这里根据节点获取流程数据
     @Override
     public ProjectWorkflow getProjectWorkflowByNodeId(String nodeId) {
@@ -362,7 +367,4 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
 
 
 
-
-
-
 }

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

@@ -88,8 +88,6 @@ public class TdgyImpl implements TdgyService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return tdgy.getId();
     }
 

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

@@ -77,8 +77,6 @@ public class TdhyhsImpl implements TdhyhsService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return tdhyhs.getId();
     }
 

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

@@ -64,8 +64,6 @@ public class TjyydhxImpl implements TjyydhxService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return tjyydhx.getId();
     }
 

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

@@ -80,8 +80,6 @@ public class YdbpImpl implements YdbpService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return ydbp.getId();
     }
 

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

@@ -64,9 +64,6 @@ public class YdysyxzImpl implements YdysyxzService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
-
-        //这里增加赋码数据
-        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return ydysyxz.getId();
     }