id全部转换成string

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

@@ -7,6 +7,6 @@ import java.util.List;
 @Data
 public class ContainsTableWktVo {
     String tableName;
-    List<Integer> tableIds;
+    List<String> tableIds;
     String ewkt;
 }

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

@@ -6,5 +6,5 @@ import java.util.List;
 
 @Data
 public class ContainsTablesVo extends TableABBean {
-    List<Integer> tableIdsB;
+    List<String> tableIdsB;
 }

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

@@ -6,5 +6,5 @@ import java.util.List;
 
 @Data
 public class DifferenceTablesVo extends TableABBean{
-    List<Integer> tableIdsA;
+    List<String> tableIdsA;
 }

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

@@ -7,7 +7,7 @@ import java.util.List;
 @Data
 public class DistanceTableWktVo {
     String tableName;
-    List<Integer> tableIds;
+    List<String> tableIds;
     String ewkt;
     Integer distance;
 }

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

@@ -6,7 +6,7 @@ import java.util.List;
 
 @Data
 public class DistanceTablesVo extends TableABBean {
-    List<Integer> tableIdsB;
+    List<String> tableIdsB;
     Integer distance;
     // 1:>,2>=,3<,4<=
     Integer distanceType;

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

@@ -7,6 +7,6 @@ import java.util.List;
 @Data
 public class IntersectsTableWktVo {
     private String tableName;
-    private List<Integer> tableIds;
+    private List<String> tableIds;
     private String ewkt;
 }

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

@@ -16,9 +16,9 @@ public interface AnalyseUtilsDBMapper {
      * @param ewkt      ewkt
      * @return
      */
-    List<Integer> intersectsTableWkt(
+    List<String> intersectsTableWkt(
             @Param("tableName") String tableName,
-            @Param("tableIds") List<Integer> tableIds,
+            @Param("tableIds") List<String> tableIds,
             @Param("ewkt") String ewkt);
 
     /**
@@ -29,9 +29,9 @@ public interface AnalyseUtilsDBMapper {
      * @param ewkt
      * @return
      */
-    List<Integer> containsTableWkt(
+    List<String> containsTableWkt(
             @Param("tableName") String tableName,
-            @Param("tableIds") List<Integer> tableIds,
+            @Param("tableIds") List<String> tableIds,
             @Param("ewkt") String ewkt);
 
     /**
@@ -42,10 +42,10 @@ public interface AnalyseUtilsDBMapper {
      * @param tableIdsB
      * @return
      */
-    List<Integer> containsTables(
+    List<String> containsTables(
             @Param("tableNameA") String tableNameA,
             @Param("tableNameB") String tableNameB,
-            @Param("tableIdsB") List<Integer> tableIdsB);
+            @Param("tableIdsB") List<String> tableIdsB);
 
     /**
      * 计算wkt距离范围内table中的数据，返回table id
@@ -55,9 +55,9 @@ public interface AnalyseUtilsDBMapper {
      * @param ewkt      wkt
      * @return
      */
-    List<Integer> distanceTableWkt(
+    List<String> distanceTableWkt(
             @Param("tableName") String tableName,
-            @Param("tableIds") List<Integer> tableIds,
+            @Param("tableIds") List<String> tableIds,
             @Param("ewkt") String ewkt,
             @Param("distance") Integer distance);
 
@@ -68,10 +68,10 @@ public interface AnalyseUtilsDBMapper {
      * @param tableNameB
      * @return
      */
-    List<Integer> distanceTables(
+    List<String> distanceTables(
             @Param("tableNameA") String tableNameA,
             @Param("tableNameB") String tableNameB,
-            @Param("tableIdsB") List<Integer> tableIdsB,
+            @Param("tableIdsB") List<String> tableIdsB,
             @Param("distance") Integer distance,
             @Param("distanceType") Integer distanceType);
 }

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

@@ -37,7 +37,7 @@ public interface CreateUtilsDBMapper {
      * @return
      */
     void differenceTables(@Param("tableNameA") String tableNameA,
-                          @Param("tableIdsA") List<Integer> tableIdsA,
+                          @Param("tableIdsA") List<String> tableIdsA,
                           @Param("tableNameB") String tableNameB,
                           @Param("newTableName") String newTableName,
                           @Param("temporaryTable") String temporaryTable);
@@ -50,7 +50,7 @@ public interface CreateUtilsDBMapper {
      * @return
      */
     void intersectionTableWkt(@Param("tableName") String tableName,
-                              @Param("tableIds") List<Integer> tableIds,
+                              @Param("tableIds") List<String> tableIds,
                               @Param("ewkt") String ewkt,
                               @Param("newTableName") String newTableName);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/AnalyseUtilsDBService.java

@@ -15,9 +15,9 @@ public interface AnalyseUtilsDBService {
      * @param ewkt     wkt
      * @return
      */
-    List<Integer> intersectsTableWkt(
+    List<String> intersectsTableWkt(
             String tableName,
-            List<Integer> tableIds,
+            List<String> tableIds,
             String ewkt);
 
 
@@ -30,9 +30,9 @@ public interface AnalyseUtilsDBService {
      * @param ewkt      wkt
      * @return
      */
-    List<Integer> containsTableWkt(
+    List<String> containsTableWkt(
             String tableName,
-            List<Integer> tableIds,
+            List<String> tableIds,
             String ewkt);
 
     /**
@@ -42,10 +42,10 @@ public interface AnalyseUtilsDBService {
      * @param tableNameB
      * @return
      */
-    List<Integer> containsTables(
+    List<String> containsTables(
             String tableNameA,
             String tableNameB,
-            List<Integer> tableIdsB);
+            List<String> tableIdsB);
 
     /**
      * 计算wkt距离范围内table中的数据，返回table id
@@ -55,8 +55,8 @@ public interface AnalyseUtilsDBService {
      * @param ewkt       wkt
      * @return
      */
-    List<Integer> distanceTableWkt(String inputTable,
-                                   List<Integer> inputIds,
+    List<String> distanceTableWkt(String inputTable,
+                                   List<String> inputIds,
                                    String ewkt,
                                    Integer distance);
 
@@ -67,10 +67,10 @@ public interface AnalyseUtilsDBService {
      * @param tableNameB
      * @return
      */
-    List<Integer> distanceTables(
+    List<String> distanceTables(
             String tableNameA,
             String tableNameB,
-            List<Integer> tableIdsB,
+            List<String> tableIdsB,
             Integer distance,
             Integer distanceType);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/CreateUtilsDBService.java

@@ -33,7 +33,7 @@ public interface CreateUtilsDBService {
      * @return
      */
     String differenceTables(String tableNameA,
-                            List<Integer> tableIdsA,
+                            List<String> tableIdsA,
                             String tableNameB);
 
     /**
@@ -46,6 +46,6 @@ public interface CreateUtilsDBService {
      */
     String intersectionTableWkt(
             String tableName,
-            List<Integer> tableIds,
+            List<String> tableIds,
             String ewkt);
 }

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

@@ -14,27 +14,27 @@ public class AnalyseUtilsDBServiceImpl implements AnalyseUtilsDBService {
     private AnalyseUtilsDBMapper analyseUtilsDBMapper;
 
     @Override
-    public List<Integer> intersectsTableWkt(String tableName, List<Integer> tableIds, String ewkt) {
+    public List<String> intersectsTableWkt(String tableName, List<String> tableIds, String ewkt) {
         return analyseUtilsDBMapper.intersectsTableWkt(tableName, tableIds, ewkt);
     }
 
     @Override
-    public List<Integer> containsTableWkt(String tableName, List<Integer> tableIds, String ewkt) {
+    public List<String> containsTableWkt(String tableName, List<String> tableIds, String ewkt) {
         return analyseUtilsDBMapper.containsTableWkt(tableName, tableIds, ewkt);
     }
 
     @Override
-    public List<Integer> containsTables(String tableNameA, String tableNameB, List<Integer> tableIdsB) {
+    public List<String> containsTables(String tableNameA, String tableNameB, List<String> tableIdsB) {
         return analyseUtilsDBMapper.containsTables(tableNameA, tableNameB, tableIdsB);
     }
 
     @Override
-    public List<Integer> distanceTableWkt(String tableName, List<Integer> tableIds, String ewkt, Integer distance) {
+    public List<String> distanceTableWkt(String tableName, List<String> tableIds, String ewkt, Integer distance) {
         return analyseUtilsDBMapper.distanceTableWkt(tableName, tableIds, ewkt, distance);
     }
 
     @Override
-    public List<Integer> distanceTables(String tableNameA, String tableNameB, List<Integer> tableIdsB, Integer distance, Integer distanceType) {
+    public List<String> distanceTables(String tableNameA, String tableNameB, List<String> tableIdsB, Integer distance, Integer distanceType) {
         return analyseUtilsDBMapper.distanceTables(tableNameA, tableNameB, tableIdsB, distance, distanceType);
     }
 }

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

@@ -29,7 +29,7 @@ public class CreateUtilsDBServiceImpl implements CreateUtilsDBService {
     }
 
     @Override
-    public String differenceTables(String tableNameA, List<Integer> tableIdsA, String tableNameB) {
+    public String differenceTables(String tableNameA, List<String> tableIdsA, String tableNameB) {
         long timestamp = System.currentTimeMillis();
         String newTableName = tableNameA + "_diff_" + tableNameB+"_" + timestamp;
         String temporaryTable = "temporaryTable_" + timestamp;
@@ -38,7 +38,7 @@ public class CreateUtilsDBServiceImpl implements CreateUtilsDBService {
     }
 
     @Override
-    public String intersectionTableWkt(String tableName, List<Integer> tableIds, String ewkt) {
+    public String intersectionTableWkt(String tableName, List<String> tableIds, String ewkt) {
         long timestamp = System.currentTimeMillis();
         String newTableName = tableName + "_inter_" +  timestamp;
         createUtilsDBMapper.intersectionTableWkt(tableName, tableIds, ewkt,newTableName);

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.analyse.mapper.vector.AnalyseUtilsDBMapper">
 
-    <select id="intersectsTableWkt" resultType="Integer">
+    <select id="intersectsTableWkt" resultType="String">
         SELECT id
         FROM "${tableName}" inTbale
         where public.st_intersects(
@@ -12,12 +12,12 @@
         inTbale.geom
         )
         <if test="tableIds != null and tableIds.size()>0 ">
-            and (inTbale.id) in
+            and (inTbale.id::VARCHAR) in
             <foreach collection="tableIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
         </if>
     </select>
 
-    <select id="containsTableWkt" resultType="Integer">
+    <select id="containsTableWkt" resultType="String">
         SELECT id
         FROM "${tableName}" inTbale
         where public.st_contains(
@@ -25,18 +25,18 @@
         inTbale.geom
         )
         <if test="tableIds != null and tableIds.size()>0 ">
-            and (inTbale.id) in
+            and (inTbale.id::VARCHAR) in
             <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
     </select>
 
 
-    <select id="containsTables" resultType="Integer">
+    <select id="containsTables" resultType="String">
         SELECT id
         FROM "${tableNameB}" tableB
         WHERE 1=1
         <if test="tableIdsB != null and tableIdsB.size()>0 ">
-            and (tableB.id) in
+            and (tableB.id::VARCHAR) in
             <foreach collection="tableIdsB" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
         AND EXISTS (
@@ -46,24 +46,24 @@
         )
     </select>
 
-    <select id="distanceTableWkt" resultType="Integer">
+    <select id="distanceTableWkt" resultType="String">
         SELECT id
         FROM "${tableName}" inTbale
         where public.ST_DWithin(
         inTbale.geom::public.geography,
         public.st_geomfromewkt(#{ewkt})::public.geography,#{distance})
         <if test="tableIds != null and tableIds.size()>0 ">
-            and (inTbale.id) in
+            and (inTbale.id::VARCHAR) in
             <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
     </select>
 
-    <select id="distanceTables" resultType="Integer">
+    <select id="distanceTables" resultType="String">
         SELECT id
         FROM "${tableNameB}" tableB
         WHERE 1=1
         <if test="tableIdsB != null and tableIdsB.size()>0 ">
-            and (tableB.id) in
+            and tableB.id::VARCHAR in
             <foreach collection="tableIdsB" item="tableId" open="(" close=")" separator=",">#{tableId}</foreach>
         </if>
         AND EXISTS (

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

@@ -26,7 +26,7 @@
         WHERE
         public.st_intersects ( a.geom, b.geom )
         <if test="tableIdsA != null and tableIdsA.size() > 0">
-            AND a.id IN
+            AND (a.id::VARCHAR) IN
             <foreach collection="tableIdsA" item="tableId" open="(" close=")" separator=",">
                 #{tableId}
             </foreach>
@@ -40,7 +40,7 @@
         "${temporaryTable}" b
         WHERE 1=1
         <if test="tableIdsA != null and tableIdsA.size() > 0">
-            AND a.id IN
+            AND (a.id::VARCHAR) IN
             <foreach collection="tableIdsA" item="tableId" open="(" close=")" separator=",">
                 #{tableId}
             </foreach>
@@ -56,7 +56,7 @@
         FROM "${tableName}" inTbale
         WHERE 1=1
         <if test="tableIds != null and tableIds.size() > 0">
-            AND inTbale.id IN
+            AND inTbale.id::VARCHAR IN
             <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">
                 #{tableId}
             </foreach>