diff --git a/dataConfig/RequestDetailsParams.xml b/dataConfig/RequestDetailsParams.xml new file mode 100644 index 0000000..d0b7495 --- /dev/null +++ b/dataConfig/RequestDetailsParams.xml @@ -0,0 +1,38 @@ + + + 1 + WZHBAGL + WZHBAGL_1127 + BS07002 + BS07002S51001 + GZ + + + BS07002 + BS07002S51001 + S51 + S00 + 2021-12-23 09:34:31 + + + 0 + 500 + + + + + + + + + + + + + + + + + + + diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index 362224a..b390bad 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -12,7 +12,7 @@ //分类id "assortid":"15E7FE7803F545CB81390BC88E725240", //系统id - "collectorid":"5", + "collectorid":"14", //采集类型(文件来源 1:采集器；2：扫描生产软件) "filesource":1, //下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹) @@ -40,7 +40,7 @@ //采集日期 "startCollectTime":"2016-04-11", //是否开启全量采集 1:是 0 :否 - "isStartCollect":"1", + "isStartCollect":"0", //oracle命名空间 "namespace":"DOCUS", //oracle表名 diff --git a/src/main/java/com/docus/bgts/controller/BgtsController.java b/src/main/java/com/docus/bgts/controller/BgtsController.java index c7aaf04..dad5b6f 100644 --- a/src/main/java/com/docus/bgts/controller/BgtsController.java +++ b/src/main/java/com/docus/bgts/controller/BgtsController.java @@ -35,6 +35,13 @@ public class BgtsController { @Autowired IAfCollectTaskService afCollectTaskService; + @GetMapping("/test") + public String test(@RequestParam("empId") String empId, + @RequestParam("collectSubId") String collectSubId){ + + return bgtsService.test(collectSubId)+"---"+empId; + } + @ApiOperation("采集接口") @ApiImplicitParams({ @@ -42,10 +49,12 @@ public class BgtsController { @ApiImplicitParam(name = "collectSubId",value = "af_interface_collect_sub表id",required = true) }) @GetMapping("/collect") - public CommonResult collect(@RequestParam("empId") String empId, @Param("collectSubId") String collectSubId) { + public CommonResult collect(@RequestParam("collectSubId") String collectSubId, + @RequestParam("empId") String empId) { try { logger.info("采集接口接收到参数：\nempId--"+empId+"\ncollectSubId--"+collectSubId); bgtsService.collect(empId); + logger.info("采集完成"); afCollectTaskService.updateInterfaceCollect(collectSubId, 1); logger.info("------------采集结束-----------"); } catch (RuntimeException e) { @@ -53,6 +62,7 @@ public class BgtsController { try { afCollectTaskService.updateInterfaceCollect(collectSubId, 0); }catch (Exception e1) { + logger.info(e1.getMessage()); return CommonResult.failed(e1.getMessage()); } return CommonResult.failed(e.getMessage()); diff --git a/src/main/java/com/docus/bgts/entity/AfInterfaceCollectSub.java b/src/main/java/com/docus/bgts/entity/AfInterfaceCollectSub.java index 00925c6..2960de9 100644 --- a/src/main/java/com/docus/bgts/entity/AfInterfaceCollectSub.java +++ b/src/main/java/com/docus/bgts/entity/AfInterfaceCollectSub.java @@ -1,5 +1,7 @@ package com.docus.bgts.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +11,7 @@ import java.io.Serializable; @Data @ApiModel("文件库中的省中医病案采集-子任务表") public class AfInterfaceCollectSub implements Serializable { + @TableId(value = "id",type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty(value = "af_interface_collect表id") private Long afInterfaceCollectId; diff --git a/src/main/java/com/docus/bgts/enums/Codes.java b/src/main/java/com/docus/bgts/enums/Codes.java index 4e7bcb7..72f2aca 100644 --- a/src/main/java/com/docus/bgts/enums/Codes.java +++ b/src/main/java/com/docus/bgts/enums/Codes.java @@ -30,6 +30,8 @@ public enum Codes { ZZCODE ("15","重症代码"), //xml地址 REQUEST_XML("0","\\dataConfig\\RequestParams.xml"), + //xml地址 + REQUEST_details_XML("0","\\dataConfig\\RequestDetailsParams.xml"), //患者主索引号 EMP_ID("0","indexFlag"), //错误日志编号 diff --git a/src/main/java/com/docus/bgts/facade/IBgtsService.java b/src/main/java/com/docus/bgts/facade/IBgtsService.java index f8db8e2..f8badc0 100644 --- a/src/main/java/com/docus/bgts/facade/IBgtsService.java +++ b/src/main/java/com/docus/bgts/facade/IBgtsService.java @@ -22,4 +22,6 @@ public interface IBgtsService { * 定时采集 */ void timerCollect(); + + String test(String collectSubId); } diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java index b60547f..447bb87 100644 --- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java +++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java @@ -73,7 +73,10 @@ public class AfCollectTaskServiceImpl extends ServiceImpl dis = (List) FileUtils.getJsonByName("bgtsDetailRespon"); //数据所在节点 Element element = xmlUtils.getElement(dis); @@ -304,6 +320,11 @@ public class BgtsServiceImpl implements IBgtsService { logger.info("-----------------------------"); //解析XML XmlUtils xmlUtils = new XmlUtils(new ByteArrayInputStream(resXml.getBytes("UTF-8"))); + String success = xmlUtils.isSuccess(); + if(!success.equals("ok")){ + logger.info("发送错误："+success); + throw new RuntimeException(success); + } List dis = (List) FileUtils.getJsonByName("bgtsRespon"); //数据所在节点 Element element = xmlUtils.getElement(dis); diff --git a/src/main/java/com/docus/bgts/utils/FileUtils.java b/src/main/java/com/docus/bgts/utils/FileUtils.java index c04f5a3..a345b50 100644 --- a/src/main/java/com/docus/bgts/utils/FileUtils.java +++ b/src/main/java/com/docus/bgts/utils/FileUtils.java @@ -34,6 +34,16 @@ public class FileUtils { String path = FileUtils.currentPath(); return path + Codes.REQUEST_XML.getMessage(); } + /** + * 获取xml文件的地址 + * + * @return + */ + public static String getXmlDetailsPath() { + //获取目录结构 + String path = FileUtils.currentPath(); + return path + Codes.REQUEST_details_XML.getMessage(); + } /** * 获取静态文件中的内容 diff --git a/src/main/java/com/docus/bgts/utils/XmlUtils.java b/src/main/java/com/docus/bgts/utils/XmlUtils.java index 52080ec..35ca694 100644 --- a/src/main/java/com/docus/bgts/utils/XmlUtils.java +++ b/src/main/java/com/docus/bgts/utils/XmlUtils.java @@ -47,6 +47,23 @@ public class XmlUtils { } } + /** + * 是否成功 成功返回OK 错误返回错误信息 + * @return + */ + public String isSuccess(){ + //获取根节点 + Element root = document.getRootElement(); + Element retInfo = root.element("RetInfo"); + Element retCode = retInfo.element("RetCode"); + String code = retCode.getText(); + if(code.equals("0")){ + return "ok"; + }else { + return retInfo.element("RetCon").getText(); + } + } + /** * 动态获取节点内容 * @return diff --git a/src/main/java/com/docus/bgts/web/MyFilter.java b/src/main/java/com/docus/bgts/web/MyFilter.java index 285a166..0c4d276 100644 --- a/src/main/java/com/docus/bgts/web/MyFilter.java +++ b/src/main/java/com/docus/bgts/web/MyFilter.java @@ -25,6 +25,7 @@ public class MyFilter implements Filter { }else if(collectorid.equals(Codes.ZZCODE.getCode())){ logger.info("-----当前请求已被拦截...------"); }else { + logger.info("----已放行----"); filterChain.doFilter(servletRequest,servletResponse); } }