diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 6b07ccdf..ac49000e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -47,7 +47,6 @@ import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.entity.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -1149,31 +1148,6 @@ public class WorkFlowController extends BaseController { return Result.success(); } - @ApiOperation(value = "根据在线文件Id查询所有onlyoffice历史文件") - @GetMapping("/getAllOnlyOfficeHisFileById") - public ResponseMessage>> getAllOnlyOfficeHisFileById(String fileId, String fileName) { - List> fileList = new ArrayList<>(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(OnlineFileLog::getHisId,fileId); - wrapper.eq(OnlineFileLog::getValidFlag, "0"); - wrapper.orderByDesc(OnlineFileLog::getCreateTime); - List onlineFileLogList = onlineFileLogDao.selectList(wrapper); - if (onlineFileLogList.size() > 0) { - for (OnlineFileLog onlineFileLog : onlineFileLogList) { - Map map = new HashMap<>(); - map.put("id", onlineFileLog.getId()); - map.put("fileName", fileName); - map.put("attFileId", onlineFileLog.getAttFileId()); - map.put("createTime", sdf.format(onlineFileLog.getCreateTime())); - map.put("fileKey", onlineFileLog.getFilekey()); - fileList.add(map); - } - return Result.success(fileList); - } - return Result.error("历史文件为空"); - } - @ApiOperation(value = "查询问题和回答") @GetMapping("/selectWenDan") public Map selectWenDan(@RequestParam("taskId") String taskId) { @@ -1484,8 +1458,7 @@ public class WorkFlowController extends BaseController { String s = ""; if (StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)) { return Result.error("参数为空"); - } - else { + } else { prcName = sort + "-" + prcName + "-计划立项"; } JSONObject jsonObject = JSON.parseObject(json); @@ -1516,31 +1489,26 @@ public class WorkFlowController extends BaseController { } } }else { - if ("4".equals(jsonObject.getString("type")) || "3".equals(jsonObject.getString("type"))) { - s = workFlowFeignClient.endPrcName(prcName, esId); - if (StringUtils.isBlank(s)) { - return Result.error(); - } - String[] split = s.split("-"); - List asList = Arrays.asList(split); - if(split[0].equals("成功")){ - if(asList.size()>1){ - EndPrcName endPrcName = new EndPrcName(); - Map objectObjectMap = new HashMap<>(); - objectObjectMap.put("ids",split[1]); - objectObjectMap.put("prcCreateUser","xxx"); - String s1 = JSONObject.toJSONString(objectObjectMap); - endPrcName.setIds(s1); - endPrcName.setIsNot("1"); - return Result.success(endPrcName); - } + s = workFlowFeignClient.endPrcName(prcName, esId); + String[] split = s.split("-"); + List asList = Arrays.asList(split); + if(split[0].equals("成功")){ + if(asList.size()>1){ EndPrcName endPrcName = new EndPrcName(); - endPrcName.setIsNot("2"); - endPrcName.setIds("xxx"); + Map objectObjectMap = new HashMap<>(); + objectObjectMap.put("ids",split[1]); + objectObjectMap.put("prcCreateUser","xxx"); + String s1 = JSONObject.toJSONString(objectObjectMap); + endPrcName.setIds(s1); + endPrcName.setIsNot("1"); return Result.success(endPrcName); - }else { - return Result.error(); } + EndPrcName endPrcName = new EndPrcName(); + endPrcName.setIsNot("2"); + endPrcName.setIds("xxx"); + return Result.success(endPrcName); + }else { + return Result.error(); } } return Result.success(); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 95249a3c..a16dbe18 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -154,7 +154,6 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/OtConvert/convertFileToFileId"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew"); - addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNewOnlyOffice"); addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew"); addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew"); addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile"); @@ -200,9 +199,6 @@ public class WebMvcConfig implements WebMvcConfigurer { // 政策资料导出接口 addInterceptor.excludePathPatterns("/api/lawss/sarLawsInformation/exportLawsInformationInfo"); - // 获取onlyOffice历史文件接口 - addInterceptor.excludePathPatterns("/api/lawss/activiti/getAllOnlyOfficeHisFileById"); - // 内外部会议模板下载 addInterceptor.excludePathPatterns("/api/lawss/insideOutsideMeeting/exportTemplateFile"); @@ -215,7 +211,7 @@ public class WebMvcConfig implements WebMvcConfigurer { // 标准体系列表导出 addInterceptor.excludePathPatterns("/api/lawss/sarMenuStandardLimit/standardSystemListExport"); - // 添加自定义拦截器，并拦截对应 url +// // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } } 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 250c4a57..38650130 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 @@ -53,7 +53,6 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; @@ -348,9 +347,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl bussMap = new HashMap<>(); - bussMap.put("ONLINEID",fileId); - String id = createOnlineAttIdFileMQUtil.CreateOnlineAttIdFileMQ(bussMap); - if(StringUtils.isNotBlank(id)) { - fileId = id; - } - } - } - - AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); - InputStream is = null; - OutputStream os = null; - response.reset(); - try { - String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); - response.setCharacterEncoding(StandardCharsets.UTF_8.name()); - response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); - response.setContentType("application/octet-stream"); - File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); - is = new FileInputStream(file); - os = response.getOutputStream(); - IOUtils.copy(is, os); - os.flush(); - } catch (IOException e) { - logger.error(e.getMessage(), e); - } finally { - IOUtils.closeQuietly(is); - IOUtils.closeQuietly(os); - } - } - @ApiOperation(value = "|File|下载文件加水印") @GetMapping("/downloadFileForSarWaterMark") // @RequiresPermissions("sys:file:downloadFileForSar")