From d9134b77c859923cb77c566c2d5169c4047807b2 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 19 Jun 2023 17:02:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9B=B4=E6=94=B9key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusProcessModelHisController.java | 13 ++++++++----- .../datas/entity/BusProcessModelHis.java | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java index 411c7a6b..b334f857 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java @@ -53,12 +53,13 @@ public class BusProcessModelHisController { @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId,String standName){ + public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId,String standName,String key){ logger.info("**********进入onlyoffice接收文档接口************"); logger.info("**********fileNm************"+fileNm+"======="); logger.info("**********standNo************"+standNo+"======="); logger.info("**********fileId************"+fileId+"======="); logger.info("**********standName************"+standName+"======="); + logger.info("**********key************"+key+"======="); try { PrintWriter writer = response.getWriter(); String body = ""; @@ -98,7 +99,7 @@ public class BusProcessModelHisController { downloadNetFile(downloadUri, file); // 更新在线编辑当前节点编辑状态 busProcessModelHisService.modelHisOneUpdStatusById(fileId); - ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(fileId, standName); + ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(fileId,standName,key); } } catch (Exception ex) { saved = 1; @@ -122,13 +123,15 @@ public class BusProcessModelHisController { @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFileBefore") - public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId ,String standName){ + public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response,String key, String fileNm, String standNo, String pid, String taskId ,String standName){ logger.info("**********进入onlyoffice接收文档接口************"); logger.info("**********fileNm************"+fileNm+"======="); logger.info("**********standNo************"+standNo+"======="); - logger.info("**********fileId************"+pid+"======="); + logger.info("**********pid************"+pid+"======="); logger.info("**********taskId************"+taskId+"======="); logger.info("**********standName************"+standName+"======="); + logger.info("**********key************"+key+"======="); + try { PrintWriter writer = response.getWriter(); String body = ""; @@ -173,7 +176,7 @@ public class BusProcessModelHisController { objectQueryWrapper.eq("TASK_ID",taskId); BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper); if(busProcessModelHis!=null){ - ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName); + ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName,key); } } } catch (Exception ex) { diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessModelHis.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessModelHis.java index c9058a3d..92545b0f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessModelHis.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessModelHis.java @@ -86,6 +86,10 @@ public class BusProcessModelHis implements Serializable { @TableField("FLAG") private String flag; + @ApiModelProperty(value = "文件key") + @TableField("FILE_KEY") + private String filekey; + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") @TableField(exist = false) private String downLoadUrl; From 719c53c0f3864f238e498ccbd053e92225f1a315 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 19 Jun 2023 17:06:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9B=B4=E6=94=B9key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index ba18b130..144924eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -220,5 +220,5 @@ public interface LawsUserInfoService { List getAllPlansByWkInfo(); @GetMapping("lawss/activiti/selectOnlineFile") - ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName); + ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key); }