diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ee799552..7af58f07 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -500,4 +500,6 @@ public interface workFlowFeignClient { ResponseMessage updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags); @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/getSarBussionStandPageNo",method = RequestMethod.POST) List getSarBussionStandPageNo(@RequestBody List rows); + @RequestMapping(value = "/bat-wkflow/busProcessModel/recieveFile",method = RequestMethod.POST) + void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index dda61982..c3ec0156 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -465,4 +465,8 @@ public class workFlowFeignClientImpl { public List getSarBussionStandPageNo(@RequestBody List rows) { return workFlowFeignClient.getSarBussionStandPageNo(rows); } + + public void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId) { + workFlowFeignClient.recieveFile(fileNm,standNo,fileId); + } } 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 a8cbc3dc..6b89630a 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 @@ -1320,4 +1320,10 @@ public class WorkFlowController extends BaseController { return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|onlyOffice接收文件") + @PostMapping("/recieveFile") + public void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId){ + workFlowFeignClient.recieveFile(fileNm,standNo,fileId); + } + } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 56afb1a5..529cc085 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -207,16 +207,16 @@ public class ActSarItemsEOService { sarStandardsInfoDao.updateById(sarStandardsInfo); logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "qke0ckro2p"; sarStandardsInfo.setTextStatus(textStatus); sarStandardsInfoDao.updateById(sarStandardsInfo); logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); } } @@ -228,16 +228,16 @@ public class ActSarItemsEOService { sarStandardsInfoDao.updateById(sarStandardsInfo1); logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "qke0ckro2p"; sarStandardsInfo1.setTextStatus(textStatus); sarStandardsInfoDao.updateById(sarStandardsInfo1); logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); } } } 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 f218e08e..1d6ba4c7 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 @@ -177,8 +177,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //// //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); - - + //在线编辑 + addInterceptor.excludePathPatterns("/api/lawss/activiti/recieveFile"); // // 添加自定义拦截器，并拦截对应 url diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 832fd761..26a9a230 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -425,16 +425,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl