WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数清单-参数导出改为同步

Browse Source
This commit is contained in:
liyawei
2022-11-24 11:31:53 +08:00
parent 56a3124a0e
commit cf54c4271b
2 changed files with 51 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+49 -49
View File
@@ -2303,7 +2303,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override @Override
public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request) { public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request) {
// OutputStream os = null; OutputStream os = null;
OutputStream excelOS = null; OutputStream excelOS = null;
XSSFWorkbook workbook = new XSSFWorkbook(); XSSFWorkbook workbook = new XSSFWorkbook();
String fileOriName = "参数项清单导出信息"; String fileOriName = "参数项清单导出信息";
@@ -2399,58 +2399,58 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String repFileName = fileName.replaceAll("/","_"); String repFileName = fileName.replaceAll("/","_");
excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName); excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
// response.setHeader("Content-Disposition", response.setHeader("Content-Disposition",
// "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request) +"\""); "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request) +"\"");
// response.setContentType("application/force-download"); response.setContentType("application/force-download");
// response.flushBuffer(); response.flushBuffer();
// os = response.getOutputStream(); os = response.getOutputStream();
workbook.write(excelOS); workbook.write(excelOS);
excelOS.flush(); excelOS.flush();
excelOS.close(); excelOS.close();
ZipUtil.zip(fileNowPath,fileNowPath+".zip"); ZipUtil.zip(fileNowPath,fileNowPath+".zip");
// FileInputStream fis = new FileInputStream(fileNowPath+".zip"); FileInputStream fis = new FileInputStream(fileNowPath+".zip");
// int len = 0; int len = 0;
// while ((len = fis.read()) != -1) { while ((len = fis.read()) != -1) {
// os.write(len); os.write(len);
// } }
// 将导出文件上传到cos上 // // 将导出文件上传到cos上
String uploadFileName = fileOriName + ".zip"; // String uploadFileName = fileOriName + ".zip";
InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip")); // InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip"));
MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传 // MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传
OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包 // OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包
//
// 系统向用户发消息 // // 系统向用户发消息
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人 // LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
String msgTitle = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated."; // String msgTitle = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated.";
String content = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click download."; // String content = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click download.";
//
String href = "<a href='/jero-boot/sys/common/downLoadFile?id=" + ossFile.getId() + "'" + " target='_blank'>download</a>."; // String href = "<a href='/jero-boot/sys/common/downLoadFile?id=" + ossFile.getId() + "'" + " target='_blank'>download</a>.";
String contentInfo = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click " + href; // String contentInfo = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click " + href;
//
SysAnnouncement sysAnnouncement = new SysAnnouncement(); // SysAnnouncement sysAnnouncement = new SysAnnouncement();
sysAnnouncement.setDelFlag("0"); // sysAnnouncement.setDelFlag("0");
sysAnnouncement.setSendStatus("0"); // sysAnnouncement.setSendStatus("0");
sysAnnouncement.setSendTime(new Date()); // sysAnnouncement.setSendTime(new Date());
sysAnnouncement.setMsgCategory(MessageTypeEnum.PUSH.getValue()); //消息类型：转发推送 // sysAnnouncement.setMsgCategory(MessageTypeEnum.PUSH.getValue()); //消息类型：转发推送
sysAnnouncement.setInitiator(MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); // 发起人：系统 // sysAnnouncement.setInitiator(MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); // 发起人：系统
sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 // sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
sysAnnouncement.setTitile(msgTitle); // sysAnnouncement.setTitile(msgTitle);
sysAnnouncement.setMsgContent(content); // sysAnnouncement.setMsgContent(content);
sysAnnouncement.setMsgContentInfo(contentInfo); // sysAnnouncement.setMsgContentInfo(contentInfo);
sysAnnouncement.setUserIds(currentUser.getId()); // 发送给当前导出人 // sysAnnouncement.setUserIds(currentUser.getId()); // 发送给当前导出人
sysAnnouncementService.saveAnnouncement(sysAnnouncement); // sysAnnouncementService.saveAnnouncement(sysAnnouncement);
//
JSONObject obj = new JSONObject(); // JSONObject obj = new JSONObject();
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); // obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
obj.put(WebsocketConst.MSG_ID, currentUser.getId()); // obj.put(WebsocketConst.MSG_ID, currentUser.getId());
obj.put(WebsocketConst.MSG_TXT, contentInfo); // obj.put(WebsocketConst.MSG_TXT, contentInfo);
webSocket.sendMessage(obj.toJSONString()); // webSocket.sendMessage(obj.toJSONString());
//
uploadFileio.close(); // uploadFileio.close();
// os.flush(); os.flush();
// os.close(); // 后开先关 os.close(); // 后开先关
// fis.close(); // 先开后关 fis.close(); // 先开后关
} catch (Exception e) { } catch (Exception e) {
if (e instanceof JeroBootException){ if (e instanceof JeroBootException){
throw new JeroBootException(e.getMessage()); throw new JeroBootException(e.getMessage());
@@ -2464,7 +2464,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
} }
} finally { } finally {
// IOUtils.closeQuietly(os); IOUtils.closeQuietly(os);
IOUtils.closeQuietly(excelOS); IOUtils.closeQuietly(excelOS);
File tempZipFile = new File(uploadpath + "/tempZip"); File tempZipFile = new File(uploadpath + "/tempZip");
FileUtil.deleteContents(tempZipFile); FileUtil.deleteContents(tempZipFile);
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+2 -6
View File
@@ -921,12 +921,8 @@
userTypes: this.currentPersonRole, userTypes: this.currentPersonRole,
exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
} }
getAction('/params/collectManifest/exportAll', query).then((res) => { let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
if (res && !res.success) { downloadFile('/params/collectManifest/exportAll', name , query , this.selectClear)
this.$message.error(res.message)
}
this.textLoading = false
})
}, },
//填写人导出 //填写人导出
handleExportDre(){ handleExportDre(){