From 74246592f188517b54eb6e2fde512ede42b2ba52 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 1 Apr 2024 18:15:41 +0800 Subject: [PATCH] =?UTF-8?q?14920=20=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=9A=84=E5=88=86=E6=9E=90=E5=8D=95=E4=BD=8D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90=E5=8D=95=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90=E5=8D=95=E4=BD=8D=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=EF=BC=8C=E5=8A=9F=E8=83=BD=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=20=E6=B3=A8=E6=84=8F?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E7=9A=84=E8=AF=A6=E6=83=85=E3=80=81?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E9=A1=B5=E9=9D=A2=E8=AF=A6=E6=83=85=E3=80=81?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHotworkCfdController.java | 12 ++++++------ .../app/highriskwork/AppHotworkController.java | 8 ++++---- .../zcloud/controller/gf/AppGFHotworkController.java | 8 ++++---- src/main/java/com/zcloud/util/Warden.java | 8 -------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 70dabdd6..8c3af136 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -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; diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkController.java index 4012510f..e6970591 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkController.java @@ -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; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java index 5b069778..caa043cd 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHotworkController.java @@ -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; diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index b77dfa37..3de3e253 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -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; - } }