From 4bc6c32f168cd4b4fda77b3a628c0fcd99268ec5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 11 四月 2023 14:09:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 10 ++++------
src/main/java/com/lf/server/service/all/BaseQueryService.java | 12 ++++--------
src/main/java/com/lf/server/entity/all/StaticData.java | 2 ++
data/db_cx.sql | 2 +-
src/main/resources/application.yml | 10 +++++-----
5 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 59c3f1c..24f961d 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -20,8 +20,8 @@
select * from lf.sys_meta order by id desc;
select depcode from lf.sys_meta where id in (1393,1392,1383,1382) and depcode not like '000305%' group by depcode order by depcode;
select * from lf.sys_user where id=1
+select * from lf.sys_meta where id in (1393,1392,1383,1382)
-- tabs=鍏冩暟鎹〃,entities=sysmeta,gids=1393,1392,1383,1382
-
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index a4247d5..cdcbc19 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -70,6 +70,8 @@
public static final int I2050 = 2050;
+ public static final int I4490 = 4490;
+
/**
* 瀛楃1
*/
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index 86a5f3c..7564465 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -170,9 +170,7 @@
wkt = AesHelper.decrypt(wkt);
Integer srid = getSrid((GeomBaseMapper) basicMapper);
- if (null != srid) {
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
- }
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid));
}
}
@@ -192,9 +190,10 @@
}
Integer srid = basicMapper.selectSrid(tab);
- if (srid != null) {
- redisService.put(key, srid, 5, TimeUnit.MINUTES);
+ if (null == srid) {
+ return StaticData.I4490;
}
+ redisService.put(key, srid, 5, TimeUnit.MINUTES);
return srid;
}
@@ -245,9 +244,6 @@
*/
public void addBufferWrapper(GeomBaseMapper baseMapper, QueryWrapper wrapper, String wkt, double buffer) {
Integer srid = getSrid(baseMapper);
- if (null == srid) {
- srid = 4490;
- }
// buffer = buffer * 0.00000899928
buffer = buffer / 1852 / 60;
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index 10dc956..81fd401 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -65,9 +65,7 @@
QueryWrapper wrapper = getWrapper4DbOverflow(ue, dr);
Integer srid = baseQueryService.getSrid(baseMapper);
- if (null != srid) {
- wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
- }
+ wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
List<String> ids = baseMapper.selectObjs(wrapper);
addDepCodes(rs, ids);
@@ -205,10 +203,10 @@
// wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())))
wrapper.likeRight("depid", dr.getDepcode());
}
- if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
+ if (baseMapper instanceof GeomBaseMapper) {
wrapper.select("ST_AsText(geom) as geom, *");
- Integer srid = baseQueryService.getSrid((GeomBaseMapper) baseMapper);
- if (null != srid) {
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ Integer srid = baseQueryService.getSrid((GeomBaseMapper) baseMapper);
wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid));
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 205db0c..494d195 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,7 +15,7 @@
host: 127.0.0.1
port: 6369
password: rediS_5L#F4_Server
- timeout: 30000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
+ timeout: 90000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
pool:
max-active: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
max-wait: -1 # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
@@ -42,11 +42,11 @@
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
#url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
- url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
- #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
- password: Postgres!_14_Lf
- #password: postgres
+ #password: Postgres!_14_Lf
+ password: postgres
driver-class-name: org.postgresql.Driver
paltform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.3