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

Merge pull request 'x11.8smb修复问题，相关方展示集团单位' (#2) from x11.8 into dev 

Reviewed-on: #2
separationdemo
wangxuan 2023-11-08 17:58:09 +08:00
parent b5b5aba4dc 1197111074
commit f6d7669a2d
3 changed files with 222 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/zcloud/util/Smb.java
View File

@ -4,7 +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;
@ -15,18 +17,36 @@ 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}")
private static String host;
public void setHostPath(String hostProperties){
host = hostProperties;
}
@Value("${smb.port}")
private static Integer port ;
public void setPortPath(Integer portProperties){
port = portProperties;
}
@Value("${smb.user}")
private static String user;
public void setUserPath(String userProperties){
user = userProperties;
}
@Value("${smb.password}")
private static String password;
public void setPasswordPath(String passwordProperties){
password = passwordProperties;
}
@Value("${smb.basePath}")
private static String basePath;
public void setBasePath(String basePathProperties){
basePath = basePathProperties;
}
// private static String host = "39.103.224.166";
//
@ -50,7 +70,6 @@ public class Smb {
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;
@ -220,7 +239,8 @@ public class Smb {
/**
* 删除文件
*Rhidd
* Rhidd
*
* @throws SftpException
* @throws JSchException
*/

10
src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
View File

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

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

@ -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')