调整动态传递schema3

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

@@ -71,7 +71,7 @@ public interface CadastreFileMapper {
      */
     List<String> selectAllTableNoView();
 
-    int insertTableData(@Param("tableName") String tableName, @Param("data") Map<String, Object> data, @Param("shpDbSRID") Integer shpDbSRID);
+    int insertTableData(@Param("schemaName") String schemaName,@Param("tableName") String tableName, @Param("data") Map<String, Object> data, @Param("shpDbSRID") Integer shpDbSRID);
 
 
     String selectGeoms(@Param("schemaName") String schemaName,@Param("tableName") String tableName,@Param("landRightType") String landRightType);
@@ -84,9 +84,9 @@ public interface CadastreFileMapper {
     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 updateValidFlag(@Param("schemaName") String schemaName, @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);
+    void deleteByValidFlag(@Param("schemaName") String schemaName,@Param("validFlag") String validFlag,@Param("landRightType") String landRightType,@Param("tableName") String tableName);
 
     Integer countByValidFlag(@Param("validFlag") String validFlag, @Param("tableName") String tableName);
 

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

@@ -1333,8 +1333,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             for (Map<String, String> col : dbFieldNameAndTypeList) {
                 columnTypeMap.put(col.get("column_name"), col.get("data_type"));
             }
-            cadastreFileMapper.deleteByValidFlag("1",landRightType, tableName);
-            cadastreFileMapper.updateValidFlag("1", "0",landRightType, tableName);
+            cadastreFileMapper.deleteByValidFlag(schemaName,"1",landRightType, tableName);
+            cadastreFileMapper.updateValidFlag(schemaName,"1", "0",landRightType, tableName);
             for (Map<String, Object> map : theValueList) {
                 map.put("valid_flag", 0);
                 cleanDataForInsert(map, columnTypeMap);
@@ -1346,7 +1346,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                         map.put("sm", landRightType.trim());
                     }
                 }
-                cadastreFileMapper.insertTableData(tableName, map, shpDbSRID);
+                cadastreFileMapper.insertTableData(schemaName,tableName, map, shpDbSRID);
             }
             addRes = true;
         }
@@ -1497,7 +1497,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             for (Map<String, String> col : dbFieldNameAndTypeList) {
                 columnTypeMap.put(col.get("column_name"), col.get("data_type"));
             }
-            cadastreFileMapper.deleteByValidFlag("1",landRightType, tableName);
+            cadastreFileMapper.deleteByValidFlag(schemaName,"1",landRightType, tableName);
             List<Map<String, Object>> dbDataList = cadastreFileMapper.selectTableData("0",landRightType, tableName);
             List<Map<String, Object>> dbExistsList = new ArrayList<>();
             for (Map<String, Object> map : theValueList) {
@@ -1517,7 +1517,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 theValueList.addAll(dbDataList);
             }
 
-            cadastreFileMapper.updateValidFlag("1", "0",landRightType, tableName);
+            cadastreFileMapper.updateValidFlag(schemaName,"1", "0",landRightType, tableName);
             for (Map<String, Object> map : theValueList) {
                 map.put("valid_flag", 0);
                 cleanDataForInsert(map, columnTypeMap);
@@ -1529,7 +1529,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                         map.put("sm", landRightType.trim());
                     }
                 }
-                cadastreFileMapper.insertTableData(tableName, map, shpDbSRID);
+                cadastreFileMapper.insertTableData(schemaName,tableName, map, shpDbSRID);
             }
             addRes = true;
         }
@@ -1647,6 +1647,12 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 fileTableNameList = getMdbTableNameList(uploadId);
             }
 
+            String cadastreType = cadastreFile.getCadastreType();
+            String schemaName = Common.DB_SCHEMA_NAME_VECTOR;
+            if(cadastreType.equals("2")){
+                schemaName = Common.DB_SCHEMA_NAME_NATURAL;
+            }
+
             for (String layerName : fileTableNameList) {
                 //校验是否都有历史版本
                 Integer count = cadastreFileMapper.countByValidFlag("1", layerName.toLowerCase(Locale.ROOT));
@@ -1656,8 +1662,8 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             }
 
             for (String layerName : fileTableNameList) {
-                cadastreFileMapper.deleteByValidFlag("0",landRightType,layerName.toLowerCase(Locale.ROOT));
-                cadastreFileMapper.updateValidFlag("0", "1",landRightType, layerName.toLowerCase(Locale.ROOT));
+                cadastreFileMapper.deleteByValidFlag(schemaName,"0",landRightType,layerName.toLowerCase(Locale.ROOT));
+                cadastreFileMapper.updateValidFlag(schemaName,"0", "1",landRightType, layerName.toLowerCase(Locale.ROOT));
                 log.info("正在回退表：{}。。。", layerName);
             }
         } catch (Exception e) {
@@ -1698,7 +1704,6 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         return nameList;
     }
 
-
     /**
      *
      * 获取mdb文件中表名称

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

@@ -160,8 +160,10 @@
         )
     </insert>
 
+
+
     <insert id="insertTableData" parameterType="map">
-        INSERT INTO vector.${tableName} (
+        INSERT INTO &quot;${schemaName}&quot;.${tableName} (
             <foreach collection="data" index="key" item="value" separator=",">
                 ${key}
             </foreach>
@@ -301,7 +303,7 @@
     </select>
 
     <update id="updateValidFlag">
-        UPDATE vector.${tableName}  SET  valid_flag  = #{validFlag}::int2  WHERE 1=1
+        UPDATE &quot;${schemaName}&quot;.${tableName}  SET  valid_flag  = #{validFlag}::int2  WHERE 1=1
         <if test="oldValidFlag != null and oldValidFlag != ''">
             and valid_flag= #{oldValidFlag}::int2
         </if>
@@ -312,7 +314,7 @@
     </update>
 
     <delete id="deleteByValidFlag">
-        DELETE  FROM  vector.${tableName}
+        DELETE  FROM  &quot;${schemaName}&quot;.${tableName}
         WHERE valid_flag = #{validFlag}::int2
         <if test="landRightType != null and landRightType != ''">
             and sm= #{landRightType}