调整动态传递schema

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

@@ -81,6 +81,9 @@ public interface CadastreFileMapper {
      */
     void addValidFlagColumn(@Param("tableName") String tableName);
 
+    void addValidFlagColumnComment(@Param("tableName") String tableName);
+
+
     void updateValidFlag(@Param("validFlag") String validFlag, @Param("oldValidFlag") String oldValidFlag,@Param("landRightType") String landRightType, @Param("tableName") String tableName);
 
     void deleteByValidFlag(@Param("validFlag") String validFlag,@Param("landRightType") String landRightType,@Param("tableName") String tableName);

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

@@ -1577,17 +1577,58 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 "spatial_ref_sys"
         };
 
+        List<String> haveGeomTableList = Arrays.asList(
+                "CLKZD",
+                "XZQJX",
+                "ZJ",
+                "CJDCQ",
+                "SGSJ",
+                "DJDY",
+                "JZX",
+                "JZD",
+                "QMSYQ",
+                "JTSYQ",
+                "ZYQ",
+                "CDQ",
+                "BDCXXGLD",
+                "SZYBK",
+                "BCBK",
+                "SDBK",
+                "SLBK",
+                "CYBK",
+                "HDBK",
+                "HYBK",
+                "WJMHDBK",
+                "TMCLKCZYBK",
+                "YJJBNT",
+                "STBHHX",
+                "CZKFBJ",
+                "LSWHBH",
+                "QTGGGZ"
+        );
+
         //获取库中表名
         //List<String> allTableList = cadastreFileMapper.selectAllTable();
         List<String> allTableList = cadastreFileMapper.selectAllTableNoView();
-        allTableList.removeAll(Arrays.asList(arr));
+        //allTableList.removeAll(Arrays.asList(arr));
 
-        // 对每个表名执行添加校验字段的操作
+        int i=0;
         for (String tableName : allTableList) {
-            System.out.println("正在处理表: " + tableName);
-            cadastreFileMapper.addValidFlagColumn(tableName);
-            System.out.println("正在处理表: " + tableName + " 完成");
+            if(haveGeomTableList.contains(tableName.toUpperCase(Locale.ROOT))){
+                System.out.println("正在处理表: " + tableName);
+                cadastreFileMapper.addValidFlagColumn(tableName);
+                cadastreFileMapper.addValidFlagColumnComment(tableName);
+                System.out.println(++i);
+            }
         }
+
+        // 对每个表名执行添加校验字段的操作
+//        for (String tableName : allTableList) {
+//            System.out.println("正在处理表: " + tableName);
+//            cadastreFileMapper.addValidFlagColumn(tableName);
+//            cadastreFileMapper.addValidFlagColumnComment(tableName);
+//            System.out.println("正在处理表: " + tableName + " 完成");
+//        }
     }
 
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

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

@@ -209,7 +209,7 @@
 
     <select id="selectGeoms"  resultType="string">
         SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|') as "geoms"
-        from ${schemaName}.${tableName} gd
+        from #{schemaName}.${tableName} gd
         <where>
             <if test="tableName=='zdjbxx'">
                 AND  gd.valid_flag = 0 AND   gd.zt IN ('1', '2')
@@ -227,14 +227,24 @@
         WHERE valid_flag = #{validFlag}::int2
     </select>
 
-    <update id="addValidFlagColumn">
-            COMMENT ON COLUMN natural.${tableName}."valid_flag" IS '有效标识：0-当前版本，1-历史版本';
+    <update id="addValidFlagColumn111">
+        ALTER TABLE "natural".${tableName} ADD COLUMN IF NOT EXISTS  geom  geometry(GEOMETRY);
     </update>
-    
-    <update id="addValidFlagColumn2">
-        ALTER TABLE vector.${tableName} ADD COLUMN IF NOT EXISTS valid_flag int2
+
+    <update id="addValidFlagColumnComment111">
+        COMMENT ON COLUMN "natural".${tableName}."geom" IS '空间';
+    </update>
+
+
+    <update id="addValidFlagColumn222">
+        ALTER TABLE "natural".${tableName} ADD COLUMN IF NOT EXISTS valid_flag int2
     </update>
 
+    <update id="addValidFlagColumnComment222">
+            COMMENT ON COLUMN "natural".${tableName}."valid_flag" IS '有效标识：0-当前版本，1-历史版本';
+    </update>
+
+
     <select id="getListByFilter" parameterType="com.siwei.apply.domain.vo.CadastreFileFilterVo" resultMap="cadastreFileMap">
         SELECT <include refid="Base_Column_List"/>
         FROM t_cadastre_file