宗地变更方法优化

siwei-modules/pom.xml

@@ -25,10 +25,10 @@
     </description>
 
 
-    <dependencies>
-        <dependency>
-            <groupId>com.siwei</groupId>
-            <artifactId>siwei-common-datasource</artifactId>
-        </dependency>
-    </dependencies>
+<!--    <dependencies>-->
+<!--        <dependency>-->
+<!--            <groupId>com.siwei</groupId>-->
+<!--            <artifactId>siwei-common-datasource</artifactId>-->
+<!--        </dependency>-->
+<!--    </dependencies>-->
 </project>

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

@@ -241,6 +241,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                                     //cleanDataForInsert(newMap, columnTypeMap);
                                     Zdjbxx zdjbxx = objectMapper.convertValue(newMap, Zdjbxx.class);
                                     zdjbxx.setValidFlag(0);
+                                    zdjbxx.setSm(landRightType);
+                                    zdjbxx.setJsydghxkzh("biangeng");//建设用地规划许可证号(测试用)
                                     //1.入库
                                     zdjbxxMapper.add(zdjbxx);
                                     //2.修改bsm的zt
@@ -272,17 +274,18 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                                 Zdjbxx tmpZdjbxx = containsZdList.stream().findFirst().get();
                                 Integer dbZdBsm = tmpZdjbxx.getBsm();
 
-                                List<Map<String, Object>> bsmToFileList = zdBsmMap.getOrDefault(dbZdBsm, new ArrayList<>());
+                                List<Map<String, Object>> bsmToFileList = zdBsmMap.computeIfAbsent(dbZdBsm, k -> new ArrayList<>());
                                 bsmToFileList.add(theValue);
-                                zddmMap.put(dbZdBsm, zddmMap.getOrDefault(dbZdBsm, "") + tmpZdjbxx.getZddm());
+                                zddmMap.computeIfAbsent(dbZdBsm, k -> tmpZdjbxx.getZddm() );
+                                //zddmMap.put(dbZdBsm, zddmMap.getOrDefault(dbZdBsm, "") + tmpZdjbxx.getZddm());
                                 // 然后循环每一个map，再次转为
                             }//end for
 
                             //这里针对每个key 进行入库，然后，修改bsm的zt 然后，进行入库。
                             // -----------------第四部分遍历图层进行数据处理 ------------------------------------
                             if(MapUtils.isNotEmpty(zdBsmMap)) {
+                                //这里是否做校验如拆分地块至少有两个子地块，才能进行拆分操作（但是地块变更也可能存在，大的地块，变为小的地块，所以不做这个校验）
                                 ObjectMapper objectMapper = new ObjectMapper();
-
                                 List<Integer> idList =new ArrayList<>();
                                 for (Map.Entry<Integer,List<Map<String, Object>>> entry : zdBsmMap.entrySet()) {
                                     List<Map<String, Object>> theValue = entry.getValue();
@@ -293,10 +296,11 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                                         for(Map.Entry<String,Object> e : map.entrySet()){
                                             newMap.put(e.getKey().toLowerCase(), e.getValue());
                                         }
-
                                         //cleanDataForInsert(newMap, columnTypeMap);
                                         Zdjbxx zdjbxx = objectMapper.convertValue(newMap, Zdjbxx.class);
                                         zdjbxx.setValidFlag(0);
+                                        zdjbxx.setSm(landRightType);
+                                        zdjbxx.setJsydghxkzh("biangeng");//建设用地规划许可证号(测试用)
                                         zdjbxxMapper.add(zdjbxx);
                                         //合并处理入库之后需要记录到变更记录表：
                                         String bhqzddm = zddmMap.get(dbBsm);
@@ -320,6 +324,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
 
 
+
     /**
      *
      * @param zdjbxx