From e0f4eb3d0fd176ec27cbfbb8a8aef27806d247b7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 17:42:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=80=BB=E6=95=B0=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 6d089807..7c8e4c57 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -901,9 +901,6 @@ and stand_name like concat(concat('%',#{standName}),'%') - or STAND_NUMBER like concat(concat('%',#{standName}),'%') - or STAND_YEAR like concat(concat('%',#{standName}),'%') - or STAND_SORT like concat(concat('%',#{standName}),'%') and stand_en_name like concat(concat('%',#{standEnName}),'%') From 71354b944f2c543ecf2bd9926ba1407685dac251 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 17:43:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 2 +- .../fileMaterialCenter/entity/FileMaterialPage.java | 2 ++ .../service/impl/FileMaterialServiceImpl.java | 12 +++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index 555d4d4d..8fa350fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -78,7 +78,7 @@ public class FileMaterialController extends BaseController { @PutMapping @ApiOperation("修改文件资料组") - public ResponseMessage updateFileMaterial(FileMaterial fileMaterial){ + public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){ boolean b = iFileMaterialService.updateById(fileMaterial); return Result.success(b); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java index f99ac329..78a7b927 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java @@ -8,6 +8,8 @@ import lombok.Data; @Data public class FileMaterialPage { + private String id; + private String dataTitle; private String dataType; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index 5692f135..b333c70c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -52,7 +52,17 @@ public class FileMaterialServiceImpl extends ServiceImpl(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); + if (queryPage.getId()!=null && !"".equals(queryPage.getId()) ){ + queryWrapper.eq("id",queryPage.getId()); + } + IPage page=null; + if (queryPage.getPage()==null || queryPage .getPageSize()==null){ + page=new Page<>(1,1); + }else { + page=new Page<>(queryPage.getPage(),queryPage.getPageSize()); + } + + return this.page(page,queryWrapper); } @Override From 90d6c0d4cf6d1670bd1b1b096b9bfc1444050cfb Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 16 Dec 2021 18:13:17 +0800 Subject: [PATCH 3/4] feat: There is no way the, --- .../da/FeignClient/workFlowFeignClient.java | 6 + .../workFlowFeignClientImpl.java | 10 ++ .../controller/WorkFlowController.java | 105 +++++++++++++++++- .../workFlow/entity/BusProcessModelHis.java | 4 + .../adc/da/login/security/WebMvcConfig.java | 6 +- .../att/controller/AttFileEOController.java | 79 ------------- 6 files changed, 127 insertions(+), 83 deletions(-) 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 ff0bb4f8..1e72e2b1 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 @@ -19,6 +19,12 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneUpdStatus",method = RequestMethod.GET) + BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneCount",method = RequestMethod.GET) + BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid); + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); 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 d158c2f0..535c9231 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 @@ -27,6 +27,16 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + return stringWrapper; + } + + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneCount(pid); + return stringWrapper; + } + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId); return stringWrapper; 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 5949b1ce..0b8727a7 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 @@ -25,14 +25,17 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; +import java.net.URL; +import java.net.URLConnection; import java.util.*; import java.util.stream.Collectors; @@ -41,12 +44,108 @@ import java.util.stream.Collectors; @Api(tags = "福田标准法规-工作流管理") public class WorkFlowController { + private static final Logger logger = LoggerFactory.getLogger(WorkFlowController.class); + @Autowired private workFlowFeignClientImpl workFlowFeignClient; + @Value("${stand.edit.file.path}") + private String standEditFilePath; + // @Autowired // private ExportExcelMapper exportExcelMapper; + + @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") + @GetMapping("/processModelHisOneCount") + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ + return workFlowFeignClient.processModelHisOneCount(pid); + } + + @ApiOperation(value = "|onlyOffice接收文件") + @PostMapping("/recieveFile") + public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm,String standNo,String pid,String taskId){ + logger.info("**********进入onlyoffice接收文档接口************"); + try { + PrintWriter writer = response.getWriter(); + String body = ""; + try { + Scanner scanner = new Scanner(request.getInputStream()); + scanner.useDelimiter("\\A"); + body = scanner.hasNext() ? scanner.next() : ""; + scanner.close(); + } catch (Exception ex) { + writer.write("get request.getInputStream error:" + ex.getMessage()); + return; + } + + if (body.isEmpty()) { + writer.write("empty request.getInputStream"); + return; + } + + net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body); + logger.info("**********onlyoffice接收文档接口获得结果body************" + body); + int status = (Integer) jsonObj.get("status"); + + int saved = 0; + if (status == 2 || status == 3)//MustSave, Corrupted + { + String downloadUri = (String) jsonObj.get("url"); + + try { + logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); + if (StringUtils.isNotEmpty(downloadUri)) { + File file = new File(standEditFilePath + standNo + "\\" + fileNm); + downloadNetFile(downloadUri, file); + } + + } catch (Exception ex) { + saved = 1; + logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage()); + logger.error(ex.getMessage(),ex); + } + } else if (status == 4) { + logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************"); + + logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************"); + } + logger.info("onlyoffice编辑完成--------------"); + writer.write("{\"error\":" + saved + "}"); + + // 更新在线编辑当前节点编辑状态 + workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + } catch (IOException e) { + logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); + logger.error(e.getMessage(),e); + return; + } + } + + public void downloadNetFile(String downloadUrl, File file) { + try { + FileOutputStream fileOutputStream = new FileOutputStream(file); + URL url = new URL(downloadUrl); + URLConnection connection = url.openConnection(); + InputStream inputStream = connection.getInputStream(); + int length = 0; + byte[] bytes = new byte[1024]; + while ((length = inputStream.read(bytes)) != -1) { + fileOutputStream.write(bytes, 0, length); + } + fileOutputStream.close(); + inputStream.close(); + } catch (IOException e) { + logger.error("download error ! url :{}, exception:{}", downloadUrl, e); + } + } + + @ApiOperation(value = "更新在线编辑流程当前节点编辑状态") + @GetMapping("/processModelHisOneUpd") + public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + } + @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") @GetMapping("/processModelHisOne") public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java index 82b0692a..3435eca4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -78,6 +78,10 @@ public class BusProcessModelHis implements Serializable { @TableField("EDIT_FILE_PATH") private String editFilePath; + @ApiModelProperty(value = "onlyOffice 编辑类型 node 节点编辑 count 汇总编辑") + @TableField("EDIT_TYPE") + private String editType; + @ApiModelProperty(value = "逻辑状态") @TableField("FLAG") private String flag; 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 492c5ea8..021570b0 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 @@ -64,7 +64,11 @@ public class WebMvcConfig implements WebMvcConfigurer { //文件预览 addInterceptor.excludePathPatterns("/api/att/attFile/getFileInfo"); // onlyOffice 回调 - addInterceptor.excludePathPatterns("/api/att/attFile/recieveFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/recieveFile"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOne"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOneCount"); addInterceptor.excludePathPatterns("/api/att/attFile/getSyncPdfFileInfo"); //附件下载 diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 475d5f7d..3b486bbb 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -59,9 +59,6 @@ public class AttFileEOController { @Value("${file.path}") private String filePath;//文件存储路径 - @Value("${stand.edit.file.path}") - private String standEditFilePath; - // @Autowired // private RoleEOService roleEOService; // @@ -79,82 +76,6 @@ public class AttFileEOController { return Result.success(attFileEO); } - @ApiOperation(value = "|onlyOffice接收文件") - @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm,String standNo){ - logger.info("**********进入onlyoffice接收文档接口************"); - try { - PrintWriter writer = response.getWriter(); - String body = ""; - try { - Scanner scanner = new Scanner(request.getInputStream()); - scanner.useDelimiter("\\A"); - body = scanner.hasNext() ? scanner.next() : ""; - scanner.close(); - } catch (Exception ex) { - writer.write("get request.getInputStream error:" + ex.getMessage()); - return; - } - - if (body.isEmpty()) { - writer.write("empty request.getInputStream"); - return; - } - - net.sf.json.JSONObject jsonObj = net.sf.json.JSONObject.fromObject(body); - logger.info("**********onlyoffice接收文档接口获得结果body************" + body); - int status = (Integer) jsonObj.get("status"); - - int saved = 0; - if (status == 2 || status == 3)//MustSave, Corrupted - { - String downloadUri = (String) jsonObj.get("url"); - - try { - logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); - if (StringUtils.isNotEmpty(downloadUri)) { - File file = new File(standEditFilePath + standNo + "\\" + fileNm); - downloadNetFile(downloadUri, file); - } - - } catch (Exception ex) { - saved = 1; - logger.info("**********onlyoffice接收文档接口异常************" + ex.getMessage()); - logger.error(ex.getMessage(),ex); - } - } else if (status == 4) { - logger.info("**********onlyoffice接收文档接口开始修改文件状态状态4************"); - - logger.info("**********onlyoffice接收文档接口修改文件状态成功状态4************"); - } - logger.info("onlyoffice编辑完成--------------"); - writer.write("{\"error\":" + saved + "}"); - } catch (IOException e) { - logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); - logger.error(e.getMessage(),e); - return; - } - } - - public void downloadNetFile(String downloadUrl, File file) { - try { - FileOutputStream fileOutputStream = new FileOutputStream(file); - URL url = new URL(downloadUrl); - URLConnection connection = url.openConnection(); - InputStream inputStream = connection.getInputStream(); - int length = 0; - byte[] bytes = new byte[1024]; - while ((length = inputStream.read(bytes)) != -1) { - fileOutputStream.write(bytes, 0, length); - } - fileOutputStream.close(); - inputStream.close(); - } catch (IOException e) { - logger.error("download error ! url :{}, exception:{}", downloadUrl, e); - } - } - - @ApiOperation(value="|File|上传文件") @PostMapping(value="/upload",consumes="multipart/*",headers="content-type=multipart/form-data" ) @CrossOrigin(origins = "*", maxAge = 3600) From 3bf802fd75d29eed844a8dfc81e6d010567fe716 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 16 Dec 2021 20:47:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandardsInfo/controller/SarStandardsInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 17b851a6..0182065a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -303,7 +303,7 @@ public class SarStandardsInfoController extends BaseController if (result > 0) { return Result.success("0", "删除成功", result); }else if(result == -1) { - return Result.success("-1","所选的标准下挂有标准，无法删除"); + return Result.success("-1","所选的标准下挂有清单，无法删除"); } else { return Result.error("删除失败");