修改返回规划结果

onemap-auth/src/main/resources/bootstrap.yml

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

onemap-gateway/src/main/resources/bootstrap.yml

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.60.3:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.60.3:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -34,12 +34,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 192.168.60.3:8718
+        dashboard: 127.0.0.1:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 192.168.60.3:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/GetTableDateController.java

@@ -40,7 +40,7 @@ public class GetTableDateController {
     }
 
     /**
-     * 生成表格的数据
+     * 生成表格查询原始表格的数据
      *
      * @param targetTableVo
      * @return

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzReport.java

@@ -16,5 +16,5 @@ public class FzxzReport {
     private String fxbg;
     private String jsdw;
     private String xmmc;
-    private List<FzxzResDTO> items;
+    private List<SelectionResDTO> items;
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzDTO.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/SelectionDTO.java

@@ -8,7 +8,7 @@ import java.util.Date;
 
 @TableName("t_fzss_fzxz")
 @Data
-public class FzxzDTO {
+public class SelectionDTO {
     private String bsm;// 标识码
     private Integer rwzt;// 任务状态(0创建 1执行中 2完成 3错误)
     private Date cjsj;// 创建时间

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzResDTO.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/SelectionResDTO.java

@@ -12,7 +12,7 @@ import java.util.Date;
  */
 @TableName("t_fzss_fzxz_res")
 @Data
-public class FzxzResDTO {
+public class SelectionResDTO {
     String bsm;
     String rwbsm;
     String sjyb;// 数据源表

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/calculation/FzxzCalc.java

@@ -1,7 +1,7 @@
 package com.onemap.analyse.domain.calculation;
 
 import com.onemap.analyse.domain.FactorUseDTO;
-import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.SelectionDTO;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -9,6 +9,6 @@ import java.util.List;
 
 @Data
 public class FzxzCalc {
-    FzxzDTO fzxzDTO;
+    SelectionDTO fzxzDTO;
     List<FactorUseDTO> FactorUseList=new ArrayList<>();
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/SelectPilotVo.java

@@ -2,7 +2,7 @@ package com.onemap.analyse.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.onemap.analyse.domain.FactorUseDTO;
-import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.SelectionDTO;
 import lombok.Data;
 
 import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
  * 选址请求参数
  */
 @Data
-public class SelectPilotVo extends FzxzDTO {
+public class SelectPilotVo extends SelectionDTO {
     @JsonProperty("yxyz")
     private List<FactorUseDTO> factorList;
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzMapper.java

@@ -1,7 +1,7 @@
 package com.onemap.analyse.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.SelectionDTO;
 import com.onemap.analyse.domain.FzxzEntityDTO;
 import com.onemap.analyse.domain.res.FzxzResultDTO;
 import com.onemap.common.datasource.annotation.Master;
@@ -15,7 +15,7 @@ import java.util.Map;
  *
  * @author onemap
  */
-public interface FzxzMapper extends BaseMapper<FzxzDTO> {
+public interface FzxzMapper extends BaseMapper<SelectionDTO> {
     List<FzxzEntityDTO> GetFzxzList(@Param("xmmc") String xmmc, @Param("kssj") String kssj, @Param("jssj") String jssj);
 
     @Master

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/base/FzxzResMapper.java

@@ -1,15 +1,15 @@
 package com.onemap.analyse.mapper.base;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.analyse.domain.FzxzResDTO;
+import com.onemap.analyse.domain.SelectionResDTO;
 
 import java.util.List;
 
 /**
  * 辅助选址结果
  */
-public interface FzxzResMapper extends BaseMapper<FzxzResDTO> {
-    void saveOne(FzxzResDTO fzxzResDTO);
+public interface FzxzResMapper extends BaseMapper<SelectionResDTO> {
+    void saveOne(SelectionResDTO fzxzResDTO);
 
-    List<FzxzResDTO> getListByRwbsm(String rwbsm);
+    List<SelectionResDTO> getListByRwbsm(String rwbsm);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/vector/GhdkaMapper.java

@@ -34,4 +34,18 @@ public interface GhdkaMapper extends BaseMapper<GhdkaDTO> {
      * @return 数据源中全部的字段信息
      */
     List<Map<String, Object>> getInfo(Map<String, Object> params);
+
+    /**
+     * 根据idList，columnList 获取数据
+     */
+    List<Map<String, Object>> getInfoListByColumn(@Param("tableName") String tableName,
+                                              @Param("idList") List<String> idList,
+                                              @Param("columnList") List<String> columnList);
+
+    /**
+     * 根据id，columnList 获取数据
+     */
+    Map<String, Object> getInfoByColumn(@Param("tableName") String tableName,
+                                                  @Param("id") String id,
+                                                  @Param("columnList") List<String> columnList);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -87,11 +87,14 @@ public class FzssServiceImpl implements IFzssService {
     public FzxzCalc saveScheduleParam(SelectPilotVo selectPilotVo) throws JsonProcessingException {
         FzxzCalc fzxzCalc = new FzxzCalc();
         // 辅助选址
-        FzxzDTO fzxzDTO = selectPilotVo;
+        SelectionDTO fzxzDTO = selectPilotVo;
         fzxzDTO.setBsm(StringUtils.getUUID());
         fzxzDTO.setCjsj(new Date());
         fzxzDTO.setYdxz_bsm(fzxzDTO.getYdxz_bsm().replaceAll("\\[", "").replaceAll("\\]", ""));
-
+        // TODO 数据源
+        if (fzxzDTO.getSjy() == null) {
+            fzxzDTO.setSjy("TB_GHDK_SITUATION");
+        }
 
         // 选址因子
         List<FactorUseDTO> factorUseDTOS = selectPilotVo.getFactorList();
@@ -126,7 +129,7 @@ public class FzssServiceImpl implements IFzssService {
      * @param rwzt
      */
     private void updateFzxzStatus(String bsm, Integer rwzt) {
-        UpdateWrapper<FzxzDTO> wrapper = new UpdateWrapper<>();
+        UpdateWrapper<SelectionDTO> wrapper = new UpdateWrapper<>();
         wrapper.eq("bsm", bsm).set("rwzt", rwzt);
         fzxzMapper.update(null, wrapper);
     }
@@ -138,7 +141,7 @@ public class FzssServiceImpl implements IFzssService {
      * @param reportPath
      */
     private void updateFzxzReport(String bsm, String reportPath) {
-        UpdateWrapper<FzxzDTO> wrapper = new UpdateWrapper<>();
+        UpdateWrapper<SelectionDTO> wrapper = new UpdateWrapper<>();
         wrapper.eq("bsm", bsm).set("fxbg", reportPath);
         fzxzMapper.update(null, wrapper);
     }
@@ -151,18 +154,12 @@ public class FzssServiceImpl implements IFzssService {
      */
     @Override
     public RequestResult startSchedule(FzxzCalc fzxzCalc) {
-        FzxzDTO fzxzDTO = fzxzCalc.getFzxzDTO();
+        SelectionDTO fzxzDTO = fzxzCalc.getFzxzDTO();
         String taskId = fzxzDTO.getBsm();
 
         // 0.开始规划,更新任务状态
         updateFzxzStatus(taskId, Rwzt.getRun());
 
-        // TODO 数据源
-        String sjyName = "";
-        fzxzDTO.setSjy("TB_GHDK_SITUATION");
-        if (fzxzDTO.getSjy() == "TB_GHDK_SITUATION") {
-            sjyName = "规划地块";
-        }
 
         // 开始分析
         iLogService.saveLog(taskId, "辅助选址", "开始分析", "info");
@@ -190,7 +187,7 @@ public class FzssServiceImpl implements IFzssService {
             return RequestResult.error("区域筛选条件筛选未找到符合条件数据！", null);
         }
 
-        iLogService.saveLog(taskId, "辅助选址", "相交裁剪" + sjyName, "info");
+        iLogService.saveLog(taskId, "辅助选址", "相交裁剪区域数据", "info");
 
         //  3.用地类型（性质）筛选
         if (fzxzDTO.getUseLandType()) {
@@ -412,7 +409,7 @@ public class FzssServiceImpl implements IFzssService {
             String geom = (String) landMap.get("geom");
             Double area = (Double) landMap.get("siweiarea");
 
-            FzxzResDTO fzxzResDTO = DozerUtils.map(resMap, FzxzResDTO.class);
+            SelectionResDTO fzxzResDTO = DozerUtils.map(resMap, SelectionResDTO.class);
             fzxzResDTO.setBsm(StringUtils.getUUID());
             fzxzResDTO.setRwbsm(rwbsm);
             fzxzResDTO.setSjyb(sjyb);
@@ -439,59 +436,77 @@ public class FzssServiceImpl implements IFzssService {
         if (StringUtils.isEmpty(bsm)) {
             return RequestResult.error("标识码参数未传递！", null);
         }
-        // 查询辅助选址基本信息
-        QueryWrapper<FzxzDTO> fzxzwrapper = new QueryWrapper<>();
+        // 1.获取选址任务信息
+        QueryWrapper<SelectionDTO> fzxzwrapper = new QueryWrapper<>();
         fzxzwrapper.eq("bsm", bsm);
-        FzxzDTO fzxzinfo = fzxzMapper.selectOne(fzxzwrapper);
-        if (fzxzinfo == null) {
+        SelectionDTO selectionInfo = fzxzMapper.selectOne(fzxzwrapper);
+        if (selectionInfo == null) {
             return RequestResult.error("辅助选址记录查为未空！", null);
         }
 
+
         // 构建返回结果
-        FzxzResultDTO result = DozerUtils.map(fzxzinfo, FzxzResultDTO.class);
-        // 返回选址空间范围
-        String geomId = fzxzinfo.getGeomId();
+        FzxzResultDTO result = DozerUtils.map(selectionInfo, FzxzResultDTO.class);
+
+        // 2.返回选址空间范围
+        String geomId = selectionInfo.getGeomId();
         GeomRes geomRes = shpFileMapper.getOne(geomId);
         result.setGeom(geomRes.getGeom());
 
-        // 查询分析结果信息
-        List<FzxzResDTO> fzxzResDTOS = fzxzResMapper.getListByRwbsm(result.getBsm());
-        // 查询地块信息
-        // TODO 查询地块信息修改
-
-        String resourceTable = "";
-        List<Integer> dkIds = new ArrayList<>();
-        Map<Integer, FzxzResDTO> dkResMap = new HashMap<>();
-        for (FzxzResDTO fzxzResDTO : fzxzResDTOS) {
-            resourceTable = fzxzResDTO.getSjyb();
-            dkIds.add(fzxzResDTO.getDkid());
-            dkResMap.put(fzxzResDTO.getDkid(), fzxzResDTO);
-        }
-
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("sjy", resourceTable);
-        paramMap.put("idList", dkIds);
-        List<Map<String, Object>> dkSelectMap = ghdkaMapper.getInfo(paramMap);
-        Map<Integer, Map<String, Object>> dkRawMap = new HashMap<>();
-        for (Map<String, Object> map : dkSelectMap) {
-            dkRawMap.put((Integer) map.get("id"), map);
-        }
+        // 3.查询分析结果地块信息
+        List<SelectionResDTO> selectionResList = fzxzResMapper.getListByRwbsm(result.getBsm());
 
         List<Map<String, Object>> dkMaps = new ArrayList<>();
-        for (FzxzResDTO fzxzResDTO : fzxzResDTOS) {
+        for (SelectionResDTO selectionRes : selectionResList) {
+
+            // 查询地块信息
+            String rawTableName = selectionInfo.getSjy();
+            Integer rawItemId = selectionRes.getDkid();
+            List<String> columns = new ArrayList<>();
+            columns.add("kzxxgyddm");
+            columns.add("kzxxgydmc");
+            Map<String, Object> rawTable = ghdkaMapper.getInfoByColumn(rawTableName, rawItemId.toString(), columns);
+
+
+            // 构建地块返回结果
             Map<String, Object> dkMap = new HashMap<>();
-            if (dkRawMap.containsKey(fzxzResDTO.getDkid())) {
-                Integer dkId = fzxzResDTO.getDkid();
-                Map<String, Object> dkInfoMap = dkRawMap.get(fzxzResDTO.getDkid());
-                dkMap.put("dkbm", dkInfoMap.get("dkbm"));// 地块编码
-                dkMap.put("kzxxgydmc", dkInfoMap.get("kzxxgydmc"));// 地块类型
-                dkMap.put("landPrice", NumberUtil.double2TwoDecimal(fzxzResDTO.getLandPrice()));// 地价
-                dkMap.put("geom", dkResMap.get(dkId).getGeom());
-                dkMap.put("id", dkResMap.get(dkId).getBsm());
-                dkMap.put("area", NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(dkResMap.get(dkId).getArea())));// 面积
+            if (rawTable != null && rawTable.containsKey("kzxxgyddm") && rawTable.containsKey("kzxxgydmc")) {
+                dkMap.put("dkbm", rawTable.get("kzxxgyddm"));// 地块编码
+                dkMap.put("kzxxgydmc", rawTable.get("kzxxgydmc"));// 地块类型
             }
+
+            dkMap.put("landPrice", NumberUtil.double2TwoDecimal(selectionRes.getLandPrice()));// 地价
+            dkMap.put("geom", selectionRes.getGeom());
+            dkMap.put("id", selectionRes.getBsm());
+            dkMap.put("area", NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(selectionRes.getArea())));// 面积
+
             dkMaps.add(dkMap);
         }
+
+        // Map<String, Object> paramMap = new HashMap<>();
+        // paramMap.put("sjy", resourceTable);
+        // paramMap.put("idList", dkIds);
+        // List<Map<String, Object>> dkSelectMap = ghdkaMapper.getInfo(paramMap);
+        // Map<Integer, Map<String, Object>> dkRawMap = new HashMap<>();
+        // for (Map<String, Object> map : dkSelectMap) {
+        //     dkRawMap.put((Integer) map.get("id"), map);
+        // }
+        //
+        //
+        // for (SelectionResDTO fzxzResDTO : selectionResList) {
+        //     Map<String, Object> dkMap = new HashMap<>();
+        //     if (dkRawMap.containsKey(fzxzResDTO.getDkid())) {
+        //         Integer dkId = fzxzResDTO.getDkid();
+        //         Map<String, Object> dkInfoMap = dkRawMap.get(fzxzResDTO.getDkid());
+        //         dkMap.put("dkbm", dkInfoMap.get("dkbm"));// 地块编码
+        //         dkMap.put("kzxxgydmc", dkInfoMap.get("kzxxgydmc"));// 地块类型
+        //         dkMap.put("landPrice", NumberUtil.double2TwoDecimal(fzxzResDTO.getLandPrice()));// 地价
+        //         dkMap.put("geom", dkResMap.get(dkId).getGeom());
+        //         dkMap.put("id", dkResMap.get(dkId).getBsm());
+        //         dkMap.put("area", NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(dkResMap.get(dkId).getArea())));// 面积
+        //     }
+        //     dkMaps.add(dkMap);
+        // }
         result.setDks(dkMaps);
 
         // 查询选址因子

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ReportServiceImpl.java

@@ -3,7 +3,6 @@ package com.onemap.analyse.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.onemap.analyse.domain.*;
 import com.onemap.analyse.mapper.FzxzMapper;
-import com.onemap.analyse.mapper.FzxzTbMapper;
 import com.onemap.analyse.mapper.FactorUseMapper;
 import com.onemap.analyse.mapper.base.FzxzResMapper;
 import com.onemap.analyse.service.ILogService;
@@ -16,7 +15,6 @@ import org.apache.poi.xwpf.usermodel.*;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -74,9 +72,9 @@ public class ReportServiceImpl implements IReportService {
             fzxzReport.setJsdw(res.getJsdw());
             fzxzReport.setXmmc(res.getXmmc());
             // 查询分析结果图斑信息
-            QueryWrapper<FzxzResDTO> giswrapper = new QueryWrapper<>();
+            QueryWrapper<SelectionResDTO> giswrapper = new QueryWrapper<>();
             giswrapper.eq("rwbsm", res.getBsm());
-            List<FzxzResDTO> gisinfo = fzxzResMapper.selectList(giswrapper);
+            List<SelectionResDTO> gisinfo = fzxzResMapper.selectList(giswrapper);
             fzxzReport.setItems(gisinfo);
         }
         // 插入开始生成报告日志
@@ -235,14 +233,14 @@ public class ReportServiceImpl implements IReportService {
             tabYztbTitles.add(tableTitleTb);
             XWPFTable tableYztb = NpoiHelper.setComTable(document, tabYztbTitles, fztable, "表2：地类分析统计表", pos++);
             // 查询结果
-            QueryWrapper<FzxzResDTO> giswrapper = new QueryWrapper<>();
+            QueryWrapper<SelectionResDTO> giswrapper = new QueryWrapper<>();
             giswrapper.eq("rwbsm", res.getBsm());
             // 筛选方案，根据传参或者预选方案
 //            giswrapper.ne("yxfa", "0");
             if (xzbsmList != null) {
                 giswrapper.in("bsm", xzbsmList);
             }
-            List<FzxzResDTO> fzxzJgGisDTOList = fzxzResMapper.selectList(giswrapper);
+            List<SelectionResDTO> fzxzJgGisDTOList = fzxzResMapper.selectList(giswrapper);
             NpoiHelper.catalog(document, "三、选址分析", pos++);
             String ydmc = res.getYdmc();
             if (!StringUtils.isEmpty(ydmc)) {
@@ -258,7 +256,7 @@ public class ReportServiceImpl implements IReportService {
             NpoiHelper.Option optionIsBold = new NpoiHelper.Option();
             optionIsBold.setBold(true);
             for (int i = 0; i < fzxzJgGisDTOList.size(); i++) {
-                FzxzResDTO item = fzxzJgGisDTOList.get(i);
+                SelectionResDTO item = fzxzJgGisDTOList.get(i);
                 document.setParagraph(NpoiHelper.newParagraph(document, index + "、方案" + NumberUtil.int2chineseNum(index), optionIsBold), pos++);
                 XWPFTable table = document.createTable(7, 4);
                 table.setWidth(9000);// 总宽度

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FzxzPlanSchedule.java

@@ -1,8 +1,6 @@
 package com.onemap.analyse.task;
 
-import com.onemap.analyse.domain.FzxzDTO;
 //import com.onemap.analyse.domain.FzxzXzyzDTO;
-import com.onemap.common.core.web.domain.StatusMsg;
 // import com.supermap.data.*;
 // import com.supermap.data.conversion.DataImport;
 // import com.supermap.data.conversion.ImportMode;
@@ -10,9 +8,6 @@ import com.onemap.common.core.web.domain.StatusMsg;
 // import com.supermap.data.conversion.ImportSettingSHP;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-import java.util.List;
-
 /**
  * 辅助规划选址，通过超图iObject分析
  */

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/utils/SuperMapAnalysisUtil.java

@@ -1,6 +1,6 @@
 package com.onemap.analyse.utils;
 
-import com.onemap.analyse.domain.FzxzDTO;
+import com.onemap.analyse.domain.SelectionDTO;
 // import com.supermap.data.Geometry;
 // import com.supermap.data.Toolkit;
 
@@ -9,7 +9,7 @@ import com.onemap.analyse.domain.FzxzDTO;
  */
 public class SuperMapAnalysisUtil {
     // 辅助选址计算
-    private static void fzxz(FzxzDTO fzxzDTO) {
+    private static void fzxz(SelectionDTO fzxzDTO) {
         // 拿到空间数据
         // Geometry geometry = Toolkit.WKTToGeometry(fzxzDTO.getXzfw());
     }

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

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

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/base/FzxzResMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.onemap.analyse.mapper.base.FzxzResMapper">
-    <resultMap type="com.onemap.analyse.domain.FzxzResDTO" id="fzxzResMap">
+    <resultMap type="com.onemap.analyse.domain.SelectionResDTO" id="fzxzResMap">
 
     </resultMap>
     <insert id="saveOne">

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/vector/GhdkaMapper.xml

@@ -93,4 +93,24 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="getInfoListByColumn" parameterType="map" resultType="map">
+        SELECT
+        <foreach collection="columnList" item="column" separator=",">
+            ${column}
+        </foreach>
+        FROM "${tableName}"
+        WHERE id::varchar IN
+        <foreach collection="idList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+    <select id="getInfoByColumn" parameterType="map" resultType="map">
+        SELECT
+        <foreach collection="columnList" item="column" separator=",">
+            ${column}
+        </foreach>
+        FROM "${tableName}"
+        WHERE id::varchar = #{id}
+    </select>
 </mapper>

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

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

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

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

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

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

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

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

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

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