Merge remote-tracking branch 'origin/dev' into lmy20231113
limingyu
commit
ff9dc890bf
|
|
@ -23,3 +23,4 @@
|
|||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
/catalina.base_IS_UNDEFINED/
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import org.springframework.boot.SpringApplication;
|
|||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.context.annotation.Conditional;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
/**
|
||||
|
|
@ -17,7 +18,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|||
@SpringBootApplication//去除冲突
|
||||
@MapperScan("com.zcloud.mapper")
|
||||
@EnableCaching
|
||||
@EnableScheduling // 2.开启定时任务
|
||||
@EnableScheduling
|
||||
// 2.开启定时任务
|
||||
public class FHmainApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(FHmainApplication.class, args);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ import java.io.InputStream;
|
|||
import java.io.OutputStream;
|
||||
import java.util.Vector;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Configurable;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import com.jcraft.jsch.Channel;
|
||||
|
|
@ -14,8 +17,37 @@ import com.jcraft.jsch.Session;
|
|||
import com.jcraft.jsch.SftpATTRS;
|
||||
import com.jcraft.jsch.SftpException;
|
||||
|
||||
@Configuration
|
||||
public class Smb {
|
||||
|
||||
|
||||
public static String host;
|
||||
public static Integer port;
|
||||
public static String user;
|
||||
public static String password;
|
||||
public static String basePath;
|
||||
|
||||
@Value("${smb.host}")
|
||||
public void setHostPath(String hostProperties){
|
||||
host = hostProperties;
|
||||
}
|
||||
@Value("${smb.port}")
|
||||
public void setPortPath(Integer portProperties){
|
||||
port = portProperties;
|
||||
}
|
||||
@Value("${smb.user}")
|
||||
public void setUserPath(String userProperties){
|
||||
user = userProperties;
|
||||
}
|
||||
@Value("${smb.password}")
|
||||
public void setPasswordPath(String passwordProperties){
|
||||
password = passwordProperties;
|
||||
}
|
||||
@Value("${smb.basePath}")
|
||||
public void setBasePath(String basePathProperties){
|
||||
basePath = basePathProperties;
|
||||
}
|
||||
|
||||
// private static String host = "39.103.224.166";
|
||||
//
|
||||
// private static Integer port = 22;
|
||||
|
|
@ -25,20 +57,19 @@ public class Smb {
|
|||
// private static String password = "Zcloud@zcloud88888";
|
||||
//
|
||||
// private static String basePath = "/mnt/qgfile/file/";
|
||||
private static String host = "192.168.192.201";
|
||||
|
||||
private static Integer port = Integer.valueOf(22);
|
||||
|
||||
private static String user = "root";
|
||||
|
||||
private static String password = "SJSKAQHBGLXT@20220311";
|
||||
|
||||
private static String basePath = "/mnt/qask/file/";
|
||||
// private static String host = "192.168.192.201";
|
||||
//
|
||||
// private static Integer port = Integer.valueOf(22);
|
||||
//
|
||||
// private static String user = "root";
|
||||
//
|
||||
// private static String password = "SJSKAQHBGLXT@20220311";
|
||||
//
|
||||
// private static String basePath = "/mnt/qask/file/";
|
||||
|
||||
public static final String SMBBAES_PATH = basePath;
|
||||
|
||||
|
||||
|
||||
public static void sshSftp(MultipartFile file, String fileName, String path) throws Exception {
|
||||
Session session = null;
|
||||
Channel channel = null;
|
||||
|
|
@ -208,7 +239,8 @@ public class Smb {
|
|||
|
||||
/**
|
||||
* 删除文件
|
||||
*Rhidd
|
||||
* Rhidd
|
||||
*
|
||||
* @throws SftpException
|
||||
* @throws JSchException
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
spring.application.name=qa-prevention-gwj
|
||||
server.port=8091
|
||||
#数据源 172.24.151.16 39.103.224.166 39.101.130.96 192.168.192.202 gwjsjkzcloud888888
|
||||
|
||||
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
|
|
@ -11,27 +10,18 @@ datasource.no2.username=root
|
|||
datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
|
||||
#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#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=gwjsjkzcloud888888
|
||||
#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#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=gwjsjkzcloud888888
|
||||
|
||||
#druid连接池
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#最大活跃数
|
||||
#?????
|
||||
spring.datasource.maxActive: 20
|
||||
#初始化数量
|
||||
#?????
|
||||
spring.datasource.initialSize: 1
|
||||
#最大连接等待超时时间
|
||||
#??????????
|
||||
spring.datasource.maxWait: 60000
|
||||
#打开PSCache，并且指定每个连接PSCache的大小
|
||||
#??PSCache?????????PSCache???
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#通过connectionProperties属性来打开mergeSql功能；慢SQL记录
|
||||
#??connectionProperties?????mergeSql????SQL??
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
|
|
@ -40,34 +30,42 @@ spring.datasource.validationQuery: select 1 from dual
|
|||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
|
||||
#?????????filters????????sql?????,'wall'?????
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#缓存配置文件位置
|
||||
#????????
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#配置这句话,控制台输出sql语句
|
||||
#?????,?????sql??
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#上传文件大小限制
|
||||
#????????
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti模型检测
|
||||
#activiti????
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#字符
|
||||
#??
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# 关闭springboot启动时的banner
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
#jar包部署时去掉注释
|
||||
#jar????????
|
||||
#web.upload-path=h:/
|
||||
#web.front-path=h:/
|
||||
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
|
||||
|
||||
preventionxgf.api.url=http://192.168.0.45:8088/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.45:8092/
|
||||
|
||||
#preventionxgf.api.url=http://192.168.0.79:8088
|
||||
#
|
||||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||
|
||||
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
||||
#?????
|
||||
smb.host=39.103.224.166
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/qgfile/file/
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
|
||||
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no1.username=root
|
||||
datasource.no1.password=Mysql@zcloud88888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
datasource.no2.username=root
|
||||
datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
|
||||
#druid???
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#?????
|
||||
spring.datasource.maxActive: 20
|
||||
#?????
|
||||
spring.datasource.initialSize: 1
|
||||
#??????????
|
||||
spring.datasource.maxWait: 60000
|
||||
#??PSCache?????????PSCache???
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#??connectionProperties?????mergeSql????SQL??
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
spring.datasource.minEvictableIdleTimeMillis: 300000
|
||||
spring.datasource.validationQuery: select 1 from dual
|
||||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#?????????filters????????sql?????,'wall'?????
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#????????
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#?????,?????sql??
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#????????
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti????
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#??
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# ??springboot????banner
|
||||
spring.main.banner-mode=off
|
||||
#jar????????
|
||||
#web.upload-path=h:/
|
||||
#web.front-path=h:/
|
||||
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
|
||||
|
||||
#preventionxgf.api.url=http://192.168.0.79:8088
|
||||
#
|
||||
#qa-regulatory-gwj.api.url=http://192.168.0.79:8008
|
||||
|
||||
preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
|
||||
#?????
|
||||
smb.host=39.103.224.166
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=Zcloud@zcloud88888
|
||||
smb.basePath=/mnt/qgfile/file/
|
||||
|
|
@ -1,16 +1,4 @@
|
|||
spring.application.name=qa-prevention-gwj
|
||||
server.port=8091
|
||||
#数据源 172.24.151.16 39.103.224.166 39.101.130.96 192.168.192.202 gwjsjkzcloud888888
|
||||
#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
#datasource.no1.username=root
|
||||
#datasource.no1.password=Mysql@zcloud88888
|
||||
#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
#datasource.no2.username=root
|
||||
#datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
|
||||
# ??????
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
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
|
||||
|
|
@ -70,3 +58,10 @@ spring.main.banner-mode=off
|
|||
preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/
|
||||
|
||||
#?????
|
||||
smb.host=192.168.192.201
|
||||
smb.port=22
|
||||
smb.user=root
|
||||
smb.password=SJSKAQHBGLXT@20220311
|
||||
smb.basePath=/mnt/qask/file/
|
||||
|
||||
|
|
@ -1,72 +1,12 @@
|
|||
spring.application.name=qa-prevention-gwj
|
||||
server.port=8091
|
||||
#数据源 172.24.151.16 39.103.224.166 39.101.130.96 192.168.192.202 gwjsjkzcloud888888
|
||||
#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
#datasource.no1.username=root
|
||||
#datasource.no1.password=Mysql@zcloud88888
|
||||
#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
|
||||
#datasource.no2.username=root
|
||||
#datasource.no2.password=Mysql@zcloud88888
|
||||
|
||||
#??
|
||||
spring.profiles.active=local
|
||||
#??
|
||||
#spring.profiles.active=dev
|
||||
#??
|
||||
#spring.profiles.active=master
|
||||
|
||||
|
||||
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
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=gwjsjkzcloud888888
|
||||
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
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=gwjsjkzcloud888888
|
||||
|
||||
#druid连接池
|
||||
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
|
||||
#最大活跃数
|
||||
spring.datasource.maxActive: 20
|
||||
#初始化数量
|
||||
spring.datasource.initialSize: 1
|
||||
#最大连接等待超时时间
|
||||
spring.datasource.maxWait: 60000
|
||||
#打开PSCache，并且指定每个连接PSCache的大小
|
||||
spring.datasource.poolPreparedStatements: true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
|
||||
#通过connectionProperties属性来打开mergeSql功能；慢SQL记录
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle: 1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis: 60000
|
||||
spring.datasource.minEvictableIdleTimeMillis: 300000
|
||||
spring.datasource.validationQuery: select 1 from dual
|
||||
spring.datasource.testWhileIdle: true
|
||||
spring.datasource.testOnBorrow: false
|
||||
spring.datasource.testOnReturn: false
|
||||
#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
|
||||
filters: stat, wall, log4j
|
||||
|
||||
#缓存配置文件位置
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
|
||||
#配置这句话,控制台输出sql语句
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
|
||||
#上传文件大小限制
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
|
||||
#activiti模型检测
|
||||
spring.activiti.check-process-definitions=false
|
||||
|
||||
#字符
|
||||
spring.http.encoding.charset=UTF-8
|
||||
spring.http.encoding.force=true
|
||||
spring.http.encoding.enabled=true
|
||||
# 关闭springboot启动时的banner
|
||||
spring.main.banner-mode=off
|
||||
#jar包部署时去掉注释
|
||||
#web.upload-path=h:/
|
||||
#web.front-path=h:/
|
||||
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
|
||||
|
||||
preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/
|
||||
qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/
|
||||
|
||||
|
|
|
|||
|
|
@ -875,11 +875,11 @@
|
|||
(select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
left join sys_user cr on cr.USER_ID = f.CREATOR
|
||||
left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
|
||||
left join sys_user ch on ch.USER_ID = f.CHECKOR
|
||||
left join sys_user rev on rev.USER_ID = f.REVIEWOR
|
||||
left join sys_user conUser on conUser.USER_ID = f.CONFIRM_USER
|
||||
left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR
|
||||
left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR
|
||||
left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR
|
||||
left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR
|
||||
left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER
|
||||
left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
|
||||
left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
|
||||
left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
|
||||
|
|
|
|||
|
|
@ -508,16 +508,18 @@
|
|||
f.*
|
||||
FROM
|
||||
bus_hidden f
|
||||
LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
|
||||
left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
|
||||
left join sys_user bhuUser on bhuUser.user_id = bhu.user_id
|
||||
left join oa_department bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID
|
||||
|
||||
left join `qa-gwj-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR
|
||||
LEFT JOIN `qa-gwj-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
|
||||
left join `qa-gwj-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id
|
||||
left join `qa-gwj-prevention`.vi_department_all bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID
|
||||
|
||||
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
|
||||
left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE
|
||||
left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT
|
||||
left join bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART
|
||||
|
||||
left join sys_user zgUser on zgUser.user_id = f.RECTIFICATIONOR
|
||||
|
||||
WHERE f.ISDELETE = '0'
|
||||
and f.STATE not in ('0','7','8','100','101','102')
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
public class Main {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello world!");
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue