2 Commits 089f9bf317 ... a50b17a69d

Autor SHA1 Mensaje Fecha
  gushoubang a50b17a69d 添加土地关联唯一码 hace 3 meses
  gushoubang 47c9254580 上链修改 hace 3 meses

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

@@ -3,6 +3,7 @@ package com.siwei.apply.controller;
 import com.siwei.apply.domain.res.GyjsydjfwscdjRes;
 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.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -77,11 +78,11 @@ public class GyjsydjfwscdjController extends BaseController {
      * 更新国有建设用地使用权及房屋所有权首次登记的上链状态
      */
     @PutMapping("/onchain")
-    public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
+    public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
-            String id = (String) params.get("id");
-            Boolean hasOnchain = (Boolean) params.get("hasOnchain");
-            gyjsydjfwscdjService.updateHasOnchain(id, hasOnchain);
+            for (String id : onChainVo.getIds()) {
+                gyjsydjfwscdjService.updateHasOnchain(id, onChainVo.getHasOnchain());
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -3,6 +3,7 @@ package com.siwei.apply.controller;
 import com.siwei.apply.domain.res.GyjsydscdjRes;
 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.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -77,11 +78,11 @@ public class GyjsydscdjController extends BaseController {
      * 更新国有建设用地使用权首次登记的上链状态
      */
     @PutMapping("/onchain")
-    public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
+    public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
-            String id = (String) params.get("id");
-            Boolean hasOnchain = (Boolean) params.get("hasOnchain");
-            gyjsydscdjService.updateHasOnchain(id, hasOnchain);
+            for (String id : onChainVo.getIds()) {
+                gyjsydscdjService.updateHasOnchain(id, onChainVo.getHasOnchain());
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -3,6 +3,7 @@ package com.siwei.apply.controller;
 import com.siwei.apply.domain.res.JsgcghxkRes;
 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.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -80,11 +81,11 @@ public class JsgcghxkController extends BaseController {
      * 更新建设工程规划许可的上链状态
      */
     @PutMapping("/onchain")
-    public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
+    public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
-            String id = (String) params.get("id");
-            Boolean hasOnchain = (Boolean) params.get("hasOnchain");
-            jsgcghxkService.updateHasOnchain(id, hasOnchain);
+            for (String id : onChainVo.getIds()) {
+                jsgcghxkService.updateHasOnchain(id, onChainVo.getHasOnchain());
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -1,6 +1,7 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.res.TdhyhsRes;
+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.TdhyhsService;
@@ -77,11 +78,11 @@ public class TdhyhsController extends BaseController {
      * 更新土地核验与规划核实的上链状态
      */
     @PutMapping("/onchain")
-    public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
+    public R<Void> updateHasOnchain(@RequestBody OnChainVo onChainVo) {
         try {
-            String id = (String) params.get("id");
-            Boolean hasOnchain = (Boolean) params.get("hasOnchain");
-            tdhyhsService.updateHasOnchain(id, hasOnchain);
+            for (String id : onChainVo.getIds()) {
+                tdhyhsService.updateHasOnchain(id, onChainVo.getHasOnchain());
+            }
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

+ 23 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/LandOneCode.java

@@ -0,0 +1,23 @@
+package com.siwei.apply.domain;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * land_one_code 表模型
+ * 土地统一编码
+ */
+@Data
+public class LandOneCode {
+    private String id;
+    private String landCode;            // 土地号
+    private String projectId;           // 项目id
+    private String projectWorkflowId;   // 环节id
+    private String code;                // 完整码
+
+    public void generateId() {
+        this.id = UUID.randomUUID().toString();
+    }
+}
+

+ 15 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/OnChainVo.java

@@ -0,0 +1,15 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 上链数据传输对象
+ */
+@Data
+public class OnChainVo {
+    private List<String> ids = new ArrayList<>();
+    private Boolean hasOnchain = false;
+}

+ 11 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/LandOneCodeMapper.java

@@ -0,0 +1,11 @@
+package com.siwei.apply.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * land_one_code 表的 MyBatis 映射接口(无方法占位)
+ */
+@Mapper
+public interface LandOneCodeMapper {
+}
+

+ 1 - 3
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -1,8 +1,6 @@
 package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.Project;
-import com.siwei.apply.domain.ProjectWorkflow;
-import com.siwei.apply.domain.Workflow;
 import com.siwei.apply.domain.res.*;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
 import com.siwei.apply.domain.vo.ProjectUpdateVo;
@@ -21,7 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.siwei.apply.common.Common.*;
+import static com.siwei.apply.common.Common.UserId;
 
 /**
  * 项目服务实现类

+ 15 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/LandOneCodeMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.siwei.apply.mapper.LandOneCodeMapper">
+    <!-- 仅映射,不包含任何SQL方法 -->
+    <resultMap id="LandOneCodeResultMap" type="com.siwei.apply.domain.LandOneCode">
+        <id property="id" column="id"/>
+        <result property="landCode" column="land_code"/>
+        <result property="projectId" column="project_id"/>
+        <result property="projectWorkflowId" column="project_workflow_id"/>
+        <result property="code" column="code"/>
+    </resultMap>
+</mapper>
+

+ 7 - 7
siwei-modules/siwei-spatial/src/main/java/com/siwei/spatial/service/file/ITGeomDbDetailsService.java

@@ -19,7 +19,7 @@ public interface ITGeomDbDetailsService {
      * @param id 空间入库存储空间详情主键
      * @return 空间入库存储空间详情
      */
-    public TGeomDbDetails selectTGeomDbDetailsById(String id);
+    TGeomDbDetails selectTGeomDbDetailsById(String id);
 
     /**
      * 查询空间入库存储空间详情列表
@@ -27,7 +27,7 @@ public interface ITGeomDbDetailsService {
      * @param tGeomDbDetails 空间入库存储空间详情
      * @return 空间入库存储空间详情集合
      */
-    public List<TGeomDbDetails> selectTGeomDbDetailsList(TGeomDbDetails tGeomDbDetails);
+    List<TGeomDbDetails> selectTGeomDbDetailsList(TGeomDbDetails tGeomDbDetails);
 
     /**
      * 新增空间入库存储空间详情
@@ -35,7 +35,7 @@ public interface ITGeomDbDetailsService {
      * @param tGeomDbDetails 空间入库存储空间详情
      * @return 结果
      */
-    public int insertTGeomDbDetails(TGeomDbDetails tGeomDbDetails);
+    int insertTGeomDbDetails(TGeomDbDetails tGeomDbDetails);
 
     /**
      * 修改空间入库存储空间详情
@@ -43,7 +43,7 @@ public interface ITGeomDbDetailsService {
      * @param tGeomDbDetails 空间入库存储空间详情
      * @return 结果
      */
-    public int updateTGeomDbDetails(TGeomDbDetails tGeomDbDetails);
+    int updateTGeomDbDetails(TGeomDbDetails tGeomDbDetails);
 
     /**
      * 批量删除空间入库存储空间详情
@@ -51,7 +51,7 @@ public interface ITGeomDbDetailsService {
      * @param ids 需要删除的空间入库存储空间详情主键集合
      * @return 结果
      */
-    public int deleteTGeomDbDetailsByIds(String[] ids);
+    int deleteTGeomDbDetailsByIds(String[] ids);
 
     /**
      * 删除空间入库存储空间详情信息
@@ -59,7 +59,7 @@ public interface ITGeomDbDetailsService {
      * @param id 空间入库存储空间详情主键
      * @return 结果
      */
-    public int deleteTGeomDbDetailsById(String id);
+    int deleteTGeomDbDetailsById(String id);
 
-    public TGeomDb sumGeomDetailsByUploadId(String id);
+    TGeomDb sumGeomDetailsByUploadId(String id);
 }