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

Merge remote-tracking branch 'origin/pet' into pet

liujun-2024-05-23-接口漏洞修复
limingyu 2024-04-01 19:16:38 +08:00
parent 8ee09f0d51 74246592f1
commit 14f5c1684c
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java
View File

@ -353,7 +353,7 @@ public class AppHotworkCfdController extends BaseController {
PageData content = new PageData();
content.put("number", hotworkCfd.getString("CHECK_NO"));// 作业编号
content.put("params1", "动火申请作业"); // 作业名称
content.put("params2", "班长验票");
content.put("params2", "动火前验票");
content.put("params3", "验收");// 作业操作
mes.put("CONTENT", content);// 站内信内容
noticeCorpService.sendNotice(mes);
@ -435,7 +435,7 @@ public class AppHotworkCfdController extends BaseController {
content.put("params3", "处理");// 作业操作
mes.put("CONTENT", content);// 站内信内容
noticeCorpService.sendNotice(mes);
} else if (hotworkCfdState.equals("-7")) {//班长验票打回
} else if (hotworkCfdState.equals("-7")) {//动火前验票打回
PageData mes = new PageData();
mes.put("BIANMA","PROCESS_WORK_001");
mes.put("SENDER_ID", "系统管理员"); // 发送人员ID
@ -1079,7 +1079,7 @@ public class AppHotworkCfdController extends BaseController {
// 第3个参数
PageData params3 = new PageData();
params3.put("name", "params2");// 存入短信模板中的参数名称
params3.put("value", "班长验票");// 存入上面参数名称所传递的值
params3.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList.add(params3);
// 第4个参数
PageData params4 = new PageData();
@ -1104,7 +1104,7 @@ public class AppHotworkCfdController extends BaseController {
pd2.put("MONITOR_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "班长验票通过");
log.put("ACTION", "动火前验票通过");
// 发短信
PageData mes = new PageData();
@ -1319,7 +1319,7 @@ public class AppHotworkCfdController extends BaseController {
//sendMessageUtil.sendMessages(mes4, paramsList4);
break;
case "-7"://审批打回
log.put("ACTION", "班长验票打回");
log.put("ACTION", "动火前验票打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
@ -1344,7 +1344,7 @@ public class AppHotworkCfdController extends BaseController {
// 第3个参数
PageData params18 = new PageData();
params18.put("name", "params3");// 存入短信模板中的参数名称
params18.put("value", "班长验票");// 存入上面参数名称所传递的值
params18.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList5.add(params18);
//sendMessageUtil.sendMessages(mes5, paramsList5);
break;

8
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkController.java
View File

@ -492,7 +492,7 @@ public class AppHotworkController extends BaseController {
// 第3个参数
PageData params3 = new PageData();
params3.put("name", "params2");// 存入短信模板中的参数名称
params3.put("value", "班长验票");// 存入上面参数名称所传递的值
params3.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList.add(params3);
// 第4个参数
PageData params4 = new PageData();
@ -523,7 +523,7 @@ public class AppHotworkController extends BaseController {
pd2.put("MONITOR_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkService.edit(pd2);
log.put("ACTION", "班长验票通过");
log.put("ACTION", "动火前验票通过");
// 发短信
PageData mes = new PageData();
@ -756,7 +756,7 @@ public class AppHotworkController extends BaseController {
sendMessages(mes4, paramsList4);
break;
case "-7"://审批打回
log.put("ACTION", "班长验票打回");
log.put("ACTION", "动火前验票打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
hotworkService.edit(pd2);
@ -780,7 +780,7 @@ public class AppHotworkController extends BaseController {
// 第3个参数
PageData params18 = new PageData();
params18.put("name", "params3");// 存入短信模板中的参数名称
params18.put("value", "班长验票");// 存入上面参数名称所传递的值
params18.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList5.add(params18);
sendMessages(mes5, paramsList5);
break;

8
src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java
View File

@ -825,7 +825,7 @@ public class AppGFHotworkController extends BaseController {
// 第3个参数
PageData params3 = new PageData();
params3.put("name", "params2");// 存入短信模板中的参数名称
params3.put("value", "班长验票");// 存入上面参数名称所传递的值
params3.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList.add(params3);
// 第4个参数
PageData params4 = new PageData();
@ -849,7 +849,7 @@ public class AppGFHotworkController extends BaseController {
pd2.put("MONITOR_CONTENT", pd.get("CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
GFhotworkService.edit(pd2);
log.put("ACTION", "班长验票通过");
log.put("ACTION", "动火前验票通过");
// 发短信
PageData mes = new PageData();
@ -1092,7 +1092,7 @@ public class AppGFHotworkController extends BaseController {
sendMessageUtil.sendMessages(mes4, paramsList4);
break;
case "-7"://审批打回
log.put("ACTION", "班长验票打回");
log.put("ACTION", "动火前验票打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("ACCEPT_CONTENT", pd.get("CONTENT"));
GFhotworkService.edit(pd2);
@ -1117,7 +1117,7 @@ public class AppGFHotworkController extends BaseController {
// 第3个参数
PageData params18 = new PageData();
params18.put("name", "params3");// 存入短信模板中的参数名称
params18.put("value", "班长验票");// 存入上面参数名称所传递的值
params18.put("value", "动火前验票");// 存入上面参数名称所传递的值
paramsList5.add(params18);
sendMessageUtil.sendMessages(mes5, paramsList5);
break;

8
src/main/java/com/zcloud/util/Warden.java
View File

@ -479,13 +479,5 @@ public class Warden {
}
throw new IOException("压缩文件失败");
}
public static Object saveFile(MultipartFile[] files,String CORPINFO_ID) throws Exception{
if (files.length == 0) throw new RuntimeException("文件为空");
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
String fileName = get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile);
return Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName;
}
}