From 32f94d9cf15a860e2e0da56078854657f1847d0b Mon Sep 17 00:00:00 2001 From: water_xu Date: Fri, 5 Jul 2024 16:18:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=20-=20App=E7=AB=AF=E7=9A=84=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/AppSafetyEnvironmentalExplainController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java index 6a5d43c3..d9d534a5 100644 --- a/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java +++ b/src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java @@ -61,7 +61,10 @@ public class AppSafetyEnvironmentalExplainController extends BaseController { PageData condition = new PageData(); condition.put("DEPARTMENT_ID",vector.getString("INSPECTED_DEPARTMENT_ID")); List parent_list = departmentService.getGenealogy(condition); - String corp_infos = parent_list.stream().map(n -> n.getString("NAME")).collect(Collectors.joining("-")); + String corp_infos = ""; + if(parent_list != null) { + corp_infos = parent_list.stream().map(n -> n.getString("NAME")).collect(Collectors.joining("-")); + } vector.put("INSPECTED_DEPARTMENT_NAMES",corp_infos); } map.put("varList", varList); From ae76781cf923e97d070670e185293155c1970546 Mon Sep 17 00:00:00 2001 From: water_xu Date: Fri, 5 Jul 2024 16:32:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=B9=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/application-master.properties | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index 72e91e17..9157667a 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -1,25 +1,25 @@ # ?????? datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.username=root -datasource.no1.password=Mysql@zcloud88888 +datasource.no1.password=gwjsjkzcloud888888 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver -datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 +datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.username=root -datasource.no2.password=Mysql@zcloud88888 +datasource.no2.password=gwjsjkzcloud888888 -#druid连接池 +#druid\u8FDE\u63A5\u6C60 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource -#最大活跃数 +#\u6700\u5927\u6D3B\u8DC3\u6570 spring.datasource.maxActive: 20 -#初始化数量 +#\u521D\u59CB\u5316\u6570\u91CF spring.datasource.initialSize: 1 -#最大连接等待超时时间 +#\u6700\u5927\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u65F6\u95F4 spring.datasource.maxWait: 60000 -#打开PSCache，并且指定每个连接PSCache的大小 +#\u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5PSCache\u7684\u5927\u5C0F spring.datasource.poolPreparedStatements: true spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 -#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 +#\u901A\u8FC7connectionProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55 #connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.datasource.minIdle: 1 spring.datasource.timeBetweenEvictionRunsMillis: 60000 @@ -28,29 +28,29 @@ spring.datasource.validationQuery: select 1 from dual spring.datasource.testWhileIdle: true spring.datasource.testOnBorrow: false spring.datasource.testOnReturn: false -#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 +#\u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u5C06\u65E0\u6CD5\u7EDF\u8BA1,'wall'\u7528\u4E8E\u9632\u706B\u5899 filters: stat, wall, log4j -#缓存配置文件位置 +#\u7F13\u5B58\u914D\u7F6E\u6587\u4EF6\u4F4D\u7F6E spring.cache.ehcache.cofnig=ehcache.xml -#配置这句话,控制台输出sql语句 +#\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5 logging.level.com.zcloud.mapper=debug -#上传文件大小限制 +#\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236 spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB -#activiti模型检测 +#activiti\u6A21\u578B\u68C0\u6D4B spring.activiti.check-process-definitions=false -#字符 +#\u5B57\u7B26 spring.http.encoding.charset=UTF-8 spring.http.encoding.force=true spring.http.encoding.enabled=true -# 关闭springboot启动时的banner +# \u5173\u95EDspringboot\u542F\u52A8\u65F6\u7684banner spring.main.banner-mode=off -#jar包部署时去掉注释 +#jar\u5305\u90E8\u7F72\u65F6\u53BB\u6389\u6CE8\u91CA #web.upload-path=h:/ #web.front-path=h:/ #spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} @@ -88,17 +88,17 @@ mq.group.eightWork=scheduled_tasks_eightWork corp.default.pic-path=https://skqhdg.porthebei.com:9004/file/ corp.default.back-end-path=https://skqhdg.porthebei.com:9004/qa-prevention-gwj/ -#数据同步topic +#\u6570\u636E\u540C\u6B65topic mq.gwj.data.topic=czks_docking mq.gwj.file.topic=czks_dockingPicture -#港务局文件服务器前缀 +#\u6E2F\u52A1\u5C40\u6587\u4EF6\u670D\u52A1\u5668\u524D\u7F00 baseimgpath=http://192.168.192.201:8991/file/ cfd.prevention.api.url=http://10.100.106.2:8991/qa-prevention-csy/ http.file.url=http://192.168.192.201:8991/file/ -#河北秦安文件服务器前缀 +#\u6CB3\u5317\u79E6\u5B89\u6587\u4EF6\u670D\u52A1\u5668\u524D\u7F00 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile biaoZhunShuJuKu=https://file.zcloudchina.com/ From 0b3ed821d59b6734f7268e80daae9f75ee703cb0 Mon Sep 17 00:00:00 2001 From: water_xu Date: Thu, 11 Jul 2024 15:17:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-=20?= =?UTF-8?q?App=E7=AB=AF=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86=E8=A7=92=E6=A0=87=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=A2=84=E7=95=99=E5=8F=AA=E6=9F=A5=E7=9C=8B=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E4=B8=8B=E5=8F=91=E7=9A=84=E5=A4=84=E7=BD=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AFcase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/keyProjects/KeyprojectHiddenMapper.xml | 8 +++++++- .../mybatis/dsno2/keyProjects/OutSourcedMapper.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 83793a1d..8aee1e56 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1640,7 +1640,13 @@ FROM AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} ) - and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end) + + + and h.CREATOR like CONCAT('%', #{pd.CREATOR},'%') + + + and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end) + and diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 7a9f668a..f5695e0b 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -530,7 +530,7 @@ vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, p.`NAME` as UNITS_PIC_NAME - ,ifnull(cfsl.co,0) as cfcount + ,SUM(ifnull(cfsl.co, 0)) as cfcount from f left join bus_units b using (UNITS_ID) From 1e92be61662a8894cb9c6a3dc6da64efbde7003b Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 15 Jul 2024 15:40:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-=20?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86=E5=85=B3=E9=94=AE=E5=AD=97?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=94=AF=E6=8C=81=E5=A4=84=E7=BD=9A=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E4=BB=A5=E5=8F=8A=E4=B8=8B=E5=8F=91=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml index 10deed5c..d3590924 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml @@ -179,9 +179,9 @@ and ( - o.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + f.REASON LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') or - u.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + cr.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) From 9709c99b307cd445611e5e2a712c086d904ed131 Mon Sep 17 00:00:00 2001 From: water_xu Date: Mon, 15 Jul 2024 16:12:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=20-=20?= =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3=E5=8F=B0=E8=B4=A6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/hiddenApi/HiddenApiMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index f92c1c0e..dedd67ce 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -341,6 +341,7 @@