diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index 77b3dbc..881c745 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -6,6 +6,10 @@ "ResCode":"Code", //响应消息 "ResMsg":"Msg", + //成功编码 + "successCode":"1", + //失败编码 + "errorCode":"0", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 "directory":["DOCUMENT"], @@ -26,7 +30,7 @@ //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) "filestoragetype":1, //上传接口 - "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + "uploadConnector":"http://127.0.0.1:9291/api/downplatform/report", //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 "basicDirectory":["DOCUMENT"], //可能存在存储基本数据不同情况的标签 @@ -47,6 +51,6 @@ //采集流水号名 "repealSerialnum":"UNIQUE_ID", //撤销接口 - "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + "repoalConnector":"http://127.0.0.1:9291/api/down/cancel" } \ No newline at end of file diff --git a/dataConfig/广东省中医院住院检验-homeQualitySet.json b/dataConfig/广东省中医院住院检验-homeQualitySet.json index b93c3c6..82cfa66 100644 --- a/dataConfig/广东省中医院住院检验-homeQualitySet.json +++ b/dataConfig/广东省中医院住院检验-homeQualitySet.json @@ -6,6 +6,10 @@ "ResCode":"RetCode", //响应消息 "ResMsg":"RetCon", + //成功编码 + "successCode":"0", + //失败编码 + "errorCode":"1", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 "directory":["Msg"], diff --git a/dataConfig/广东省中医院住院病理-homeQualitySet.json b/dataConfig/广东省中医院住院病理-homeQualitySet.json index 1682cd4..89f0196 100644 --- a/dataConfig/广东省中医院住院病理-homeQualitySet.json +++ b/dataConfig/广东省中医院住院病理-homeQualitySet.json @@ -6,6 +6,10 @@ "ResCode":"RetCode", //响应消息 "ResMsg":"RetCon", + //成功编码 + "successCode":"0", + //失败编码 + "errorCode":"1", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 "directory":["Msg"], @@ -14,7 +18,7 @@ //采集流水号 "serialnum":"ReportInfo,UPDATE_REPORT_NO", //文件标题 - "filetitle":"ReportInfo,EXAM_RESULT", + "filetitle":"ExamInfo,EXAM_SUBCLASS", //下载地址,&代表多个选其一 "downurl":"ReportInfo,REPORT_URL", //分类id diff --git a/dataConfig/广东省中医院护理文书-homeQualitySet.json b/dataConfig/广东省中医院护理文书-homeQualitySet.json index ca33c05..33844f4 100644 --- a/dataConfig/广东省中医院护理文书-homeQualitySet.json +++ b/dataConfig/广东省中医院护理文书-homeQualitySet.json @@ -6,6 +6,10 @@ "ResCode":"RetCode", //响应消息 "ResMsg":"RetCon", + //成功编码 + "successCode":"0", + //失败编码 + "errorCode":"1", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 "directory":["Msg"], @@ -28,7 +32,7 @@ //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) "filestoragetype":1, //上传接口 - "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + "uploadConnector":"http://192.9.100.171:9291/api/downplatform/report", //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 "basicDirectory":["Msg"], //可能存在存储基本数据不同情况的标签 @@ -49,6 +53,6 @@ //采集流水号名 "repealSerialnum":"IDNO", //撤销接口 - "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + "repoalConnector":"http://192.9.100.171:9291/api/down/cancel" } \ No newline at end of file diff --git a/dataConfig/梅州人民医院电子病历-homeQualitySet.json b/dataConfig/梅州人民医院电子病历-homeQualitySet.json index 77b3dbc..881c745 100644 --- a/dataConfig/梅州人民医院电子病历-homeQualitySet.json +++ b/dataConfig/梅州人民医院电子病历-homeQualitySet.json @@ -6,6 +6,10 @@ "ResCode":"Code", //响应消息 "ResMsg":"Msg", + //成功编码 + "successCode":"1", + //失败编码 + "errorCode":"0", //唯一键目录结构数组,最高层为前面,最后一层为数据采集层,根节点不填 "directory":["DOCUMENT"], @@ -26,7 +30,7 @@ //下载类型(1:服务器本地;2:ftp服务器;3:共享文件夹) "filestoragetype":1, //上传接口 - "uploadConnector":"http://192.168.1.107:9291/api/downplatform/report", + "uploadConnector":"http://127.0.0.1:9291/api/downplatform/report", //基本数据存放处,根节点不填,最后一层为基本信息存放标签与doubleBasic配合 "basicDirectory":["DOCUMENT"], //可能存在存储基本数据不同情况的标签 @@ -47,6 +51,6 @@ //采集流水号名 "repealSerialnum":"UNIQUE_ID", //撤销接口 - "repoalConnector":"http://192.168.1.107:9291/api/down/cancel" + "repoalConnector":"http://127.0.0.1:9291/api/down/cancel" } \ No newline at end of file diff --git a/src/main/java/com/docus/bgts/enums/Codes.java b/src/main/java/com/docus/bgts/enums/Codes.java index cf14867..aa948b1 100644 --- a/src/main/java/com/docus/bgts/enums/Codes.java +++ b/src/main/java/com/docus/bgts/enums/Codes.java @@ -4,10 +4,6 @@ package com.docus.bgts.enums; * 代码库 */ public enum Codes { - //接口成功 - SUCCESS("1", "成功"), - //接口失败 - ERROR("0", "失败"), //静态文件存放位置 JSON_ADDRESS("999","\\dataConfig\\homeQualitySet.json"), //接收二级节点 diff --git a/src/main/java/com/docus/bgts/utils/ResultUtils.java b/src/main/java/com/docus/bgts/utils/ResultUtils.java index eccad40..8c107d7 100644 --- a/src/main/java/com/docus/bgts/utils/ResultUtils.java +++ b/src/main/java/com/docus/bgts/utils/ResultUtils.java @@ -15,8 +15,14 @@ public class ResultUtils { private static ResultUtils resultUtils; + private static String successCode; + + private static String errorCode; + static { resultUtils = new ResultUtils(); + successCode=String.valueOf(FileUtils.getJsonByName("successCode")); + errorCode=String.valueOf(FileUtils.getJsonByName("errorCode")); } /** @@ -69,7 +75,7 @@ public class ResultUtils { * @return */ public static Document success() { - Document document = resultUtils.set(Codes.SUCCESS.getCode(), Codes.SUCCESS.getMessage()); + Document document = resultUtils.set(successCode, "成功"); return document; } @@ -79,7 +85,7 @@ public class ResultUtils { * @return */ public static String fail() { - Document set = resultUtils.set(String.valueOf(Codes.ERROR.getCode()), Codes.ERROR.getMessage()); + Document set = resultUtils.set(errorCode, "失败"); return set.asXML(); } @@ -89,7 +95,7 @@ public class ResultUtils { * @return */ public static String fail(String message) { - Document set = resultUtils.set(String.valueOf(Codes.ERROR.getCode()), StringUtils.isNotBlank(message) ? message : Codes.ERROR.getMessage()); + Document set = resultUtils.set(String.valueOf(errorCode), StringUtils.isNotBlank(message) ? message : "失败"); return set.asXML(); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8ea2999..62ca797 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9701 + port: 9403 # http mybatis-plus: @@ -15,8 +15,8 @@ beat: url: http://localhost:9399/beat system: - code: "EmrDocAr" - prop: 9801 + code: "204_P_WS_BLBGTS" + prop: 9203 # web service