From d87f0541728dbc6e44862682677a357f9addab55 Mon Sep 17 00:00:00 2001 From: wuxu <1159559925@qq.com> Date: Wed, 2 Apr 2025 21:41:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yg/sz/controller/BsSgcSzAqjcController.java | 3 ++- .../src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java index 710d488d..f3972b61 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java @@ -48,7 +48,8 @@ public class BsSgcSzAqjcController extends BaseController @ApiOperation("水闸安全检测列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzAqjcService.selectPage(sp); + IPage page = bsSgcSzAqjcService.selectPage(sp); + return page; } /** diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml index 4e57309f..00737f7e 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -12,8 +12,7 @@ hz_status, zx_status, reason, MNUN, NOTE, EFF_DATE, EXPR_DATE, WAGA_CEN_LONG, WAGA_CEN_LAT, IF_CEB, IF_HYJ, IF_GSE, IF_SGE, FREQIN, CHECK_DATE, WAGA_OV, UPDATE_DATE, sf.id, name, unit, duties, phone, person_responsible_type, competent_department, competent_department_duties, effective_date, pro_code, pro_no, type, safety_type, person_type, sf.create_time - from bs_sgc_sz_fzr sf - left join att_waga_base sj on sf.waga_code = sj.waga_code + from bs_sgc_sz_fzr sf ,att_waga_base sj where sf.waga_code = sj.waga_code @@ -69,7 +68,7 @@ From d99f5c08c7fffc3080d45efdac3d7f194051b27e Mon Sep 17 00:00:00 2001 From: wuxu <1159559925@qq.com> Date: Thu, 3 Apr 2025 10:06:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-dev.yml | 4 ++-- .../src/main/resources/config/application-druid-dev.yml | 9 ++++++--- shuili-admin/src/main/resources/config/application.yml | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/shuili-admin/src/main/resources/config/application-dev.yml b/shuili-admin/src/main/resources/config/application-dev.yml index 32f9a672..c62db212 100644 --- a/shuili-admin/src/main/resources/config/application-dev.yml +++ b/shuili-admin/src/main/resources/config/application-dev.yml @@ -79,14 +79,14 @@ spring: redis: # 地址 host: 127.0.0.1 -# database: 2 + database: 2 # cluster: # nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 # max-redirects: 3 # 端口，默认为6379 port: 6379 # 密码 - password: + password: 12345 # 连接超时时间 timeout: 10s lettuce: diff --git a/shuili-admin/src/main/resources/config/application-druid-dev.yml b/shuili-admin/src/main/resources/config/application-druid-dev.yml index 2ea26ea1..796faa75 100644 --- a/shuili-admin/src/main/resources/config/application-druid-dev.yml +++ b/shuili-admin/src/main/resources/config/application-druid-dev.yml @@ -6,9 +6,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true - username: zhsl_ygc_sgcyxgl - password: J[@D|&.<:_G+)sp2 + # url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + # username: zhsl_ygc_sgcyxgl + # password: J[@D|&.<:_G+)sp2 + url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + username: shuili + password: wuxukgdvJ1!@! # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/shuili-admin/src/main/resources/config/application.yml b/shuili-admin/src/main/resources/config/application.yml index 2b78765a..f9d7ea60 100644 --- a/shuili-admin/src/main/resources/config/application.yml +++ b/shuili-admin/src/main/resources/config/application.yml @@ -1,3 +1,4 @@ spring: profiles: - include: dev,druid-dev +# include: dev,druid-dev +# \ No newline at end of file