赋值码资源查询，及调整其主键ID

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

@@ -1,6 +1,7 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.LandOneCode;
+import com.siwei.apply.domain.vo.LandOneCodeVo;
 import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -87,6 +88,15 @@ public class LandOneCodeController extends BaseController {
     }
 
 
+    @GetMapping("/getResourceCode")
+    public R<LandOneCodeVo> getResourceCode(@RequestBody LandOneCode body) {
+        try {
+            LandOneCodeVo landOneCodeVo = service.getLandOneCodeByWorkflowId(body.getProjectWorkflowId());
+            return R.ok(landOneCodeVo);
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
 
 
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/LandOneCodeVo.java

@@ -0,0 +1,17 @@
+package com.siwei.apply.domain.vo;
+
+import com.siwei.apply.domain.BaseId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * t_land_one_code 表模型
+ * 土地统一编码
+ */
+@Data
+public class LandOneCodeVo extends BaseId {
+    private String landCode;            // 土地号
+    private String projectId;           // 项目id
+    private String projectWorkflowId;   // 环节id
+    private String resourceCode;   // 资源码
+}

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

@@ -1,6 +1,7 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.LandOneCode;
+import com.siwei.apply.domain.vo.LandOneCodeVo;
 
 /**
  * 土地统一编码 服务接口
@@ -22,6 +23,8 @@ public interface LandOneCodeService {
 
     String addOrUpdateLandOneCodeInfo(String projectWorkflowId);
 
+    LandOneCodeVo getLandOneCodeByWorkflowId(String projectWorkflowId);
+
 
 
 

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

@@ -66,8 +66,9 @@ public class Gyjsydjfwscdjmpl implements GyjsydjfwscdjService {
             }
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(gyjsydjfwscdj.getId());
-
+        //projectWorkflow.setId(gyjsydjfwscdj.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
 
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());

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

@@ -69,7 +69,9 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
             }
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(gyjsydscdj.getId());
+        //projectWorkflow.setId(gyjsydscdj.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(gyjsydscdj.getProjectId());

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

@@ -67,7 +67,9 @@ public class JsgcghxkImpl implements JsgcghxkService {
             }
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(jsgcghxk.getId());
+        //projectWorkflow.setId(jsgcghxk.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(jsgcghxk.getProjectId());

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

@@ -63,7 +63,9 @@ public class JsydghxkImpl implements JsydghxkService {
             }
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(jsydghxk.getId());
+        //projectWorkflow.setId(jsydghxk.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(jsydghxk.getProjectId());

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

@@ -2,6 +2,7 @@ package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.*;
 import com.siwei.apply.domain.res.ProjectCycleRes;
+import com.siwei.apply.domain.vo.LandOneCodeVo;
 import com.siwei.apply.enums.ProjectType;
 import com.siwei.apply.enums.RegistrationProcessType;
 import com.siwei.apply.mapper.*;
@@ -9,6 +10,8 @@ import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +28,8 @@ import static com.siwei.apply.common.Common.UserId;
 @RequiredArgsConstructor
 public class LandOneCodeServiceImpl implements LandOneCodeService {
 
+    private static final Logger logger = LoggerFactory.getLogger(LandOneCodeServiceImpl.class);
+
     @Autowired
     private final LandOneCodeMapper mapper;
 
@@ -245,6 +250,12 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
 
         // 获取地块ID
         NodeLand nodeLand = nodeLandMapper.selectByNodeId(nodeId);
+        if(Objects.isNull(nodeLand)){
+            logger.error("未找到节点对应的地块信息，nodeId={}", nodeId);
+            //throw new RuntimeException("未找到节点对应的地块信息");
+            return nodeId;
+        }
+
         String landCodeId = nodeLand.getId();
         LandOneCode landOneCode = mapper.getByWorkflowId(projectWorkflowId);
         if(Objects.nonNull(landOneCode)){ //修改数据
@@ -254,7 +265,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             String businessCode = this.getBusinessCode( projectWorkflowId,  projectType);
             landOneCode.setResourceBusinessCode(businessCode);
             landOneCode.setResourceProjectCode(project.getCode());
-            landOneCode.setResourceImmobileCode("###");
+            landOneCode.setResourceImmobileCode("####");
             mapper.updateById(landOneCode);
         }else {
             //保存入库
@@ -266,12 +277,33 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             String businessCode = this.getBusinessCode( projectWorkflowId,  projectType);
             landOneCode.setResourceBusinessCode(businessCode);
             landOneCode.setResourceProjectCode(project.getCode());
-            landOneCode.setResourceImmobileCode("###");
+            landOneCode.setResourceImmobileCode("####");
             mapper.add(landOneCode);
         }
         return landOneCode.getId();
     }
 
+    /**
+     * 获取资源码
+     * @param projectWorkflowId
+     * @return
+     */
+    @Override
+    public LandOneCodeVo getLandOneCodeByWorkflowId(String projectWorkflowId) {
+        LandOneCodeVo landOneCodeVo = null;
+        logger.info("入参项目历程节点id，projectWorkflowId={}", projectWorkflowId);
+        if(StringUtils.isNotBlank(projectWorkflowId)){
+            LandOneCode entity =  mapper.getByWorkflowId(projectWorkflowId);
+            if(Objects.nonNull(entity)){
+                landOneCodeVo = new LandOneCodeVo();
+                BeanUtils.copyProperties(entity, landOneCodeVo);
+                landOneCodeVo.setResourceCode(entity.getResourceImmobileCode()+entity.getResourceBusinessCode()+entity.getResourceProjectCode());
+            }
+        }
+        return landOneCodeVo;
+    }
+
+
 
 
 }

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

@@ -74,7 +74,9 @@ public class TdgyImpl implements TdgyService {
             }
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(tdgy.getId());
+        //projectWorkflow.setId(tdgy.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(tdgy.getProjectId());

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

@@ -67,7 +67,9 @@ public class TdhyhsImpl implements TdhyhsService {
             }
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(tdhyhs.getId());
+        //projectWorkflow.setId(tdhyhs.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(tdhyhs.getProjectId());

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

@@ -54,7 +54,9 @@ public class TjyydhxImpl implements TjyydhxService {
         Integer projectType = projectMapper.getProjectTypeById(tjyydhx.getProjectId());
         Workflow workflow = workflowMapper.selectByProjectTypeAndTableName(projectType, "t_tjyydhx");
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(tjyydhx.getId());
+        //projectWorkflow.setId(tjyydhx.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId("");
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(tjyydhx.getProjectId());

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

@@ -70,7 +70,9 @@ public class YdbpImpl implements YdbpService {
             parentId = projectWorkflows.get(0).getNodeId();
         }
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(ydbp.getId());
+        //projectWorkflow.setId(ydbp.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId(parentId);
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(ydbp.getProjectId());

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

@@ -54,7 +54,9 @@ public class YdysyxzImpl implements YdysyxzService {
         Integer projectType = projectMapper.getProjectTypeById(ydysyxz.getProjectId());
         Workflow workflow = workflowMapper.selectByProjectTypeAndTableName(projectType, "t_ydysyxz");
         ProjectWorkflow projectWorkflow = new ProjectWorkflow();
-        projectWorkflow.setId(ydysyxz.getId());
+        //projectWorkflow.setId(ydysyxz.getId());
+        //设置流程主键
+        projectWorkflow.generateId();
         projectWorkflow.setParentId("");
         projectWorkflow.setWorkflowId(workflow.getId());
         projectWorkflow.setProjectId(ydysyxz.getProjectId());