ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'outside/master' into release-sy-v1.0.0

release-sy-v1.0.0
“lyd” 2 weeks ago
parent
6b892d3958 31a7f5be25
commit
c84e575589
24 changed files with 196 additions and 1194 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java
  2. 191
      shuili-admin/src/main/resources/application-dev.yml
  3. 59
      shuili-admin/src/main/resources/application-druid-dev.yml
  4. 58
      shuili-admin/src/main/resources/application-druid-sy.yml
  5. 7
      shuili-admin/src/main/resources/application-druid-test.yml
  6. 59
      shuili-admin/src/main/resources/application-druid-zhishiku.yml
  7. 208
      shuili-admin/src/main/resources/application-sy.yml
  8. 41
      shuili-admin/src/main/resources/application-test.yml
  9. 244
      shuili-admin/src/main/resources/application-zhishiku.yml
  10. 220
      shuili-admin/src/main/resources/config/application-dev.yml
  11. 58
      shuili-admin/src/main/resources/config/application-druid-dev.yml
  12. 3
      shuili-admin/src/main/resources/config/application.yml
  13. 32
      shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
  14. 8
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
  15. 28
      shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
  16. 3
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java
  17. 23
      shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
  18. 5
      shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java
  19. 4
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
  20. 16
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
  21. 28
      shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
  22. 39
      shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
  23. 47
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
  24. 7
      shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

2
shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java
View File

@ -67,7 +67,7 @@ public class CommonController {
response.setContentType("multipart/form-data");
response.setHeader("Content-Disposition",
"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
fileName=fileName.replace("/profile",downloadPath);
fileName=fileName.replace("/sgcyy-slgcyxgl/profile",downloadPath);
FileUtils.writeBytes(fileName, response.getOutputStream());
} else {

191
shuili-admin/src/main/resources/application-dev.yml
View File

@ -1,191 +0,0 @@
# 项目相关配置
shuili:
# 名称
name: 天汇重构
#系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样
nameKey: tianhui_lyj
# 版本
version: 1.0
# 版权年份
copyrightYear: 2023
# 实例演示开关
demoEnabled: true
# 临时文件地址
profile: E:/tianhui
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
#数据库配置 参考枚举类DbType
dbType: mysql
#初始话数据的位置 采集的文献的导入
initData: E:\\199it
init: true
#导入TNT 数据
initTntData: C:\Users\liuyanjun\Desktop\人物-政党导出V1\人物-政党导出V1
#neo4j的一个from
database: tianhui_lyj
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 18082
servlet:
# 应用的访问路径
context-path: /tianhui-admin-web
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.kms: debug
org.springframework: warn
# Spring配置
spring:
mongodb:
uri: mongodb://192.168.1.20:27017/tianhui
field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid-dev
session:
store-type: redis
redis:
flush-mode: immediate
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 1000MB
# 设置总上传的文件大小
max-request-size: 20000MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: 192.168.1.20
# 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:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 16
# 连接池中的最大空闲连接
max-idle: 32
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# password: password
sa-token:
# token名称 (同时也是cookie名称)
token-name: shuili
# token有效期，单位s 默认30天, -1代表永不过期
timeout: -1
# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
activity-timeout: 1800
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true
# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: false
# token风格
token-style: uuid
# 是否输出操作日志
is-log: true
isReadCookie: false
tokenSessionCheckLogin: false
#是否在初始化配置时打印版本字符画
isV: false
#token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀
tokenPrefix: water
# 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作)
autoRenew: true
#是否尝试从header里读取token
isReadHead: true
#mybatis-plus配置
mybatis-plus:
configuration:
#下划线驼峰命名
map-underscore-to-camel-case: true
auto-mapping-behavior: full
#开启日志打印
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#配置Mapper映射文件
mapper-locations: classpath*:mapper/**/*Mapper.xml
type-aliases-package: com.kms.**.domain
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
fdfs:
soTimeout: 1500
connectTimeout: 600
thumbImage: #缩略图生成参数
width: 150
height: 150
#预览的地址
showFileUrl: 192.168.1.20:9080
#使用的是http 还是https
urlAgreement: http
trackerList: #TrackerList参数,支持多个
- 192.168.1.20:22122
ignored:
/v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**,
/app/login,/initTnt/**,
/doc.html,
/chunk/*,
/error,
/login,
/captchaImage,
/system/file/**,
/system/user/exportExcel,
/system/kaptcha/render,
/test/**
# http请求连接池
http:
pool:
# 连接超时
connectTimeout: 5000000
connectionRequestTimeout: 5000000
defaultMaxPerRoute: 20
# 最大连接数
maxTotal: 100
# 服务器返回数据(response)的时间
socketTimeout: 5000000
validateAfterInactivity: 5000000
#算法配置
algorithm:
#图片ocr服务
entity: http://192.168.0.14:17856/analyze_text
# 自动打抽取摘要
summary: http://192.168.0.210:12343
ocr: http://192.168.0.62:12340/ExtractServer?WSDL

59
shuili-admin/src/main/resources/application-druid-dev.yml
View File

@ -1,59 +0,0 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.jdbc.Driver
driverClassName: org.gjt.mm.mysql.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.12.20:23306/tianhui_lyj1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

58
shuili-admin/src/main/resources/application-druid-sy.yml
View File

@ -1,58 +0,0 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: mysql123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

7
shuili-admin/src/main/resources/application-druid-test.yml
View File

@ -2,14 +2,17 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
driverClassName: com.mysql.cj.jdbc.Driver
# driverClassName: org.gjt.mm.mysql.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
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!@!
#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
# 从库数据源
slave:
# 从数据源开关/默认关闭

59
shuili-admin/src/main/resources/application-druid-zhishiku.yml
View File

@ -1,59 +0,0 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.jdbc.Driver
driverClassName: org.gjt.mm.mysql.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.101.61:13306/tianhui_chonggou?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

208
shuili-admin/src/main/resources/application-sy.yml
View File

@ -1,208 +0,0 @@
# 项目相关配置
shuili:
# 名称
name: 天汇重构
#系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样
nameKey: tianhui_lyj
# 版本
version: 1.0
# 版权年份
copyrightYear: 2023
# 实例演示开关
demoEnabled: true
# 临时文件地址
profile: D:/tianhui
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
#数据库配置 参考枚举类DbType
dbType: mysql
#初始话数据的位置 采集的文献的导入
initData: E:\\199it
init: true
#导入TNT 数据
initTntData: C:\Users\liuyanjun\Desktop\人物-政党导出V1\人物-政党导出V1
#neo4j的一个from
database: tianhui_lyj
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 18082
servlet:
# 应用的访问路径
context-path: /tianhui-admin-web
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.kms: debug
org.springframework: warn
# Spring配置
spring:
application:
name: shuili-admin
mongodb:
uri: mongodb://mongo:mongo12345@mongodb:27017/tianhui
field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid-sy
session:
store-type: redis
redis:
flush-mode: immediate
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 1000MB
# 设置总上传的文件大小
max-request-size: 20000MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: 127.0.0.1
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: redis12345
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 16
# 连接池中的最大空闲连接
max-idle: 32
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# password: password
sa-token:
# token名称 (同时也是cookie名称)
token-name: shuili
# token有效期，单位s 默认30天, -1代表永不过期
timeout: -1
# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
activity-timeout: 1800
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true
# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: false
# token风格
token-style: uuid
# 是否输出操作日志
is-log: true
isReadCookie: false
tokenSessionCheckLogin: false
#是否在初始化配置时打印版本字符画
isV: false
#token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀
tokenPrefix: water
# 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作)
autoRenew: true
#是否尝试从header里读取token
isReadHead: true
#mybatis-plus配置
mybatis-plus:
configuration:
#下划线驼峰命名
map-underscore-to-camel-case: true
auto-mapping-behavior: full
#开启日志打印
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#配置Mapper映射文件
mapper-locations: classpath*:mapper/**/*Mapper.xml
type-aliases-package: com.kms.**.domain
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
fdfs:
soTimeout: 1500
connectTimeout: 600
thumbImage: #缩略图生成参数
width: 150
height: 150
#预览的地址
showFileUrl: 192.168.1.20:9080
#使用的是http 还是https
urlAgreement: http
trackerList: #TrackerList参数,支持多个
- 192.168.1.20:22122
ignored:
/v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**,
/app/login,/initTnt/**,
/doc.html,
/chunk/*,
/error,
/login,
/captchaImage,
/system/file/**,
/system/user/exportExcel,
/system/kaptcha/render,
/test/**,
/run/api/,
/map/**
# http请求连接池
http:
pool:
# 连接超时
connectTimeout: 5000000
connectionRequestTimeout: 5000000
defaultMaxPerRoute: 20
# 最大连接数
maxTotal: 100
# 服务器返回数据(response)的时间
socketTimeout: 5000000
validateAfterInactivity: 5000000
#算法配置
algorithm:
#图片ocr服务
entity: http://192.168.0.14:17856/analyze_text
# 自动打抽取摘要
summary: http://192.168.0.210:12343
ocr: http://192.168.0.62:12340/ExtractServer?WSDL
#数据同步
dataSync:
#数据同步地址
enabled: false
#服务地址
url: http://19.25.35.205:31190/ZHSL_ZY
#认证ID
x-h3c-id: 3359137640337
#认证秘钥
x-h3c-appKey: q7sli9ch
#同步天数
# days: 7

41
shuili-admin/src/main/resources/application-test.yml
View File

@ -12,7 +12,7 @@ shuili:
demoEnabled: true
# 临时文件地址
# profile: /home/project/tianhui-chonggou
profile: E:/tianhui
profile: D:/tianhui
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
@ -130,7 +130,7 @@ spring:
# redis 配置
redis:
# 地址
host: 127.0.0.1
host: 192.168.2.189
# 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
@ -297,12 +297,41 @@ water:
#数据同步
dataSync:
#数据同步地址
enabled: false
enabled: true
#服务地址
url: http://19.25.35.205:31190/ZHSL_ZY
# url: http://19.25.35.205:31190/ZHSL_ZY
url: http://19.25.40.10:31190
#认证ID
x-h3c-id: 3359137640337
#认证秘钥
x-h3c-appKey: q7sli9ch
#同步天数
# days: 7
paths:
"{
att_res_base:'/ZHSL_ZY/jck/ygtjgx/dws_att_res_base',
att_waga_escpp:'/ZHSL_ZY/dws_att_waga_escpp',
att_res_rspp:'/ZHSL_ZY/jck/ytjgx/dws_att_res_rspp',
att_res_rwacdr:'/ZHSL_ZY/jck/ytjgx/dws_att_res_rwacdr',
att_dike_base:'/ZHSL_ZY/jck/yggx/dws_att_dike_base',
att_dike_bsfst:'/ZHSL_ZY/jck/ytjgx/dws_att_dike_bsfst',
att_disc_base:'/ZHSL_ZY/jck/yggx/dws_att_disc_base',
att_dike_dbiabt:'/ZHSL_ZY/jck/ytjgx/dws_att_dike_dbiabt',
att_dike_dkhos:'/ZHSL_ZY/jck/ytjgx/dws_att_dike_dkhos',
att_waga_base:'/ZHSL_ZY/jck/yggx/dws_att_waga_base',
att_waga_slhypr:'/ZHSL_ZY/jck/ytjgx/dws_att_waga_slhypr',
att_waga_sligvl:'/ZHSL_ZY/dws_att_waga_sligvl',
att_waga_sldnnt:'/ZHSL_ZY/jck/yggx/dws_att_waga_sldnnt',
att_rv_base:'/ZHSL_ZY/jck/yggx/dws_att_rv_base',
att_dpds_base:'/ZHSL_ZY/jck/yggx/dws_att_dpds_base',
att_bas_base:'/ZHSL_ZY/jck/yggx/dws_att_bas_base',
att_st_base:'/ZHSL_ZY/jck/dws_att_st_base',
att_st_mp:'/ZHSL/jck/dws_att_st_mp',
sys_xzqh:'/ZHSL_ZY/jck/dws_att_ad_base',
dws_rel_waga_ad:'/ZHSL_ZY/dws_rel_waga_ad',
dws_rel_dike_ad:'/ZHSL_ZY/dws_rel_dike_ad',
dws_rel_res_dscdnm:'/ZHSL_ZY/dws_rel_res_dscdnm',
dws_rel_st_res:'/ZHSL_ZY/jck/ytjgx/dws_rel_st_res',
ms_hdm_obp:'/ZHSL_ZY/bzjck/ms_hdm_obp',
ms_hdm_rsvr:'/ZHSL_ZY/bzjck/ms_hdm_rsvr',
ms_hdm_river:'/ZHSL_ZY/bzjck/ms_hdm_river',
ms_dsm_srhrds:'/ZHSL_ZY/bzjck/ms_dsm_srhrds'
}"

244
shuili-admin/src/main/resources/application-zhishiku.yml
View File

@ -1,244 +0,0 @@
# 项目相关配置
shuili:
# 名称
name: 天汇重构
#系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样
nameKey: tianhui_chonggou
# 版本
version: 1.0
# 版权年份
copyrightYear: 2023
# 实例演示开关
demoEnabled: true
# 临时文件地址
profile: E:/tianhui
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
#数据库配置 参考枚举类DbType
dbType: mysql
#初始话数据的位置
initData: E:\\199it
init: false
#neo4j的一个from
database: tianhui_chonggou
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 18080
servlet:
# 应用的访问路径
context-path: /tianhui-admin-web
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.kms: debug
org.springframework: warn
thrift:
host: 192.168.0.61
port: 9710
timeOut: 60000
maxActive: 20000
max-total: 50
max-idle: 10
min-idle: 5
max-wait-millis: 200
indexName: tianhui-chonggou
indexType: doc
esEntity: com.kms.system.es.EsEntity
# Spring配置
spring:
kafka:
autoStartup: true
topics: hangtian
# kafka信息 http://182.92.86.163:9092/
bootstrap-servers: 106.2.224.58:8021
#bootstrap-servers: 182.92.86.163:9092
producer: # 生产者配置
retries: 3 # 设置大于0的值，则客户端会将发送失败的记录重新发送
batch-size: 33554432 #32M
buffer-memory: 33554432 #32M
acks: 1
# 指定消息key和消息体的编解码方式
key-serializer: org.apache.kafka.common.serialization.StringSerializer
value-serializer: org.apache.kafka.common.serialization.StringSerializer
consumer:
session:
timeout: 200000000 # 链接超时时间
group-id: shuilikeji # 消费者组
enable-auto-commit: false # 关闭自动提交
auto-offset-reset: earliest # 当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费
key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
listener:
# 当每一条记录被消费者监听器（ListenerConsumer）处理之后提交
# RECORD
# 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后提交
# BATCH
# 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后，距离上次提交时间大于TIME时提交
# TIME
# 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后，被处理record数量大于等于COUNT时提交
# COUNT
# TIME |　COUNT　有一个条件满足时提交
# COUNT_TIME
# 当每一批poll()的数据被消费者监听器（ListenerConsumer）处理之后, 手动调用Acknowledgment.acknowledge()后提交
# MANUAL
# 手动调用Acknowledgment.acknowledge()后立即提交，一般使用这种
# MANUAL_IMMEDIATE
ack-mode: manual_immediate
data:
neo4j:
uri: bolt://192.168.0.61:7687
username: neo4j
password: password
mongodb:
uri: mongodb://192.168.0.61:27017/tianhui
field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid-zhishiku
session:
store-type: redis
redis:
flush-mode: immediate
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 1000MB
# 设置总上传的文件大小
max-request-size: 20000MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: 192.168.0.61
# 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:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 16
# 连接池中的最大空闲连接
max-idle: 32
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# password: password
sa-token:
# token名称 (同时也是cookie名称)
token-name: shuili
# token有效期，单位s 默认30天, -1代表永不过期
timeout: -1
# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
activity-timeout: 1800
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true
# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: false
# token风格
token-style: uuid
# 是否输出操作日志
is-log: true
isReadCookie: false
tokenSessionCheckLogin: false
#是否在初始化配置时打印版本字符画
isV: false
#token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀
tokenPrefix: water
# 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作)
autoRenew: true
#是否尝试从header里读取token
isReadHead: true
#mybatis-plus配置
mybatis-plus:
configuration:
#下划线驼峰命名
map-underscore-to-camel-case: true
auto-mapping-behavior: full
#开启日志打印
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#配置Mapper映射文件
mapper-locations: classpath*:mapper/**/*Mapper.xml
type-aliases-package: com.kms.**.domain
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
fdfs:
soTimeout: 1500
connectTimeout: 600
thumbImage: #缩略图生成参数
width: 150
height: 150
#预览的地址
showFileUrl: 192.168.61:8888
#使用的是http 还是https
urlAgreement: http
trackerList: #TrackerList参数,支持多个
- 192.168.0.61:22122
ignored:
/v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**,
/app/login,
/doc.html,
/chunk/*,
/error,
/login,
/captchaImage,
/system/file/**,
/system/user/exportExcel,
/system/kaptcha/render,
/test/**
# http请求连接池
http:
pool:
# 连接超时
connectTimeout: 5000000
connectionRequestTimeout: 5000000
defaultMaxPerRoute: 20
# 最大连接数
maxTotal: 100
# 服务器返回数据(response)的时间
socketTimeout: 5000000
validateAfterInactivity: 5000000
#算法配置
algorithm:
#图片ocr服务
entity: http://192.168.0.14:17856/analyze_text
# 自动打抽取摘要
summary: http://192.168.0.210:12343
ocr: http://192.168.0.62:12340/ExtractServer?WSDL

220
shuili-admin/src/main/resources/config/application-dev.yml
View File

@ -1,220 +0,0 @@
# 项目相关配置
shuili:
# 名称
name: 天汇重构
#系统别名 英文/汉语拼音 做缓存的前缀 每个模块的配置必须一样
nameKey: tianhui_lyj
# 版本
version: 1.0
# 版权年份
copyrightYear: 2023
# 实例演示开关
demoEnabled: true
# 临时文件地址
profile: /tmp
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
#数据库配置 参考枚举类DbType
dbType: mysql
#初始话数据的位置 采集的文献的导入
initData: /tmp
init: true
#导入TNT 数据
initTntData: /tmp
#neo4j的一个from
database: tianhui_lyj
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 18082
servlet:
# 应用的访问路径
context-path: /tianhui-admin-web
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.kms: debug
org.springframework: warn
# Spring配置
spring:
application:
name: shuili-admin
resources:
static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,classpath:/templates/,file:${shuili.profile}/
mongodb:
uri: mongodb://192.168.1.20:27017/tianhui
field-naming-strategy: org.springframework.data.mapping.model.SnakeCaseFieldNamingStrategy
# 资源信息
messages:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid-dev
session:
store-type: redis
redis:
flush-mode: immediate
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 1000MB
# 设置总上传的文件大小
max-request-size: 20000MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: redis
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: redis12345
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 16
# 连接池中的最大空闲连接
max-idle: 32
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# password: password
sa-token:
# token名称 (同时也是cookie名称)
token-name: shuili
# token有效期，单位s 默认30天, -1代表永不过期
timeout: -1
# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
activity-timeout: 1800
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true
# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
is-share: false
# token风格
token-style: uuid
# 是否输出操作日志
is-log: true
isReadCookie: false
tokenSessionCheckLogin: false
#是否在初始化配置时打印版本字符画
isV: false
#token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) 参考：token前缀
tokenPrefix: water
# 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作)
autoRenew: true
#是否尝试从header里读取token
isReadHead: true
#mybatis-plus配置
mybatis-plus:
configuration:
#下划线驼峰命名
map-underscore-to-camel-case: true
auto-mapping-behavior: full
#开启日志打印
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#配置Mapper映射文件
mapper-locations: classpath*:mapper/**/*Mapper.xml
type-aliases-package: com.kms.**.domain
# Swagger配置
swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
fdfs:
soTimeout: 1500
connectTimeout: 600
thumbImage: #缩略图生成参数
width: 150
height: 150
#预览的地址
showFileUrl: 192.168.1.20:9080
#使用的是http 还是https
urlAgreement: http
trackerList: #TrackerList参数,支持多个
- 192.168.1.20:22122
ignored:
/actuator/**,
/v2/*,/favicon.ico,/swagger-resources/**,/druid/**,/swagger-ui.html,/webjars/**,
/app/login,/initTnt/**,
/doc.html,
/chunk/*,
/error,
/login,
/login-proxy,
/captchaImage,
/system/file/**,
/system/user/exportExcel,
/system/kaptcha/render,
/tool/gen,
/test/**,
/run/api/**,
/profile/**,
/map/**
# http请求连接池
http:
pool:
# 连接超时
connectTimeout: 5000000
connectionRequestTimeout: 5000000
defaultMaxPerRoute: 20
# 最大连接数
maxTotal: 100
# 服务器返回数据(response)的时间
socketTimeout: 5000000
validateAfterInactivity: 5000000
#算法配置
algorithm:
#图片ocr服务
entity: http://192.168.0.14:17856/analyze_text
# 自动打抽取摘要
summary: http://192.168.0.210:12343
ocr: http://192.168.0.62:12340/ExtractServer?WSDL
management:
endpoints:
web:
exposure:
include: '*'
endpoint:
gateway:
enabled: true
health:
show-details: ALWAYS
logfile:
external-file: ./logs/${spring.application.name}/console.log
health:
rabbit:
enabled: false
context-path: /actuator
job:
isRunning: true

58
shuili-admin/src/main/resources/config/application-druid-dev.yml
View File

@ -1,58 +0,0 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: mysql123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

3
shuili-admin/src/main/resources/config/application.yml
View File

@ -1,3 +0,0 @@
spring:
profiles:
include: dev,druid-dev

32
shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java
View File

@ -1,5 +1,6 @@
package com.kms.yg.df.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,11 +9,20 @@ import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.df.domain.BsSgcDfAqjc;
import com.kms.yg.df.domain.BsSgcDfAqjdxx;
import com.kms.yg.df.domain.BsSgcDfAqrw;
import com.kms.yg.df.domain.BsSgcDfDfrw;
import com.kms.yg.df.service.BsSgcDfAqjcService;
import com.kms.yg.df.service.BsSgcDfAqjdxxService;
import com.kms.yg.df.service.BsSgcDfAqrwService;
import com.kms.yg.df.service.BsSgcDfDfrwService;
import com.kms.yg.sz.domain.BsSgcSzAqjc;
import com.kms.yg.sz.domain.BsSgcSzAqjdxx;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.kms.yg.sz.service.BsSgcSzAqjcService;
import com.kms.yg.sz.service.BsSgcSzAqjdxxService;
import com.shuili.common.annotation.Log;
import com.shuili.common.core.controller.BaseController;
import com.shuili.common.core.domain.AjaxResult;
@ -51,9 +61,13 @@ public class BsSgcDfAqrwController extends BaseController
private SysDeptService sysDeptService;
@Autowired
private BsSgcDfDfrwService bsSgcDfDfrwService;
private BsSgcDfDfrwService bsSgcDfrwService;
@Autowired
private BsSgcDfAqjdxxService bsSgcDfAqjdxxService;
@Autowired
private BsSgcDfAqjcService bsSgcDfAqjcService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
@ -203,9 +217,21 @@ public class BsSgcDfAqrwController extends BaseController
public AjaxResult remove(@PathVariable String[] ids)
{
for (String id:ids){
LambdaQueryWrapper<BsSgcDfDfrw>lw=new LambdaQueryWrapper<>();
LambdaQueryWrapper<BsSgcDfDfrw> lw=new LambdaQueryWrapper<>();
lw.eq(BsSgcDfDfrw::getTaskId,id);
bsSgcDfDfrwService.remove(lw);
List<BsSgcDfDfrw> list = bsSgcDfrwService.list(lw);
if(CollectionUtil.isNotEmpty(list)) {
for (BsSgcDfDfrw dfrw:list) {
LambdaQueryWrapper<BsSgcDfAqjdxx> jdxxLw = new LambdaQueryWrapper<>();
jdxxLw.eq(BsSgcDfAqjdxx::getDfrwId,dfrw.getId());
bsSgcDfAqjdxxService.remove(jdxxLw);
LambdaQueryWrapper<BsSgcDfAqjc>aqjcLw=new LambdaQueryWrapper<>();
aqjcLw.eq(BsSgcDfAqjc::getDfrwId,dfrw.getId());
bsSgcDfAqjcService.remove(aqjcLw);
}
}
bsSgcDfrwService.remove(lw);
}
return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids)));
}

8
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java
View File

@ -192,25 +192,25 @@ public class BsSgcDfAqrwService extends BaseService<BsSgcDfAqrwMapper, BsSgcDfAq
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) && StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotNull(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}

28
shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
View File

@ -137,26 +137,28 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
pieDtos.addAll(listType3);
HashMap<String, HashMap<String,String>> map = new HashMap<>();
for (int i = 0; i < pieDtos.size(); i++) {
List<HashMap<String, String>> hashMaps = new ArrayList<>();
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
if (CollectionUtil.isNotEmpty(pieDtos)) {
for (int i = 0; i < pieDtos.size(); i++) {
List<HashMap<String, String>> hashMaps = new ArrayList<>();
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (StringUtils.isNotEmpty(pieDtos.get(j).getName()) && StringUtils.isNotEmpty(pieDtos.get(i).getName()) && StringUtils.isNotEmpty(pieDtos.get(j).getType())) {
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
}
}
}
}
map.put(pieDtos.get(i).getName(), hashMap);
map.put(pieDtos.get(i).getName(), hashMap);
}
}
return map;
}

3
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java
View File

@ -48,7 +48,8 @@ public class BsSgcSzAqjcController extends BaseController
@ApiOperation("水闸安全检测列表")
public IPage list(@RequestBody SearchParam<BsSgcSzAqjc> sp)
{
return bsSgcSzAqjcService.selectPage(sp);
IPage page = bsSgcSzAqjcService.selectPage(sp);
return page;
}
/**

23
shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java
View File

@ -1,5 +1,6 @@
package com.kms.yg.sz.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,9 +9,13 @@ import com.kms.common.utils.UserUtils;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import com.kms.yg.sz.domain.BsSgcSzAqjc;
import com.kms.yg.sz.domain.BsSgcSzAqjdxx;
import com.kms.yg.sz.domain.BsSgcSzAqrw;
import com.kms.yg.sz.domain.BsSgcSzSzrw;
import com.kms.yg.sz.domain.dto.AqrwDto;
import com.kms.yg.sz.service.BsSgcSzAqjcService;
import com.kms.yg.sz.service.BsSgcSzAqjdxxService;
import com.kms.yg.sz.service.BsSgcSzAqrwService;
import com.kms.yg.sz.service.BsSgcSzSzrwService;
import com.shuili.common.annotation.Log;
@ -53,6 +58,12 @@ public class BsSgcSzAqrwController extends BaseController
@Autowired
private BsSgcSzSzrwService bsSgcSzSzrwService;
@Autowired
private BsSgcSzAqjdxxService bsSgcSzAqjdxxService;
@Autowired
private BsSgcSzAqjcService bsSgcSzAqjcService;
@GetMapping("/getLevel/{taskId}")
public AjaxResult getLevel(@PathVariable String taskId) {
@ -204,6 +215,18 @@ public class BsSgcSzAqrwController extends BaseController
for (String id:ids){
LambdaQueryWrapper<BsSgcSzSzrw> lw=new LambdaQueryWrapper<>();
lw.eq(BsSgcSzSzrw::getTaskId,id);
List<BsSgcSzSzrw> list = bsSgcSzSzrwService.list(lw);
if(CollectionUtil.isNotEmpty(list)) {
for (BsSgcSzSzrw szrw:list) {
LambdaQueryWrapper<BsSgcSzAqjdxx> jdxxLw = new LambdaQueryWrapper<>();
jdxxLw.eq(BsSgcSzAqjdxx::getSzrwId,szrw.getId());
bsSgcSzAqjdxxService.remove(jdxxLw);
LambdaQueryWrapper<BsSgcSzAqjc>aqjcLw=new LambdaQueryWrapper<>();
aqjcLw.eq(BsSgcSzAqjc::getSzrwId,szrw.getId());
bsSgcSzAqjcService.remove(aqjcLw);
}
}
bsSgcSzSzrwService.remove(lw);
}
return toAjax(bsSgcSzAqrwService.removeByIds(Arrays.asList(ids)));

5
shuili-system/src/main/java/com/kms/yg/sz/domain/dto/AqrwDto.java
View File

@ -25,6 +25,8 @@ public class AqrwDto {
private int three;
private int four;
private String rate;
public void setTotal() {
@ -32,6 +34,7 @@ public class AqrwDto {
}
public void setRate() {
this.rate = String.valueOf(this.threeNum/this.total);
Double i = Double.valueOf(this.threeNum) / Double.valueOf(this.total);
this.rate = String.valueOf(i);
}
}

4
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqrwMapper.java
View File

@ -51,6 +51,10 @@ public interface BsSgcSzAqrwMapper extends BaseMapper<BsSgcSzAqrw> {
@Param("layer") Integer layer,
@Param("taskId") String taskId);
List<NumDto> getFour(@Param("adcd") String subString,
@Param("layer") Integer layer,
@Param("taskId") String taskId);
Map<String,Integer> getStatistics(@Param("startDate") String startDate,@Param("endDate")String endDate,
@Param("adcd")String xzqh,@Param("layer")String layer);

16
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java
View File

@ -187,27 +187,28 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
for (NumDto numDto : Num) {
AqrwDto aqrwDto = new AqrwDto();
aqrwDto.setAdcdName(numDto.getName());
for (NumDto dto : zeroNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setZeroNum(dto.getNum());
}
}
for (NumDto dto : oneNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setOneNum(dto.getNum());
}
}
for (NumDto dto : twoNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setTwoNum(dto.getNum());
}
}
for (NumDto dto : threeNum) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())) {
if (ObjectUtil.isNotNull(dto) &&StringUtils.isNotBlank(dto.getName())&&dto.getName().equals(numDto.getName())) {
aqrwDto.setThreeNum(dto.getNum());
}
}
@ -240,6 +241,7 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
List<NumDto> one = bsSgcSzAqrwMapper.getOne(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> two = bsSgcSzAqrwMapper.getTwo(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> three = bsSgcSzAqrwMapper.getThree(sysXzqhService.getSubString(adcd), layer,taskId);
List<NumDto> four = bsSgcSzAqrwMapper.getFour(sysXzqhService.getSubString(adcd), layer,taskId);
for (AqrwDto aqrwDto : dtoList) {
@ -262,6 +264,12 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
}
}
for (NumDto numDto : four) {
if (StringUtils.isNotBlank(numDto.getName())&&numDto.getName().equals(aqrwDto.getAdcdName())) {
aqrwDto.setFour(numDto.getNum());
}
}
}

28
shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
View File

@ -132,32 +132,34 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh),wagaCode);
List<PieDto> pieDtos = new ArrayList<>();
pieDtos.addAll(listType1);
pieDtos.addAll(listType2);
pieDtos.addAll(listType3);
HashMap<String, HashMap<String,String>> map = new HashMap<>();
for (int i = 0; i < pieDtos.size(); i++) {
List<HashMap<String, String>> hashMaps = new ArrayList<>();
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
if (CollectionUtil.isNotEmpty(pieDtos)) {
for (int i = 0; i < pieDtos.size(); i++) {
List<HashMap<String, String>> hashMaps = new ArrayList<>();
HashMap<String, String> hashMap = new HashMap<>();
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
for (int j = 0; j < pieDtos.size(); j++) {
if (StringUtils.isNotEmpty(pieDtos.get(j).getName()) && StringUtils.isNotEmpty(pieDtos.get(i).getName()) && StringUtils.isNotEmpty(pieDtos.get(j).getType())) {
if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
}
}
}
}
map.put(pieDtos.get(i).getName(), hashMap);
map.put(pieDtos.get(i).getName(), hashMap);
}
}
return map;
}

39
shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
View File

@ -13,6 +13,15 @@
</sql>
<sql id="infoJdxx">
SELECT sx.`NAME`,
COUNT(1) num
FROM bs_sgc_df_dfrw ss
LEFT JOIN bs_sgc_df_aqjdxx jdxx on jdxx.dfrw_id =ss.ID
LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code
LEFT JOIN sys_xzqh sx ON sj.adcd = LEFT(sx.XZQHDM,6) AND RIGHT(sx.XZQHDM, 6) = '000000'
</sql>
<resultMap id="NumDto" type="NumDto">
<result property="name" column="name"/>
@ -70,34 +79,22 @@
<select id="getOne" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="0"
<if test="layer==1">
<include refid="infoJdxx"></include>
where task_id =#{taskId} and jdxx.`security_category`="0"
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getTwo" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="1"
<if test="layer==1">
<include refid="infoJdxx"></include>
where task_id =#{taskId} and jdxx.`security_category`="1"
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getThree" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="2"
<if test="layer==1">
<include refid="infoJdxx"></include>
where task_id =#{taskId} and jdxx.`security_category`="2"
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getStatistics" resultType="Map">

47
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
View File

@ -14,6 +14,15 @@
</sql>
<sql id="infoAdjxx">
SELECT sx.`NAME`,
COUNT(1) num
FROM bs_sgc_sz_szrw ss
LEFT JOIN bs_sgc_sz_aqjdxx jdxx on ss.ID=jdxx.szrw_id
LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code
LEFT JOIN sys_xzqh sx ON LEFT(sj.adcd,6) = LEFT(sx.XZQHDM,6)
AND RIGHT(sx.xzqhdm, 6) = '000000'
</sql>
<resultMap id="NumDto" type="NumDto">
<result property="name" column="name"/>
@ -70,36 +79,32 @@
<select id="getOne" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="0"
<if test="layer==1">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=0
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getTwo" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="1"
<if test="layer==1">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=1
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getThree" resultMap="NumDto">
<include refid="info"></include>
where task_id =#{taskId} and sj.`security_category`="2"
<if test="layer==1">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=2
GROUP BY LEFT(sj.adcd,4)
</if>
<if test="layer==2">
GROUP BY sj.adcd
</if>
</select>
<select id="getFour" resultMap="NumDto">
<include refid="infoAdjxx"></include>
where task_id =#{taskId} and jdxx.`security_category`=3
GROUP BY LEFT(sj.adcd,4)
</select>
<select id="getStatistics" resultType="Map">
SELECT COUNT(1) num,
COUNT(CASE WHEN ss.status = '3' THEN 1 END) completedNum,

7
shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
View File

@ -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
</sql>
@ -69,7 +68,7 @@
<select id="getList" resultMap="BsSgcSzFzr">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include>
<where>
<if test="wageName!=null and wageName!=''">
and sj.WAGA_NAME LIKE concat('%',#{wageName},'%')
</if>
@ -79,7 +78,7 @@
<if test="adcd != null and adcd != ''">
and sj.adcd like concat(#{adcd},'%')
</if>
</where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
</select>

Write Preview
Loading…
Cancel
Save