Преглед на файлове

配置文件整合提交

wanger преди 7 месеца
родител
ревизия
1c4d4227d2

+ 12 - 8
onemap-modules/onemap-spotoverlap/pom.xml

@@ -19,16 +19,16 @@
     <dependencies>
 
         <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--        </dependency>-->
 
         <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
 
         <!-- SpringCloud Alibaba Sentinel -->
         <dependency>
@@ -271,6 +271,10 @@
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <fork>true</fork> <!--重要-->
+                </configuration>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.6.2</version>

+ 3 - 0
onemap-modules/onemap-spotoverlap/src/main/java/com/onemap/spotoverlap/service/impl/yzt/YztServiceImpl.java

@@ -1241,6 +1241,9 @@ public class YztServiceImpl implements IYztService {
                     sqlwhere += ",";
                     groupwhere += ",";
                 }
+                if(StringUtils.isEmpty(sub)){
+                    continue;
+                }
                 QueryWrapper<tReportSub> subwrapper = new QueryWrapper();
                 subwrapper.eq("id", sub);
                 tReportSub reportSub = tReportSubMapper.selectOne(subwrapper);

+ 139 - 32
onemap-modules/onemap-spotoverlap/src/main/resources/bootstrap.yml

@@ -1,42 +1,149 @@
 #Feign Client配置
-feign:
-  client:
-    config:
-      FooClient: #contextId
-        connectTimeout: 1000000
-        readTimeout: 2000000
-      default:
-        connectTimeout: 6000000
-        readTimeout: 1000000
+#feign:
+#  client:
+#    config:
+#      FooClient: #contextId
+#        connectTimeout: 1000000
+#        readTimeout: 2000000
+#      default:
+#        connectTimeout: 6000000
+#        readTimeout: 1000000
 # Tomcat
-server:
-  port: 9209
+#server:
+#  port: 9209
 
 # Spring
+#spring:
+#  servlet:
+#    multipart:
+#      enabled: true
+#      max-file-size: 10240MB
+#      max-request-size: 10240MB
+# 默认行政区代码 做监测图斑统计用
+xzqdm: 15
+dbconnection: "{'schema':'public','database':'spot','port':5432,'passwd':'postgres','dbtype':'postgis','host':'127.0.0.1','user':'postgres'}"
+wmts:
+  # 默认切片方案
+  gridset: WebMercatorQuadx2
+  seedtype: seed
+  zoomstart: 0
+  zoomend: 18
+server:
+  port: 9209
+  host: http://192.168.60.20
+# 文件路径配置
+file:
+  # 静态资源路径
+  temp: D:\temp\
+  # 代理的服务名称
+  proxy: file
+  # 默认数据坐标系
+  wkid: 4525
+  # 入库的表前缀名
+  prefix: sw_
+# 前后影像标识符
+image:
+  qsx: QDOM
+  hsx: DDOM
+# 入库到数据库中的唯一属性字段
+swid: swid
+# 入库到数据库中的面积字段
+swarea: swarea
+# 入库到数据库中的变化类型字段
+swtype: swtype
+# 数据库默认模式名称
+dbschema: public
+qgis: D:\Program Files\QGIS 3.34.9\bin\
+# 导出的字段集合
+exportFields: 编号,后类型,合法性判断,合法性说明,面积
+# 不参与查询的字段集合
+notQueryFields: 面积集合,geom,面积比,编号集合,面积
+# 地图导出的配置  固定项是高度还是宽度  再根据比例计算尺寸
+mapExport:
+  fixed: width
+  size: 600
+# 套合分析完成后更新geoserver的符号样式配置
+checkedstyle: spot:spotcheck
+spotstyle: spot:spot
+# GeoServer 发布shp配置字符编码
+charset: UTF-8
+# 小数点位数
+decimalPlaces: 2
+# spring配置
 spring:
   servlet:
     multipart:
       enabled: true
       max-file-size: 10240MB
       max-request-size: 10240MB
-  application:
-    # 应用名称
-    name: onemap-spotoverlap
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        namespace: spot
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-      config:
-        namespace: spot
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  redis:
+    host: localhost
+    port: 6379
+    password:
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+    dynamic:
+      druid:
+        initial-size: 5
+        min-idle: 5
+        maxActive: 200
+        maxWait: 600000
+        timeBetweenEvictionRunsMillis: 6000000
+        minEvictableIdleTimeMillis: 3000000
+        #validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 200
+        filters: stat,slf4j
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          driver-class-name: org.postgresql.Driver
+          url: jdbc:postgresql://127.0.0.1:5432/spot?currentSchema=public&socketTimeout=0&connectTimeout=300000&cancelSignalTimeout=300000
+          username: postgres
+          password: postgres
+#MyBatis Plus配置
+my-batis-plus:
+  mapper-locations: classpath:mapper/postgresql/**/*.xml
+  type-aliases-package: com.onemap.spotoverlap.**.domain
+  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  configuration:
+    map-underscore-to-camel-case: false
+    default-statement-timeout: 3000000  # 单位:秒,设置所有SQL语句的默认超时时间
+  global-config:
+    db_config:
+      id-type: auto
+      field-strategy: 2
+      refresh-mapper: true
+# swagger配置
+swagger:
+  title: 系统模块接口文档
+  license: Powered By ruoyi
+  licenseUrl: https://ruoyi.vip
+#  application:
+#    # 应用名称
+#    name: onemap-spotoverlap
+#  profiles:
+#    # 环境配置
+#    active: dev
+#  cloud:
+#    nacos:
+#      discovery:
+#        namespace: spot
+#        # 服务注册地址
+#        server-addr: 127.0.0.1:8848
+#      config:
+#        namespace: spot
+#        # 配置中心地址
+#        server-addr: 127.0.0.1:8848
+#        # 配置文件格式
+#        file-extension: yml
+#        # 共享配置
+#        shared-configs:
+#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

+ 4 - 1
onemap-modules/onemap-spotoverlap/src/main/resources/mapper/postgresql/yzt/YztMapper.xml

@@ -48,7 +48,10 @@
     <select id="getTableFields" parameterType="java.lang.String" resultType="java.lang.String">
         SELECT column_name
         FROM information_schema.columns
-        WHERE table_schema = #{dbschema} AND table_name = #{tablename} AND lower(column_name) not like '%geom%'
+        WHERE table_schema = #{dbschema}
+        AND table_name = #{tablename}
+        AND lower(column_name) not like '%geom%'
+        AND lower(column_name) not like '%shape_%'
     </select>
 
     <select id="getDistinctValueByField" parameterType="java.lang.String" resultType="java.lang.String">