From e535793bde9e4a40498d6176a57079d8291dfc85 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 16 Jun 2023 16:38:33 +0800 Subject: [PATCH] =?UTF-8?q?mq=E6=89=B9=E9=87=8F=E6=96=87=E4=BB=B6pdf+?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=85=A8=E9=83=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussStandFileController.java | 7 + .../service/ISarBussStandFileService.java | 2 + .../impl/SarBussStandFileServiceImpl.java | 53 +++++- .../SarBussionessStandController.java | 24 +++ .../impl/SarBussionessStandServiceImpl.java | 164 +++++++++--------- 5 files changed, 166 insertions(+), 84 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java index 22e08474..f439f28e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/controller/SarBussStandFileController.java @@ -74,4 +74,11 @@ public class SarBussStandFileController extends BaseController public ResponseMessage> batchUpdateSarBussFile() throws Exception { return sarBussStandFileEOService.batchUpdateSarBussFile(); } + + @ApiOperation(value = "|SarBussStandFileEO|批量修改加密文件不能打开问题") + @GetMapping("/batchUpdateSarBussFileMQ") + /*@RequiresPermissions("lawss:sarLawsFile:list")*/ + public ResponseMessage> batchUpdateSarBussFileMQ() throws Exception { + return sarBussStandFileEOService.batchUpdateSarBussFileMQ(); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java index 1e14182b..56c2d4f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/ISarBussStandFileService.java @@ -19,4 +19,6 @@ public interface ISarBussStandFileService extends IService { List selectFileByAttId(String attId) throws Exception; ResponseMessage> batchUpdateSarBussFile(); + + ResponseMessage> batchUpdateSarBussFileMQ(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java index dba442bf..339249e0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/service/impl/SarBussStandFileServiceImpl.java @@ -1,25 +1,26 @@ package com.adc.da.slrs.sarBussStandFile.service.impl; +import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; import com.adc.da.common.UseModuleEnum; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.mq.CreateOnlineEditingFileMQService; import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao; import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService; import com.adc.da.slrs.sarBussionessStand.service.impl.SarBussionessStandServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -43,6 +44,9 @@ public class SarBussStandFileServiceImpl extends ServiceImpl selectFileByAttId(String attId) throws Exception{ return sarStandFileEODao.selectFileByAttId(attId); @@ -93,4 +97,47 @@ public class SarBussStandFileServiceImpl extends ServiceImpl> batchUpdateSarBussFileMQ() { + List sarBussStandFileArrayList = new ArrayList<>(); + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); + objectQueryWrapper.ne("FILE_SUFFIX","pdf"); + objectQueryWrapper.ne("FILE_SUFFIX","PDF"); + List sarBussStandFiles = sarStandFileEODao.selectList(objectQueryWrapper); + if(!sarBussStandFiles.isEmpty()){ + for (SarBussStandFile data :sarBussStandFiles) { + QueryWrapper QueryWrapper = new QueryWrapper<>(); + QueryWrapper.eq("ORI_ATT_ID",data.getOriAttId()); + QueryWrapper.eq("USE_MODEL", "WEB_FILE"); + List sarBussStandFileList = sarStandFileEODao.selectList(QueryWrapper); + if(sarBussStandFileList.isEmpty() && sarBussStandFileList.size()==0){ + AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); + if(fileInfo!=null){ + String fileName = ""; + if(StringUtils.isNotBlank(fileInfo.getFileName())){ + String[] splitInfo = fileInfo.getFileName().split("\\."); + fileName = splitInfo[0]; + } + Map bussMap = new HashMap<>(); + bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); + bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); + bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); + bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); + bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); + bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); + bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); + bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); + logger.info("======================================word.doc发送mq================================="); + createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); + sarBussStandFileArrayList.add(data); + }else { + logger.info("======================================word.doc转换失败================================="); + } + } + } + } + return Result.success(sarBussStandFileArrayList); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index ebffc100..26b95169 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -158,6 +158,30 @@ public class SarBussionessStandController extends BaseController rows = sarBussionessStandEOService.getSarBussionStandPage(page); + if(!rows.isEmpty()){ + for (SarBussionessStand data: rows){ + if(StringUtils.isNotBlank(exportContent)){ + exportContent = exportContent+","+data.getId(); + }else { + exportContent = data.getId(); + } + } + } + + } + exportType = "apart"; + } List datas = sarBussionessStandEOService.getSarBussionessStand(exportType,exportContent,userId); workbook = BussStandExportUtil.exportDatas(datas); os = response.getOutputStream(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 754e34af..413f9fef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -398,41 +398,42 @@ public class SarBussionessStandServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("ID",page.getMenuId()); - qw.isNull("PARENT_ID"); - List children = iTsResourceService.list(qw); + if(StringUtils.isNotBlank(exportContent)) { + JSONObject jsonObject = JSONObject.fromObject(exportContent); + page = (SarBussionessStandEOPage) JSONObject.toBean(jsonObject, SarBussionessStandEOPage.class); + page.setPage(1); + page.setPageSize(10000); + //查询当前登录人角色拥有权限的菜单 + if (page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())) { + String treeType = page.getTreeType(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID", page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); - if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){ - List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); + if (children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)) { + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } else if (!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iSarMenuStandardService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } } - List ids = iTsResourceService.getChildMenuList(page.getMenuId()); - if (ids != null && !ids.isEmpty()) { - page.setMenuAllChildrenIdList(ids); - } - }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){ - List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } - List ids = iSarMenuStandardService.getChildMenuList(page.getMenuId()); - if (ids != null && !ids.isEmpty()) { - page.setMenuAllChildrenIdList(ids); - } - } // if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ // List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); @@ -446,14 +447,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO"); - if (com.adc.da.util.utils.StringUtils.isNotBlank(advanceStr)) { - page.setAdvanceSearchStr(advanceStr); - } else { - page.setAdvanceSearchStr(null); + } + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList, "SAR_BUSS_STAND_ATTR_INFO"); + if (com.adc.da.util.utils.StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } } } } @@ -4920,49 +4922,49 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ - AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); - if(attFileVo!=null){ - SarBussStandFile sarBussStandFile = new SarBussStandFile(); - //sarBussStandFile.setId(); - String uuId = com.adc.da.util.utils.UUID.randomUUID(20); - sarBussStandFile.setId(uuId); - sarBussStandFile.setStandId(sarBussStandFiles.get(0).getStandId()); - sarBussStandFile.setStandFileClassify(sarBussStandFiles.get(0).getStandFileClassify()); - sarBussStandFile.setAttId(attFileVo.getId()); - sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); - sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); - sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); - sarBussStandFile.setPassword(sarBussStandFiles.get(0).getPassword()); - sarBussStandFile.setValidFlag(0); - sarBussStandFile.setCreationTime(new Date()); - sarBussStandFile.setModifyTime(new Date()); - sarBussStandFile.setOriAttId(sarBussStandFiles.get(0).getOriAttId()); - sarBussStandFileEODao.insert(sarBussStandFile); - }else { - logger.info("======================================word.doc转换失败================================="); - } -// AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); -// if(fileInfo!=null){ -// String fileName = ""; -// if(StringUtils.isNotBlank(fileInfo.getFileName())){ -// String[] splitInfo = fileInfo.getFileName().split("\\."); -// fileName = splitInfo[0]; -// } -// -// Map bussMap = new HashMap<>(); -// bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); -// bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); -// bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); -// bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); -// bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); -// bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); -// bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); -// bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); -// logger.info("======================================word.doc发送mq================================="); -// createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); +// AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); +// if(attFileVo!=null){ +// SarBussStandFile sarBussStandFile = new SarBussStandFile(); +// //sarBussStandFile.setId(); +// String uuId = com.adc.da.util.utils.UUID.randomUUID(20); +// sarBussStandFile.setId(uuId); +// sarBussStandFile.setStandId(sarBussStandFiles.get(0).getStandId()); +// sarBussStandFile.setStandFileClassify(sarBussStandFiles.get(0).getStandFileClassify()); +// sarBussStandFile.setAttId(attFileVo.getId()); +// sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); +// sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); +// sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +// sarBussStandFile.setPassword(sarBussStandFiles.get(0).getPassword()); +// sarBussStandFile.setValidFlag(0); +// sarBussStandFile.setCreationTime(new Date()); +// sarBussStandFile.setModifyTime(new Date()); +// sarBussStandFile.setOriAttId(sarBussStandFiles.get(0).getOriAttId()); +// sarBussStandFileEODao.insert(sarBussStandFile); // }else { // logger.info("======================================word.doc转换失败================================="); // } + AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); + if(fileInfo!=null){ + String fileName = ""; + if(StringUtils.isNotBlank(fileInfo.getFileName())){ + String[] splitInfo = fileInfo.getFileName().split("\\."); + fileName = splitInfo[0]; + } + + Map bussMap = new HashMap<>(); + bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); + bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); + bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); + bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); + bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); + bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); + bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); + bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); + logger.info("======================================word.doc发送mq================================="); + createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); + }else { + logger.info("======================================word.doc转换失败================================="); + } } }