合规性分析添加距离内个数

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/hgxfxjg/HgxfxJgService.java

@@ -1,5 +1,8 @@
 package com.onemap.apply.service.impl.fzss.hgxfxjg;
 
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.alibaba.nacos.shaded.com.google.gson.JsonElement;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.onemap.apply.domain.config.fzss.HgxfxRwJgDTO;
 import com.onemap.apply.domain.config.fzss.HgxfxScxRwDTO;
@@ -36,7 +39,7 @@ public class HgxfxJgService {
         List<HgxfxScxRwDTO> scxList = hgxfxScxRwMapper.selectScxRwInfo(rwbsm, scxPBsm);
         if (scxList != null && scxList.size() > 0) {
             for (HgxfxScxRwDTO v00_scx : scxList) {
-                Map jg_data = GetHgxfxScxFxjg(v00_scx.getBsm(), v00_scx.getRwbsm(), v00_scx.getScxbsm(), v00_scx.getScxname(), null, template, null);
+                Map jg_data = GetHgxfxScxFxjg(v00_scx.getBsm(), v00_scx.getRwbsm(), v00_scx.getScxbsm(), v00_scx.getScxname(), null, template, null, v00_scx);
 //                List<Map> child = GetHgxfxFxjg(rwbsm, v00_scx.getScxbsm(), template);
 //                v001_sortation.put("child", child);
 //                retli.add(v001_sortation);
@@ -51,7 +54,7 @@ public class HgxfxJgService {
         return retlist;
     }
 
-    private Map<String, Object> GetHgxfxScxFxjg(String bsm, String rwbsm, String scxbsm, String scxname, String scxSortationPid, Integer template, String yslx) {
+    private Map<String, Object> GetHgxfxScxFxjg(String bsm, String rwbsm, String scxbsm, String scxname, String scxSortationPid, Integer template, String yslx, HgxfxScxRwDTO v00_scx) {
         Map<String, Object> retMap = new HashMap<>();
         retMap.put("bsm", bsm);
         retMap.put("rwbsm", rwbsm);
@@ -89,6 +92,19 @@ public class HgxfxJgService {
             List<Map> v_list = hgxfxRwJgMapper.selectTypeList(bsm, rwbsm, scxbsm, v001_sortation.getTypeColumn(), v001_sortation.getTypeLength(), v001_sortation.getTypeDict(), yslx);
             retMap.put("dataList", v_list);
             retMap.put("jsf", 1);
+            String parameterJson = v00_scx.getParameter();
+            if (StringUtils.isNotEmpty(parameterJson)) {
+                Gson gson = new Gson();
+                JsonObject jsonObject = gson.fromJson(parameterJson, JsonObject.class);
+                JsonElement findValueObject = jsonObject.get("findvalue");
+                if (!findValueObject.isJsonNull()) {
+                    int d_FindValue = findValueObject.getAsInt();
+                    if (d_FindValue > 0) {
+                        retMap.put("distance", d_FindValue);
+                        retMap.put("number", v_list != null ? v_list.size() : 0);
+                    }
+                }
+            }
         } else if (2 == v001_sortation.getStyle()) {
             retMap.put("scxstyle", 0);
             List<Map> v_list = hgxfxRwJgMapper.selectTypeScxList(bsm, rwbsm, scxbsm);

onemap-modules/onemap-apply/src/main/resources/bootstrap.yml

@@ -30,11 +30,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/HgxfxRwJgMapper.xml

@@ -53,7 +53,7 @@
     <select id="selectTypeList" resultType="map">
         select
         concat(to_char(now() , 'YYYYMMDDHH24MISSMS'),(ROW_NUMBER() OVER (ORDER BY v1.yslx_name))) id,
-        v1.yslx_name,v1.bsm,v1.rwbsm,v1.scxbsm,v1.mj,public.st_asewkt(ret_geom) geom
+        v1.yslx_name,v1.bsm,v1.rwbsm,v1.scxbsm,round((v1.mj),2) mj,public.st_asewkt(ret_geom) geom
         from(
             select v0.yslx_name,v0.bsm bsm,v0.rwbsm rwbsm,v0.scxbsm scxbsm,mj::numeric mj,v0.geom ret_geom
             from (