调整json目录信息

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

@@ -3,12 +3,10 @@ package com.siwei.apply.controller;
 import com.siwei.apply.domain.LandOneCode;
 import com.siwei.apply.domain.ProjectWorkflow;
 import com.siwei.apply.domain.vo.LandOneCodeVo;
-import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;

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

@@ -10,6 +10,7 @@ import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.siwei.apply.common.Common.UserId;
 
 @Service
 @RequiredArgsConstructor
@@ -135,8 +135,6 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                 }
 
 
-
-
              //其次获取用地报批的值
             } else if(workflows.stream().anyMatch(s->s.getTableName().equalsIgnoreCase(talbeName1))){
                 List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, talbeName1);
@@ -161,8 +159,6 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                 levyStatusCode = replaceCode;
             }
 
-
-
             //获取土地供应方式
             if(Objects.nonNull(globalTdgy) && StringUtils.isNotBlank(globalTdgy.getGdType())){
                 if("划拨".equalsIgnoreCase(globalTdgy.getGdType())){
@@ -288,15 +284,8 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
         }
         String landCodeId = Objects.nonNull(nodeLand) ? nodeLand.getId() : "";
         LandOneCode landOneCode = mapper.getByWorkflowId(projectWorkflowId);
-
-        Random random = new Random();
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < 5; i++) {
-            sb.append(random.nextInt(10)); // 生成0-9随机数并拼接
-        }
-        String randomNumber = sb.toString();
+        String randomNumber = RandomStringUtils.randomNumeric(5);
         String resourceImmobileCode = "360122011009GB"+randomNumber+"W00000000";
-
         if(Objects.nonNull(landOneCode)){ //修改数据
             landOneCode.setProjectId(projectId);
             landOneCode.setLandCode(landCodeId);

siwei-modules/siwei-apply/src/main/resources/one_code_index_v1.json

@@ -3,8 +3,8 @@
             "id": "5508c9a73997439fb8f2344ae98151ca",
             "label": "用地业务数据",
             "title": "用地业务数据",
-            "type": "S3M",
-            "url": "http://192.168.60.2:8090/iserver/services/3D-WenTi/rest/realspace",
+            "type": "",
+            "url": "",
             "source": "",
             "legend": "",
             "favorite": null,
@@ -45,7 +45,7 @@
                     "label": "土地供应",
                     "title": "土地供应",
                     "type": "wms",
-                    "url": "http://192.168.60.2:8089/geoserver/sanya_workspace/wms",
+                    "url": "http://192.168.60.220:8090/geoserver/siwei_workspace/wms?service=WMS&version=1.1.0&request=GetMap&layers=siwei_workspace%3Ac_000a1&bbox=116.30515511897768%2C39.88039472036522%2C116.47375775284452%2C39.951341728969965&width=768&height=330&srs=EPSG%3A4326&styles=&format=application/openlayers",
                     "source": null,
                     "legend": null,
                     "favorite": null,
@@ -53,6 +53,48 @@
                     "checked": false,
                     "expand": false,
                     "contextmenu": false
+                },
+                {
+                  "id": "a484b75e2ac24016a62ccbef76c8b138",
+                  "label": "国有建设用地使用权首次登记",
+                  "title": "国有建设用地使用权首次登记",
+                  "type": "wms",
+                  "url": "http://192.168.60.220:8090/geoserver/siwei_workspace/wms?service=WMS&version=1.1.0&request=GetMap&layers=siwei_workspace%3Ac_000a1&bbox=116.30515511897768%2C39.88039472036522%2C116.47375775284452%2C39.951341728969965&width=768&height=330&srs=EPSG%3A4326&styles=&format=application/openlayers",
+                  "source": null,
+                  "legend": null,
+                  "favorite": null,
+                  "disabled": false,
+                  "checked": false,
+                  "expand": false,
+                  "contextmenu": false
+                },
+                {
+                  "id": "a484b75e2ac24016a62ccbef76c8b138",
+                  "label": "建设用地规划许可证",
+                  "title": "建设用地规划许可证",
+                  "type": "wms",
+                  "url": "http://192.168.60.220:8090/geoserver/siwei_workspace/wms?service=WMS&version=1.1.0&request=GetMap&layers=siwei_workspace%3Ac_000a1&bbox=116.30515511897768%2C39.88039472036522%2C116.47375775284452%2C39.951341728969965&width=768&height=330&srs=EPSG%3A4326&styles=&format=application/openlayers",
+                  "source": null,
+                  "legend": null,
+                  "favorite": null,
+                  "disabled": false,
+                  "checked": false,
+                  "expand": false,
+                  "contextmenu": false
+                },
+                {
+                  "id": "a484b75e2ac24016a62ccbef76c8b138",
+                  "label": "建设工程规划许可证",
+                  "title": "建设工程规划许可证",
+                  "type": "wms",
+                  "url": "http://192.168.60.220:8090/geoserver/siwei_workspace/wms?service=WMS&version=1.1.0&request=GetMap&layers=siwei_workspace%3Ac_000a1&bbox=116.30515511897768%2C39.88039472036522%2C116.47375775284452%2C39.951341728969965&width=768&height=330&srs=EPSG%3A4326&styles=&format=application/openlayers",
+                  "source": null,
+                  "legend": null,
+                  "favorite": null,
+                  "disabled": false,
+                  "checked": false,
+                  "expand": false,
+                  "contextmenu": false
                 }
             ]
         },
@@ -60,8 +102,8 @@
             "id": "5508c9a73997439fb8f2344ae98151ca",
             "label": "规划数据",
             "title": "规划数据",
-            "type": "S3M",
-            "url": "http://192.168.60.2:8090/iserver/services/3D-WenTi/rest/realspace",
+            "type": "",
+            "url": "",
             "source": "",
             "legend": "",
             "favorite": null,
@@ -70,9 +112,23 @@
             "expand": false,
             "children": [
                 {
-                  "id": "5508c9a73997439fb8f2344ae98151ca",
-                  "label": "规划数据",
-                  "title": "规划数据",
+                  "id": "5508c9a73997439fb8f2344ae98151ca2",
+                  "label": "控制性详细规划",
+                  "title": "控制性详细规划",
+                  "type": "S3M",
+                  "url": "http://192.168.60.2:8090/iserver/services/3D-WenTi/rest/realspace",
+                  "source": null,
+                  "legend": null,
+                  "favorite": null,
+                  "disabled": false,
+                  "checked": false,
+                  "expand": false,
+                  "contextmenu": false
+                },
+                {
+                  "id": "5508c9a73997439fb8f2344ae98151ca1",
+                  "label": "三区三线",
+                  "title": "三区三线",
                   "type": "S3M",
                   "url": "http://192.168.60.2:8090/iserver/services/3D-WenTi/rest/realspace",
                   "source": null,
@@ -83,7 +139,6 @@
                   "expand": false,
                   "contextmenu": false
                 }
-
             ]
         }
     ]