小区搜索添加行政区和核算行政区字段

ruoyi-admin/src/main/resources/application-dev.yml

@@ -51,12 +51,15 @@ spring:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-          username: root
-          password: 123456
+#          url: jdbc:mysql://localhost:3306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+#          username: root
+#          password: 123456
 #          url: jdbc:mysql://123.249.30.140:3307/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
 #          username: root
 #          password: szrqwx123456
+          url: jdbc:mysql://124.221.101.24:13306/sj-zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: Lanyuxinxi@88.com
 #          szrqwx123456
         # 从库数据源
         slave:
@@ -162,13 +165,13 @@ redisson:
     dnsMonitoringInterval: 5000
 huawei:
   obs:
-    ak: X54NQCIWAVXPIR6QB4BK
-    sk: x7J3k8VjIt5zY5SITeb5JYaXbeY5ZPwE3XTw3FI0
+    ak: KZVKAAUQENCKITHZ3EWO
+    sk: B7tLa82CJ5EdNOh5a2G9i77sPYh8skcydTk3C8sb
     upload:
       endPoint: obs.cn-north-4.myhuaweicloud.com
     access:
-      endPoint: https://szrqgz.obs.cn-north-4.myhuaweicloud.com
-    bucketName: szrqgz
+      endPoint: https://szrqgz1.obs.cn-north-4.myhuaweicloud.com
+    bucketName: szrqgz1
 
 # 临时文件路径
 filePath: D:/

ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -42,6 +42,9 @@
             <if test="p.district != null  and p.district != ''">
                 and a.district = #{p.district}
             </if>
+            <if test="p.calculateDistrictId != null  and p.calculateDistrictId != ''">
+                and a.calculate_district_id = #{p.calculateDistrictId}
+            </if>
         </where>
     </select>
     <select id="getArea" resultType="com.ruoyi.gas.domain.vo.GAreaVo">