diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index b3d445ef2..1fcb5be55 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -2303,7 +2303,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpldownload."; - String contentInfo = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click " + href; - - SysAnnouncement sysAnnouncement = new SysAnnouncement(); - sysAnnouncement.setDelFlag("0"); - sysAnnouncement.setSendStatus("0"); - sysAnnouncement.setSendTime(new Date()); - sysAnnouncement.setMsgCategory(MessageTypeEnum.PUSH.getValue()); //消息类型:转发推送 - sysAnnouncement.setInitiator(MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); // 发起人:系统 - sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 - sysAnnouncement.setTitile(msgTitle); - sysAnnouncement.setMsgContent(content); - sysAnnouncement.setMsgContentInfo(contentInfo); - sysAnnouncement.setUserIds(currentUser.getId()); // 发送给当前导出人 - sysAnnouncementService.saveAnnouncement(sysAnnouncement); - - JSONObject obj = new JSONObject(); - obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); - obj.put(WebsocketConst.MSG_ID, currentUser.getId()); - obj.put(WebsocketConst.MSG_TXT, contentInfo); - webSocket.sendMessage(obj.toJSONString()); - - uploadFileio.close(); -// os.flush(); -// os.close(); // 后开先关 -// fis.close(); // 先开后关 +// // 将导出文件上传到cos上 +// String uploadFileName = fileOriName + ".zip"; +// InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip")); +// MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传 +// OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包 +// +// // 系统向用户发消息 +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人 +// 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 href = "download."; +// String contentInfo = "The file " + paramsCollectManifestVO.getExportName() + " that you exported has been generated, please click " + href; +// +// SysAnnouncement sysAnnouncement = new SysAnnouncement(); +// sysAnnouncement.setDelFlag("0"); +// sysAnnouncement.setSendStatus("0"); +// sysAnnouncement.setSendTime(new Date()); +// sysAnnouncement.setMsgCategory(MessageTypeEnum.PUSH.getValue()); //消息类型:转发推送 +// sysAnnouncement.setInitiator(MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); // 发起人:系统 +// sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 +// sysAnnouncement.setTitile(msgTitle); +// sysAnnouncement.setMsgContent(content); +// sysAnnouncement.setMsgContentInfo(contentInfo); +// sysAnnouncement.setUserIds(currentUser.getId()); // 发送给当前导出人 +// sysAnnouncementService.saveAnnouncement(sysAnnouncement); +// +// JSONObject obj = new JSONObject(); +// obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); +// obj.put(WebsocketConst.MSG_ID, currentUser.getId()); +// obj.put(WebsocketConst.MSG_TXT, contentInfo); +// webSocket.sendMessage(obj.toJSONString()); +// +// uploadFileio.close(); + os.flush(); + os.close(); // 后开先关 + fis.close(); // 先开后关 } catch (Exception e) { if (e instanceof JeroBootException){ throw new JeroBootException(e.getMessage()); @@ -2464,7 +2464,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { - if (res && !res.success) { - this.$message.error(res.message) - } - this.textLoading = false - }) + let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' + downloadFile('/params/collectManifest/exportAll', name , query , this.selectClear) }, //填写人导出 handleExportDre(){