FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_foton_20230613' 到 'master'

Browse Source 
Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-wkflow-rest!53
This commit is contained in:
高嵩
2023-06-19 17:19:05 +08:00
parent 8c25e724e6 719c53c0f3
commit 5960895580
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -220,5 +220,5 @@ public interface LawsUserInfoService {
List<EsRevisePlanDTO> 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);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java
+8 -5
View File
@@ -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) {
src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessModelHis.java
+4
View File
@@ -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;