Merge remote-tracking branch 'origin/dev-excel0521' into dev-excel0521

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.file.Path;
@@ -107,6 +108,21 @@ public class ProjectController extends BaseController {
         }
     }
 
+    /**
+     * 根据当前生命周期阶段查询项目
+     */
+    @PostMapping("/cycle/projects")
+    public R<Map<String, Object>> GetCurrentCycleProjects(@RequestBody ProjectCycleProjectVo projectCycleProjectVo) {
+        try {
+            Map<String, Object> projects = projectService.getCurrentCycleProjects(projectCycleProjectVo);
+            return R.ok(projects);
+        } catch (IllegalArgumentException e) {
+            return R.fail(501, e.getMessage());
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
 
     /**
      * 获取项目概览
@@ -130,6 +146,31 @@ public class ProjectController extends BaseController {
         return R.ok(projectCycleRes);
     }
 
+    /**
+     * 导出项目全生命周期SHP
+     */
+    @GetMapping("/cycle/{projectId}/shp")
+    public void ExportCycleShp(@PathVariable String projectId, HttpServletResponse response) {
+        projectService.exportCycleShp(projectId, response);
+    }
+
+    /**
+     * 批量导出项目全生命周期SHP
+     */
+    @PostMapping("/cycle/shp")
+    public void ExportCycleShp(@RequestBody IdsVo idsVo, HttpServletResponse response) {
+        projectService.exportCycleShp(idsVo.getIds(), response);
+    }
+
+    /**
+     * 批量导出当前生命周期阶段SHP
+     */
+    @PostMapping("/cycle/current/shp")
+    public void ExportCurrentCycleShp(@RequestBody ProjectCycleCurrentShpVo projectCycleCurrentShpVo,
+                                      HttpServletResponse response) {
+        projectService.exportCurrentCycleShp(projectCycleCurrentShpVo, response);
+    }
+
     /**
      * 更新项目
      *

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -14,6 +14,7 @@ import com.siwei.apply.utils.ServiceFileUtil;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.utils.StringUtils;
 import com.siwei.common.core.web.controller.BaseController;
+import com.siwei.common.core.web.page.TableDataInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.gdal.ogr.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -274,8 +275,19 @@ public class CadastreManageController extends BaseController {
      * @return
      */
     @GetMapping("/selectTableList")
-    public R<List<Map<String,Object>>> selectTableRow(@RequestParam("tableName") String tableName,@RequestParam("geomFlag") String geomFlag,@RequestParam(value = "bsm",required = false,defaultValue = "") String bsm, @RequestParam(value = "ywh",required = false,defaultValue = "") String ywh) {
+    public R<?> selectTableRow(@RequestParam("tableName") String tableName,
+                               @RequestParam("geomFlag") String geomFlag,
+                               @RequestParam(value = "bsm", required = false, defaultValue = "") String bsm,
+                               @RequestParam(value = "ywh", required = false, defaultValue = "") String ywh,
+                               @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                               @RequestParam(value = "pageSize", required = false) Integer pageSize) {
         try {
+            if (pageNum != null && pageSize != null) {
+                startPage();
+                List<Map<String, Object>> pageRows = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh, true);
+                TableDataInfo tableDataInfo = getDataTable(pageRows);
+                return R.ok(tableDataInfo);
+            }
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);
         } catch (Exception e) {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/ProjectCycleCurrentShpVo.java

@@ -0,0 +1,29 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 当前生命周期阶段SHP导出参数
+ */
+@Data
+public class ProjectCycleCurrentShpVo {
+    /**
+     * 阶段业务表名，如 t_ydysyxz、t_tdgy
+     */
+    private String nodeTableName;
+
+    /**
+     * 勾选的当前阶段地块行
+     */
+    private List<Item> rows;
+
+    @Data
+    public static class Item {
+        private String projectId;
+        private String nodeId;
+        private String geomNodeId;
+        private String geomId;
+    }
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/ProjectCycleProjectVo.java

@@ -0,0 +1,28 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Map;
+
+/**
+ * 按生命周期阶段查询项目参数
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectCycleProjectVo extends ProjectFilterVo {
+    /**
+     * 阶段业务表名，如 t_ydysyxz、t_tdgy
+     */
+    private String nodeTableName;
+
+    /**
+     * 前端阶段类型，如 ydysyxz、tdgy
+     */
+    private String worktype;
+
+    /**
+     * 按当前阶段属性字段查询，key 为前端列字段名
+     */
+    private Map<String, Object> queryParams;
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/CadastreFileMapper.java

@@ -97,7 +97,7 @@ public interface CadastreFileMapper {
 
     int batchDeleteByBsm(@Param("tableName") String tableName, @Param("list") List<Map<String, Object>> list);
 
-    List<Map<String,Object>> selectTableDataByCondition(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("bsm") String bsm,@Param("ywh") String ywh);
+    List<Map<String,Object>> selectTableDataByCondition(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("bsm") String bsm,@Param("ywh") String ywh,@Param("needLimit") Boolean needLimit);
 
 
     List<Map<String,Object>> selectTableDataByZDDMorBDCDYH(@Param("validFlag") String validFlag, @Param("tableName") String tableName,@Param("zdIdList") List<String> zdIdList,@Param("zddmKey") String zddmKey,@Param("bdcIdList") List<String> bdcIdList) ;

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/NodeLandMapper.java

@@ -21,7 +21,6 @@ public interface NodeLandMapper {
      */
     Map<String, String> selectGeomByNodeId(String nodeId);
 
-
     Integer selectCountGeomByNodeId(@Param("nodeIdList") List<String> nodeIdList);
 
 
@@ -54,6 +53,8 @@ public interface NodeLandMapper {
 
     List<Map<String, String>> selectGeomDbDetailsByNodeId(@Param("nodeId")String nodeId, @Param("geomId")String geomId);
 
+    Boolean existsGeomIntersect(@Param("sourceGeomId") String sourceGeomId, @Param("targetGeomId") String targetGeomId);
+
     Map<String, String> selectGeomContainsNode(@Param("detailsId")String detailsId);
 
     List<Map<String, Object>> selectGeomDetailsByGeomDbId( @Param("geomDbId")String geomDbId);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectMapper.java

@@ -30,6 +30,11 @@ public interface ProjectMapper {
      */
     List<Project> getList(ProjectFilterVo projectFilterVo);
 
+    /**
+     * 获取不分页项目列表
+     */
+    List<Project> getListWithoutPage(ProjectFilterVo projectFilterVo);
+
     /**
      * 获取项目总数
      *
@@ -84,4 +89,4 @@ public interface ProjectMapper {
 
 
 
-}
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectWorkflowMapper.java

@@ -75,6 +75,7 @@ public interface ProjectWorkflowMapper {
 
     Map<String,Object> getCurrentNode(@Param("id") String id, @Param("projectId") String projectId, @Param("tableName") String tableName);
 
+    List<Map<String,String>> selectTableColumnComments(@Param("tableName") String tableName);
 
 
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/ProjectService.java

@@ -6,11 +6,14 @@ import com.siwei.apply.domain.ProjectWorkflow;
 import com.siwei.apply.domain.res.ProjectCycleRes;
 import com.siwei.apply.domain.res.ProjectOverviewRes;
 import com.siwei.apply.domain.vo.NodeVo;
+import com.siwei.apply.domain.vo.ProjectCycleCurrentShpVo;
+import com.siwei.apply.domain.vo.ProjectCycleProjectVo;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
 import com.siwei.apply.domain.vo.ProjectUpdateVo;
 import com.siwei.apply.domain.vo.ProjectVo;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +48,8 @@ public interface ProjectService {
 
     Map<String, Object> getListAndGeom(ProjectFilterVo projectFilterVo);
 
+    Map<String, Object> getCurrentCycleProjects(ProjectCycleProjectVo projectCycleProjectVo);
+
     /**
      * 更新项目
      *
@@ -70,6 +75,12 @@ public interface ProjectService {
      */
     List<ProjectCycleRes> getCycle(String projectId);
 
+    void exportCycleShp(String projectId, HttpServletResponse response);
+
+    void exportCycleShp(List<String> projectIds, HttpServletResponse response);
+
+    void exportCurrentCycleShp(ProjectCycleCurrentShpVo projectCycleCurrentShpVo, HttpServletResponse response);
+
     void countOnChinaNum(String projectId);
 
     Map<String, Object> getListSearch(ProjectFilterVo projectFilterVo);
@@ -86,4 +97,3 @@ public interface ProjectService {
     void testData() ;
 
 }
-

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

@@ -48,6 +48,8 @@ public interface CadastreManageService {
 
     List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh);
 
+    List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh, boolean pageQuery);
+
     List<Map<String,Object>> selectTableRowExcel(String tableName,String geomFlag,List<Object> bsmList,List<String> ywhList);
 
     String tableRowUpdate(String tableName, List<Map<String,Object>> list);

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

@@ -1446,6 +1446,11 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
     @Override
     public List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh) {
+        return selectTableRow(tableName, geomFlag, bsm, ywh, false);
+    }
+
+    @Override
+    public List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh, boolean pageQuery) {
         String validFlag = "0";
         if(Arrays.asList("tf_500", "tf_1000", "tf_2000","zd_shp").contains(tableName)){
             validFlag = "";
@@ -1459,7 +1464,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         if (ywh.matches(".*=\\d+")) {
             ywh = ywh.replaceAll("=(\\d+)", "='$1'");
         }
-        List<Map<String,Object>> res = cadastreFileMapper.selectTableDataByCondition(validFlag,tableName,bsm,ywh);
+        List<Map<String,Object>> res = cadastreFileMapper.selectTableDataByCondition(validFlag,tableName,bsm,ywh,!pageQuery);
         if(CollectionUtils.isNotEmpty(res)){ //去掉geom字段和valid_flag字段
             List<Map<String, String>> dbFieldNameAndTypeList = cadastreFileMapper.selectTableCollumAndType(tableName.toLowerCase(Locale.ROOT));
             List<Object> filterCollumList =  dbFieldNameAndTypeList.stream().filter(s->s.get("data_type").equals("bytea")).map(s->s.get("column_name")).collect(Collectors.toList());

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

@@ -1016,7 +1016,7 @@ public class DealExcelServiceImpl {
 
         try {
             String ywh = "dzjgh = " + "'" + dzjgh + "'";
-            List<Map<String, Object>> gdRes = cadastreFileMapper.selectTableDataByCondition("", "gj_gd_data", "", ywh);
+            List<Map<String, Object>> gdRes = cadastreFileMapper.selectTableDataByCondition("", "gj_gd_data", "", ywh, true);
 
             log.info("获取excel中电子监管号：{}", dzjgh);
             List<String> gdIdList = gdRes.stream().filter(s -> s.get("dzjgh") != null).map(s -> s.get("gid").toString()).collect(Collectors.toList());

siwei-modules/siwei-apply/src/main/resources/mapper/NodeLandMapper.xml

@@ -95,7 +95,12 @@
 
     <!--  根据nodeId，查询出当前具体的图斑ID -->
     <select id="selectGeomDbDetailsByNodeId" parameterType="String" resultType="java.util.Map">
-        select  details.id, public.st_asewkt(details.geom) AS  geom, details.upload_id, details.geom_json, details.sort, details.geom_area
+        select  details.id as "id",
+                public.st_asewkt(details.geom) AS "geom",
+                details.upload_id as "uploadId",
+                details.geom_json as "geomJson",
+                details.sort as "sort",
+                details.geom_area as "geomArea"
         from t_geom_db_details  details
                  INNER JOIN   t_node_land node    on  node.geom_db_id=details.upload_id
         <where>
@@ -109,6 +114,18 @@
         </where>
     </select>
 
+    <select id="existsGeomIntersect" resultType="boolean">
+        SELECT EXISTS (
+            SELECT 1
+            FROM t_geom_db_details source
+                     JOIN t_geom_db_details target ON target.id = #{targetGeomId}
+            WHERE source.id = #{sourceGeomId}
+              AND source.geom IS NOT NULL
+              AND target.geom IS NOT NULL
+              AND public.ST_Intersects(source.geom, target.geom)
+        )
+    </select>
+
     <select id="selectGeomContainsNode" parameterType="String" resultType="map">
         SELECT  geom.id , node.node_id   FROM  "t_geom_db_details"  geom
                 LEFT JOIN "public"."t_geom_db"  upload   on geom.upload_id=upload.id

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -80,6 +80,42 @@
         ORDER BY updated_at DESC
         LIMIT #{pageSize} offset #{offset}
     </select>
+    <select id="getListWithoutPage" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultMap="projectMap">
+        SELECT *
+        FROM t_project
+        <where>
+            <if test="name != null and name != ''">
+                AND name LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="code != null and code != ''">
+                AND code LIKE CONCAT('%', #{code}, '%')
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                AND (
+                    name    LIKE CONCAT('%', #{keyWord}, '%')
+                    OR company LIKE CONCAT('%', #{keyWord}, '%')
+                )
+            </if>
+            <if test="projectType != null and projectType != 0">
+                AND project_type = #{projectType}
+            </if>
+            <if test="isOnchain != null and isOnchain==true">
+                AND on_chain_num > 0
+            </if>
+            <if test="shape != null and shape != ''">
+                AND EXISTS (
+                    SELECT 1
+                    FROM t_project_workflow pw
+                    JOIN t_node_land nl ON nl.node_id = pw.node_id
+                    JOIN t_geom_db_details gd ON gd.upload_id = nl.geom_db_id
+                    WHERE pw.project_id = t_project.id
+                      AND public.ST_Intersects(gd.geom, public.ST_GeomFromEWKT(#{shape}))
+                )
+            </if>
+
+        </where>
+        ORDER BY updated_at DESC
+    </select>
     <select id="getCount" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultType="int">
         SELECT COUNT(*)
         FROM t_project

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectWorkflowMapper.xml

@@ -96,6 +96,24 @@
         LIMIT 1
     </select>
 
+    <select id="selectTableColumnComments" parameterType="string" resultType="map">
+        SELECT
+            c.column_name AS "columnName",
+            COALESCE(d.description, c.column_name) AS "columnComment"
+        FROM information_schema.columns c
+        LEFT JOIN pg_catalog.pg_class pc
+               ON pc.relname = c.table_name
+        LEFT JOIN pg_catalog.pg_namespace pn
+               ON pn.oid = pc.relnamespace
+              AND pn.nspname = c.table_schema
+        LEFT JOIN pg_catalog.pg_description d
+               ON d.objoid = pc.oid
+              AND d.objsubid = c.ordinal_position
+        WHERE c.table_schema = 'public'
+          AND c.table_name = #{tableName}
+        ORDER BY c.ordinal_position
+    </select>
+
 
 
     <insert id="add" parameterType="com.siwei.apply.domain.ProjectWorkflow">

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -302,7 +302,9 @@
         <if test="ywh != null and ywh != ''">
             and ${ywh}
         </if>
-        LIMIT 100
+        <if test="needLimit != null and needLimit">
+            LIMIT 100
+        </if>
     </select>
 
 

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

@@ -18,7 +18,11 @@
         "title": "用地预审与选址意见书许可范围",
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_ydysyxz&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
-        "source": "",
+        "source": "t_ydysyxz",
+        "nodeTableName": "t_ydysyxz",
+        "tableName": "t_ydysyxz",
+        "sjly": "t_ydysyxz",
+        "worktype": "ydysyxz",
         "legend": "",
         "favorite": null,
         "disabled": false,
@@ -32,7 +36,11 @@
         "title": "用地报批",
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_ydbp&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
-        "source": null,
+        "source": "t_ydbp",
+        "nodeTableName": "t_ydbp",
+        "tableName": "t_ydbp",
+        "sjly": "t_ydbp",
+        "worktype": "ydbp",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -46,7 +54,11 @@
         "title": "规划条件与用地红线",
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_tjyydhx&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
-        "source": null,
+        "source": "t_tjyydhx",
+        "nodeTableName": "t_tjyydhx",
+        "tableName": "t_tjyydhx",
+        "sjly": "t_tjyydhx",
+        "worktype": "tjyydhx",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -61,6 +73,10 @@
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_tdgy&bbox=115.84467869332723%2C28.816888197870995%2C115.94519076899752%2C28.919477034878152&width=752&height=768&srs=EPSG%3A4326&styles=&format=application/openlayers",
         "source": "t_tdgy",
+        "nodeTableName": "t_tdgy",
+        "tableName": "t_tdgy",
+        "sjly": "t_tdgy",
+        "worktype": "tdgy",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -75,6 +91,10 @@
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_gyjsydscdj&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
         "source": "t_gyjsydscdj",
+        "nodeTableName": "t_gyjsydscdj",
+        "tableName": "t_gyjsydscdj",
+        "sjly": "t_gyjsydscdj",
+        "worktype": "gyjsydscdj",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -89,6 +109,10 @@
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_jsgcghxk&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
         "source": "t_jsydghxk",
+        "nodeTableName": "t_jsydghxk",
+        "tableName": "t_jsydghxk",
+        "sjly": "t_jsydghxk",
+        "worktype": "jsydghxk",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -103,6 +127,10 @@
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_jsydghxk&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
         "source": "t_jsgcghxk",
+        "nodeTableName": "t_jsgcghxk",
+        "tableName": "t_jsgcghxk",
+        "sjly": "t_jsgcghxk",
+        "worktype": "jsgcghxk",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -117,6 +145,10 @@
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_tdhyhs&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
         "source": "t_tdhyhs",
+        "nodeTableName": "t_tdhyhs",
+        "tableName": "t_tdhyhs",
+        "sjly": "t_tdhyhs",
+        "worktype": "tdhyhs",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -131,6 +163,10 @@
         "type": "wms",
         "url": "http://192.168.60.220:8090/geoserver/c_one_code/wms?service=WMS&version=1.1.0&request=GetMap&layers=c_one_code%3Ac_one_code_gyjsydjfwscdj&bbox=115.81535941350508%2C28.80663797957737%2C115.95003761461436%2C28.93561402541765&width=768&height=735&srs=EPSG%3A4326&styles=&format=application/openlayers",
         "source": "t_gyjsydjfwscdj",
+        "nodeTableName": "t_gyjsydjfwscdj",
+        "tableName": "t_gyjsydjfwscdj",
+        "sjly": "t_gyjsydjfwscdj",
+        "worktype": "gyjsydjfwscdj",
         "legend": null,
         "favorite": null,
         "disabled": false,
@@ -169,4 +205,4 @@
       }
     ]
   }
-]
+]