From 976242dc8cdf574523d316068b2e0c216ac66927 Mon Sep 17 00:00:00 2001 From: lzy Date: Wed, 12 Jan 2022 16:12:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=97=85=E7=90=86=20?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=97=85=E5=8E=86=20=E6=8A=A4=E7=90=86?= =?UTF-8?q?=E6=96=87=E4=B9=A6=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dataConfig/homeQualitySet.json | 28 ++++--- ...中医院住院病理-homeQualitySet.json | 52 ++++++++++++ ...中医院护理文书-homeQualitySet.json | 54 +++++++++++++ .../梅州电子病理-homeQualitySet.json | 52 ++++++++++++ .../com/docus/bgts/config/MyScheduling.java | 80 +++++++++---------- .../docus/bgts/handler/TBasicWebService.java | 16 +++- src/main/resources/application.yml | 10 +-- ...ication-广东省中医院住院病理.yml | 28 +++++++ .../application-广东省护理文书.yml | 28 +++++++ .../config/application-梅州电子病历.yml | 28 +++++++ 10 files changed, 315 insertions(+), 61 deletions(-) create mode 100644 dataConfig/广东省中医院住院病理-homeQualitySet.json create mode 100644 dataConfig/广东省中医院护理文书-homeQualitySet.json create mode 100644 dataConfig/梅州电子病理-homeQualitySet.json create mode 100644 src/main/resources/config/application-广东省中医院住院病理.yml create mode 100644 src/main/resources/config/application-广东省护理文书.yml create mode 100644 src/main/resources/config/application-梅州电子病历.yml diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index 77b3dbc..ca33c05 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -1,26 +1,28 @@ { //----------响应标签------------- //外部结构，多层,隔开 - "ResHead":"Response,Result", + "ResHead":"Response,RetInfo", //响应代码 - "ResCode":"Code", + "ResCode":"RetCode", //响应消息 - "ResMsg":"Msg", + "ResMsg":"RetCon", //唯一键目录结构数组，最高层为前面，最后一层为数据采集层,根节点不填 - "directory":["DOCUMENT"], + "directory":["Msg"], //患者主索引号 - "indexFlag":"VISITING_SERIAL_NUMBER", + "indexFlag":"INHOSP_NO", //采集流水号 - "serialnum":"UNIQUE_ID", + "serialnum":"IDNO", //文件标题 - "filetitle":"DOCUMENT_TITLE", + "filetitle":"FILENAME", //下载地址,&代表多个选其一 - "downurl":"BASE64&ORIGINAL_URL", + "downurl":"PDF_PATH", //分类id - "assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", + "assortid":"", //系统id - "collectorid":"2", + "collectorid":"1", + //获取分类id参数 + "assortidParamKey":"TABLE_TYPE", //采集类型(文件来源 1:采集器；2：扫描生产软件) "filesource":1, //下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹) @@ -28,7 +30,7 @@ //上传接口 "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", //基本数据存放处，根节点不填，最后一层为基本信息存放标签与doubleBasic配合 - "basicDirectory":["DOCUMENT"], + "basicDirectory":["Msg"], //可能存在存储基本数据不同情况的标签 "doubleBasic":["TestItemInfo","BioTestInfo"], @@ -43,9 +45,9 @@ //--------撤销配置部分------------ //采集流水号所在位置,根目录不填 - "repealDirectory":["DOCUMENT"], + "repealDirectory":["Msg"], //采集流水号名 - "repealSerialnum":"UNIQUE_ID", + "repealSerialnum":"IDNO", //撤销接口 "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" diff --git a/dataConfig/广东省中医院住院病理-homeQualitySet.json b/dataConfig/广东省中医院住院病理-homeQualitySet.json new file mode 100644 index 0000000..09bfe8d --- /dev/null +++ b/dataConfig/广东省中医院住院病理-homeQualitySet.json @@ -0,0 +1,52 @@ +{ + //----------响应标签------------- + //外部结构，多层,隔开 + "ResHead":"Response,RetInfo", + //响应代码 + "ResCode":"RetCode", + //响应消息 + "ResMsg":"RetCon", + + //唯一键目录结构数组，最高层为前面，最后一层为数据采集层,根节点不填 + "directory":["Msg"], + //患者主索引号 + "indexFlag":"PatInfo,INHOSP_NO", + //采集流水号 + "serialnum":"PatInfo,UPDATE_REPORT_NO", + //文件标题 + "filetitle":"ReportInfo,EXAM_RESULT", + //下载地址,&代表多个选其一 + "downurl":"ReportInfo,REPORT_URL", + //分类id + "assortid":"63E20FC9AAB74C5FB6446083EBA5607D", + //系统id + "collectorid":"12", + //采集类型(文件来源 1:采集器；2：扫描生产软件) + "filesource":1, + //下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹) + "filestoragetype":1, + //上传接口 + "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + //基本数据存放处，根节点不填，最后一层为基本信息存放标签与doubleBasic配合 + "basicDirectory":["Msg","ReportInfo"], + //可能存在存储基本数据不同情况的标签 + "doubleBasic":["TestItemInfo","BioTestInfo"], + + //--------------采集操作判断撤销/新增--------------- + //是否开启采集操作判断撤销/新增 0：不开启，1：开启 默认不开启 + "isJudge":"1", + //判断标签存在目录，首个标签不填 + "judgeDirectory":["Msg","ReportInfo"], + //判定标签,值0-新增；1-撤回；2-修改 + "judgeIndex":"REPORT_STATUS_FLAG", + + + //--------撤销配置部分------------ + //采集流水号所在位置,根目录不填 + "repealDirectory":["Msg","ReportInfo"], + //采集流水号名 + "repealSerialnum":"REPORT_STATUS_FLAG", + //撤销接口 + "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + +} \ No newline at end of file diff --git a/dataConfig/广东省中医院护理文书-homeQualitySet.json b/dataConfig/广东省中医院护理文书-homeQualitySet.json new file mode 100644 index 0000000..ca33c05 --- /dev/null +++ b/dataConfig/广东省中医院护理文书-homeQualitySet.json @@ -0,0 +1,54 @@ +{ + //----------响应标签------------- + //外部结构，多层,隔开 + "ResHead":"Response,RetInfo", + //响应代码 + "ResCode":"RetCode", + //响应消息 + "ResMsg":"RetCon", + + //唯一键目录结构数组，最高层为前面，最后一层为数据采集层,根节点不填 + "directory":["Msg"], + //患者主索引号 + "indexFlag":"INHOSP_NO", + //采集流水号 + "serialnum":"IDNO", + //文件标题 + "filetitle":"FILENAME", + //下载地址,&代表多个选其一 + "downurl":"PDF_PATH", + //分类id + "assortid":"", + //系统id + "collectorid":"1", + //获取分类id参数 + "assortidParamKey":"TABLE_TYPE", + //采集类型(文件来源 1:采集器；2：扫描生产软件) + "filesource":1, + //下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹) + "filestoragetype":1, + //上传接口 + "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + //基本数据存放处，根节点不填，最后一层为基本信息存放标签与doubleBasic配合 + "basicDirectory":["Msg"], + //可能存在存储基本数据不同情况的标签 + "doubleBasic":["TestItemInfo","BioTestInfo"], + + //--------------采集操作判断撤销/新增--------------- + //是否开启采集操作判断撤销/新增 0：不开启，1：开启 默认不开启 + "isJudge":"0", + //判断标签存在目录，首个标签不填 + "judgeDirectory":[""], + //判定标签,值0-新增；1-撤回；2-修改 + "judgeIndex":"", + + + //--------撤销配置部分------------ + //采集流水号所在位置,根目录不填 + "repealDirectory":["Msg"], + //采集流水号名 + "repealSerialnum":"IDNO", + //撤销接口 + "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + +} \ No newline at end of file diff --git a/dataConfig/梅州电子病理-homeQualitySet.json b/dataConfig/梅州电子病理-homeQualitySet.json new file mode 100644 index 0000000..77b3dbc --- /dev/null +++ b/dataConfig/梅州电子病理-homeQualitySet.json @@ -0,0 +1,52 @@ +{ + //----------响应标签------------- + //外部结构，多层,隔开 + "ResHead":"Response,Result", + //响应代码 + "ResCode":"Code", + //响应消息 + "ResMsg":"Msg", + + //唯一键目录结构数组，最高层为前面，最后一层为数据采集层,根节点不填 + "directory":["DOCUMENT"], + //患者主索引号 + "indexFlag":"VISITING_SERIAL_NUMBER", + //采集流水号 + "serialnum":"UNIQUE_ID", + //文件标题 + "filetitle":"DOCUMENT_TITLE", + //下载地址,&代表多个选其一 + "downurl":"BASE64&ORIGINAL_URL", + //分类id + "assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", + //系统id + "collectorid":"2", + //采集类型(文件来源 1:采集器；2：扫描生产软件) + "filesource":1, + //下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹) + "filestoragetype":1, + //上传接口 + "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + //基本数据存放处，根节点不填，最后一层为基本信息存放标签与doubleBasic配合 + "basicDirectory":["DOCUMENT"], + //可能存在存储基本数据不同情况的标签 + "doubleBasic":["TestItemInfo","BioTestInfo"], + + //--------------采集操作判断撤销/新增--------------- + //是否开启采集操作判断撤销/新增 0：不开启，1：开启 默认不开启 + "isJudge":"0", + //判断标签存在目录，首个标签不填 + "judgeDirectory":[""], + //判定标签,值0-新增；1-撤回；2-修改 + "judgeIndex":"", + + + //--------撤销配置部分------------ + //采集流水号所在位置,根目录不填 + "repealDirectory":["DOCUMENT"], + //采集流水号名 + "repealSerialnum":"UNIQUE_ID", + //撤销接口 + "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + +} \ No newline at end of file diff --git a/src/main/java/com/docus/bgts/config/MyScheduling.java b/src/main/java/com/docus/bgts/config/MyScheduling.java index 1c3debd..bb10218 100644 --- a/src/main/java/com/docus/bgts/config/MyScheduling.java +++ b/src/main/java/com/docus/bgts/config/MyScheduling.java @@ -1,40 +1,40 @@ -//package com.docus.bgts.config; -// -// -//import com.docus.bgts.utils.FileUtils; -//import com.docus.bgts.utils.HttpUtils; -//import org.apache.logging.log4j.LogManager; -//import org.apache.logging.log4j.Logger; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.scheduling.annotation.Scheduled; -//import org.springframework.stereotype.Component; -// -//import java.net.URISyntaxException; -//import java.util.HashMap; -//import java.util.Map; -// -//@Component -//public class MyScheduling { -// -// @Value("${beat.url}") -// private String beatUrl; -// -// private Logger logger = LogManager.getLogger(MyScheduling.class); -// -// //10分钟执行一次 -// @Scheduled(fixedRate = 1000 * 60 * 5) -// public void beat() { -// logger.info("------------心跳开始---------------"); -// Map params = new HashMap<>(); -// params.put("code", String.valueOf(FileUtils.getJsonByName("collectorid"))); -// try { -// HttpUtils.get(beatUrl, params); -// } catch (URISyntaxException e) { -// e.printStackTrace(); -// logger.info("心跳推送出错，可能是住院服务没有开启"); -// } finally { -// logger.info("-------------心跳结束---------------"); -// } -// } -// -//} +package com.docus.bgts.config; + + +import com.docus.bgts.utils.FileUtils; +import com.docus.bgts.utils.HttpUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.Map; + +@Component +public class MyScheduling { + + @Value("${beat.url}") + private String beatUrl; + + private Logger logger = LogManager.getLogger(MyScheduling.class); + + //10分钟执行一次 + @Scheduled(fixedRate = 1000 * 60 * 5) + public void beat() { + logger.info("------------心跳开始---------------"); + Map params = new HashMap<>(); + params.put("code", String.valueOf(FileUtils.getJsonByName("collectorid"))); + try { + HttpUtils.get(beatUrl, params); + } catch (URISyntaxException e) { + e.printStackTrace(); + logger.info("心跳推送出错，可能是住院服务没有开启"); + } finally { + logger.info("-------------心跳结束---------------"); + } + } + +} diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java index de6cd6b..e84d6a7 100644 --- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java +++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java @@ -177,6 +177,7 @@ public class TBasicWebService implements ITBasicWebService { if (String.valueOf(resMap.get("code")).equals("500")) { throw new RuntimeException(String.valueOf(resMap.get("msg"))); } else { + logger.info("----------执行成功-----------"); return ResultUtils.success().asXML(); } } catch (RuntimeException e) { @@ -303,13 +304,22 @@ public class TBasicWebService implements ITBasicWebService { split = arg.split("&"); if (split.length > 1) { for (String spi : split) { - byElement1 = byElement.element(spi); + if (byElement1 == null) { + byElement1 = byElement.element(spi); + } else { + byElement1 = byElement1.element(spi); + } + if (byElement1 != null && StringUtils.isNotBlank(byElement1.getText())) { break; } } } else { - byElement1 = byElement.element(arg); + if (byElement1 == null) { + byElement1 = byElement.element(arg); + } else { + byElement1 = byElement1.element(arg); + } } if (byElement1 != null) { resText = byElement1.getText(); @@ -321,7 +331,7 @@ public class TBasicWebService implements ITBasicWebService { } /** - * 获取系统id + * 获取分类id * * @return */ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b4b5e4d..f6502e9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9701 + port: 9404 # http mybatis-plus: @@ -11,12 +11,12 @@ mybatis-plus: db-config: field-strategy: NOT_EMPTY db-type: MYSQL -#beat: -# url: http://localhost:9399/beat +beat: + url: http://localhost:9399/beat system: - code: "EmrDocAr" - prop: 9801 + code: "Nursing_documents" + prop: 9204 # web service diff --git a/src/main/resources/config/application-广东省中医院住院病理.yml b/src/main/resources/config/application-广东省中医院住院病理.yml new file mode 100644 index 0000000..62ca797 --- /dev/null +++ b/src/main/resources/config/application-广东省中医院住院病理.yml @@ -0,0 +1,28 @@ +server: + port: 9403 +# http + +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + field-strategy: NOT_EMPTY + db-type: MYSQL +beat: + url: http://localhost:9399/beat + +system: + code: "204_P_WS_BLBGTS" + prop: 9203 +# web service + + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + username: docus + password: docus702 + url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true \ No newline at end of file diff --git a/src/main/resources/config/application-广东省护理文书.yml b/src/main/resources/config/application-广东省护理文书.yml new file mode 100644 index 0000000..f6502e9 --- /dev/null +++ b/src/main/resources/config/application-广东省护理文书.yml @@ -0,0 +1,28 @@ +server: + port: 9404 +# http + +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + field-strategy: NOT_EMPTY + db-type: MYSQL +beat: + url: http://localhost:9399/beat + +system: + code: "Nursing_documents" + prop: 9204 +# web service + + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + username: docus + password: docus702 + url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true \ No newline at end of file diff --git a/src/main/resources/config/application-梅州电子病历.yml b/src/main/resources/config/application-梅州电子病历.yml new file mode 100644 index 0000000..8ea2999 --- /dev/null +++ b/src/main/resources/config/application-梅州电子病历.yml @@ -0,0 +1,28 @@ +server: + port: 9701 +# http + +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + field-strategy: NOT_EMPTY + db-type: MYSQL +beat: + url: http://localhost:9399/beat + +system: + code: "EmrDocAr" + prop: 9801 +# web service + + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + username: docus + password: docus702 + url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true \ No newline at end of file