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 cc904399..be418d6d 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 @@ -218,4 +218,7 @@ public interface LawsUserInfoService { void updateEsRevisePlan(@RequestParam("esId")String esId, @RequestParam("date")Date date,@RequestParam("s") String s); @GetMapping("/esRevisePlan/es-revise-plan/getAllPlansByWkInfo") List getAllPlansByWkInfo(); + + @GetMapping("lawss/activiti/selectOnlineFile") + ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId); } 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 750fe325..5da06d95 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 @@ -1,15 +1,13 @@ package com.ydw.bat.wkflow.business_main.datas.controller; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis; import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog; -import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService; +import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessModelHisMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService; -import com.ydw.bat.wkflow.util.Utils; import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,12 +20,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URL; import java.net.URLConnection; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.Scanner; -import java.util.UUID; /** *

@@ -49,10 +43,19 @@ public class BusProcessModelHisController { @Autowired private IBusProcessModelHisService busProcessModelHisService; + @Autowired + private LawsUserInfoService lawsUserInfoService; + + @Autowired + private BusProcessModelHisMapper busProcessModelHisMapper; + @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFile") public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId){ logger.info("**********进入onlyoffice接收文档接口************"); + logger.info("**********fileNm************"+fileNm+"======="); + logger.info("**********standNo************"+standNo+"======="); + logger.info("**********fileId************"+fileId+"======="); try { PrintWriter writer = response.getWriter(); String body = ""; @@ -92,6 +95,7 @@ public class BusProcessModelHisController { downloadNetFile(downloadUri, file); // 更新在线编辑当前节点编辑状态 busProcessModelHisService.modelHisOneUpdStatusById(fileId); + lawsUserInfoService.selectOnlineFile(fileId); } } catch (Exception ex) { saved = 1; @@ -117,6 +121,10 @@ public class BusProcessModelHisController { @PostMapping("/recieveFileBefore") public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId){ logger.info("**********进入onlyoffice接收文档接口************"); + logger.info("**********fileNm************"+fileNm+"======="); + logger.info("**********standNo************"+standNo+"======="); + logger.info("**********fileId************"+pid+"======="); + logger.info("**********fileId************"+taskId+"======="); try { PrintWriter writer = response.getWriter(); String body = ""; @@ -156,6 +164,13 @@ public class BusProcessModelHisController { downloadNetFile(downloadUri, file); // 更新在线编辑当前节点编辑状态 busProcessModelHisService.modelHisOneUpdStatus(pid,taskId); + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("P_ID",pid); + objectQueryWrapper.eq("TASK_ID",taskId); + BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper); + if(busProcessModelHis!=null){ + lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId()); + } } } catch (Exception ex) { saved = 1; diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java index e040d1ba..c847d6e0 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java @@ -3,14 +3,10 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis; import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog; -import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessEvaluationHisMapper; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessModelHisMapper; -import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService; -import com.ydw.bat.wkflow.listener.bussLibrary.Utils.PoiUtil; import com.ydw.bat.wkflow.listener.bussLibrary.Utils.PoiWord; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -154,7 +150,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl