解决梅州标签问题

dataConfig/homeQualitySet.json

@@ -1,56 +1,58 @@
 {
   //----------响应标签-------------
   //外部结构，多层,隔开
-  "ResHead":"Response,RetInfo",
+  "ResHead":"Response,Result",
   //响应代码
-  "ResCode":"RetCode",
+  "ResCode":"Code",
   //响应消息
-  "ResMsg":"RetCon",
+  "ResMsg":"Msg",
   //成功编码
-  "successCode":"0",
+  "successCode":"1",
   //失败编码
-  "errorCode":"1",
+  "errorCode":"0",
 
   //唯一键目录结构数组，最高层为前面，最后一层为数据采集层,根节点不填
-  "directory":["Msg"],
+  "directory":[],
   //患者主索引号
-  "indexFlag":"PatInfo,INHOSP_NO",
+  "indexFlag":"VISITING_SERIAL_NUMBER",
   //采集流水号
-  "serialnum":"ReportInfo,UPDATE_REPORT_NO",
+  "serialnum":"UNIQUE_ID",
   //文件标题
-  "filetitle":"ExamInfo,EXAM_SUBCLASS",
+  "filetitle":"DOCUMENT_TITLE",
   //下载地址,&代表多个选其一
-  "downurl":"ReportInfo,REPORT_URL",
+  "downurl":"BASE64&ORIGINAL_URL",
   //分类id
-  "assortid":"63E20FC9AAB74C5FB6446083EBA5607D",
+  "assortid":"",
   //系统id
-  "collectorid":"12",
+  "collectorid":"2",
+  //获取分类id参数
+  "assortidParamKey":"DOCUMENT_TOPIC",
   //采集类型(文件来源 1:采集器；2：扫描生产软件)
   "filesource":1,
   //下载类型(1:服务器本地；2：ftp服务器；3：共享文件夹)
   "filestoragetype":1,
   //上传接口
-  "uploadConnector":"http://192.9.100.171:9291/api/downplatform/report",
+  "uploadConnector":"http://127.0.0.1:9291/api/downplatform/report",
   //基本数据存放处，根节点不填，最后一层为基本信息存放标签与doubleBasic配合
-  "basicDirectory":["Msg","ReportInfo"],
+  "basicDirectory":[""],
   //可能存在存储基本数据不同情况的标签
   "doubleBasic":["TestItemInfo","BioTestInfo"],
 
   //--------------采集操作判断撤销/新增---------------
   //是否开启采集操作判断撤销/新增  0：不开启，1：开启 默认不开启
-  "isJudge":"1",
+  "isJudge":"0",
   //判断标签存在目录，首个标签不填
-  "judgeDirectory":["Msg","ReportInfo"],
+  "judgeDirectory":[""],
   //判定标签,值0-新增；1-撤回；2-修改
-  "judgeIndex":"REPORT_STATUS_FLAG",
+  "judgeIndex":"",
 
 
   //--------撤销配置部分------------
   //采集流水号所在位置,根目录不填
-  "repealDirectory":["Msg","ReportInfo"],
+  "repealDirectory":["DOCUMENT"],
   //采集流水号名
-  "repealSerialnum":"REPORT_STATUS_FLAG",
+  "repealSerialnum":"UNIQUE_ID",
   //撤销接口
-  "repoalConnector":"http://192.9.100.171:9291/api/down/cancel"
+  "repoalConnector":"http://127.0.0.1:9291/api/down/cancel"
 
 }

dataConfig/梅州人民医院电子病历-homeQualitySet.json

@@ -12,7 +12,7 @@
   "errorCode":"0",
 
   //唯一键目录结构数组，最高层为前面，最后一层为数据采集层,根节点不填
-  "directory":[""],
+  "directory":[],
   //患者主索引号
   "indexFlag":"VISITING_SERIAL_NUMBER",
   //采集流水号

src/main/java/com/docus/bgts/handler/TBasicWebService.java

@@ -190,6 +190,19 @@ public class TBasicWebService implements ITBasicWebService {
      */
     private String handleDownUrl(String downurl) {
         String url = "";
+        try {
+            XmlUtils xmlUtils = new XmlUtils(new ByteArrayInputStream(downurl.getBytes("UTF-8")));
+            if (null != xmlUtils) {
+                url=downurl;
+                url = downurl.replaceAll("<REST>", "");
+                url = url.replaceAll("</REST>", "");
+                url = url.replaceAll("<SQW>", "");
+                url = url.replaceAll("</SQW>", "");
+            }
+        } catch (Exception e) {
+
+        }
+
         int pdfIndex = -1;
         int httpIndex = downurl.indexOf("http");
         if (httpIndex == -1) {
@@ -261,7 +274,12 @@ public class TBasicWebService implements ITBasicWebService {
      * @return
      */
     private CanlcelDto getCanlCelDtoByXml(String xml) throws UnsupportedEncodingException {
-        XmlUtils xmlUtils = new XmlUtils(new ByteArrayInputStream(xml.getBytes("UTF-8")));
+        XmlUtils xmlUtils = null;
+        try {
+            xmlUtils = new XmlUtils(new ByteArrayInputStream(xml.getBytes("UTF-8")));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         //采集流水号所在位置目录
         List<String> repealDirectory = (List<String>) FileUtils.getJsonByName("repealDirectory");
         Element element = xmlUtils.getElement(repealDirectory);

src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java

@@ -12,12 +12,16 @@ import com.docus.bgts.mapper.AfInterfaceCollectMapper;
 import com.docus.bgts.mapper.AfInterfaceCollectSubMapper;
 import com.docus.bgts.utils.FileUtils;
 import com.docus.bgts.utils.HttpUtils;
+import com.docus.bgts.utils.XmlUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/docus/bgts/utils/XmlUtils.java

@@ -19,6 +19,10 @@ public class XmlUtils {
     private SAXReader saxReader;
     private Document document;
 
+    public Document getDocument() {
+        return document;
+    }
+
     public XmlUtils(String path) {
         //获取解析器
         saxReader = new SAXReader();
@@ -31,16 +35,12 @@ public class XmlUtils {
         }
     }
 
-    public XmlUtils(InputStream path) {
+    public XmlUtils(InputStream path) throws Exception{
         //获取解析器
         saxReader = new SAXReader();
-        try {
             //获取文档对象
             document = saxReader.read(path);
-        } catch (DocumentException e) {
+
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
     }
 
     /**

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9403
+  port: 9701
 #  http
 
 mybatis-plus:
@@ -15,8 +15,8 @@ beat:
   url: http://localhost:9399/beat
 
 system:
-  code: "204_P_WS_BLBGTS"
+  code: "EmrDocAr"
-  prop: 9203
+  prop: 9801
 #  web service