guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/pet' into dev

xuyifeng-0724-人员中台对接-dev
water_xu 2024-07-16 16:55:20 +08:00
parent b8480d2457 9709c99b30
commit fd44935849
6 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java
View File

@ -61,7 +61,10 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
PageData condition = new PageData();
condition.put("DEPARTMENT_ID",vector.getString("INSPECTED_DEPARTMENT_ID"));
List<PageData> 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);

42
src/main/resources/application-master.properties
View File

@ -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/

4
src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
View File

@ -341,6 +341,7 @@
<select id="getListdatalistPage" parameterType="page" resultType="pd">
SELECT
f.HIDDEN_ID,
f.ISRELEVANT,
f.SOURCE,
f.HIDDENDESCR,
f.RECTIFICATIONTYPE,
@ -389,6 +390,9 @@
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 企业ID -->
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.isrelevant != null and pd.isrelevant != ''"><!-- 是否相关方 -->
and f.ISRELEVANT = #{pd.isrelevant}
</if>
<if test="pd.hiddendescr != null and pd.hiddendescr != ''"><!-- 隐患描述 -->
and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.hiddendescr}),'%'))
</if>

8
src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
View File

@ -1640,7 +1640,13 @@ FROM
</if>
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
<if test="pd.CREATOR != null and pd.CREATOR != ''">
and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end)
<!-- 预留只查看自己下发的处罚的case -->
<if test="pd.ONLY_SELF != null and pd.ONLY_SELF != '' and pd.ONLY_SELF == 1">
and h.CREATOR like CONCAT('%', #{pd.CREATOR},'%')
</if>
<if test="pd.ONLY_SELF == null or pd.ONLY_SELF == ''">
and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end)
</if>
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and

4
src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
View File

@ -179,9 +179,9 @@
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
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}),'%')
)
</if>
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID !='' " >

2
src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
View File

@ -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
<include refid="tableName"></include> f
left join bus_units b using (UNITS_ID)