diff --git a/dataConfig/homeQualitySet.json b/dataConfig/homeQualitySet.json index 1879013..0d741a8 100644 --- a/dataConfig/homeQualitySet.json +++ b/dataConfig/homeQualitySet.json @@ -8,7 +8,7 @@ //文件标题 "filetitle":"DOCUMENT_TITLE", //下载地址 - "downurl":"BASE64&REPORT_URL", + "downurl":"BASE64&ORIGINAL_URL", //分类id "assortid":"OW1PA2SR2Z5XX2JR10KR29SK2OW101", //系统id @@ -24,7 +24,7 @@ //可能存在存储基本数据不同情况的标签 "doubleBasic":["TestItemInfo","BioTestInfo"], - //--------撤销配置部分------------- + //--------撤销配置部分------------ //采集流水号所在位置,根目录不填 "repealDirectory":["DOCUMENT"], //采集流水号名 @@ -32,5 +32,4 @@ //撤销接口 "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/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java index 739b565..9e483f7 100644 --- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java +++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import javax.jws.WebService; import java.io.ByteArrayInputStream; import java.io.StringReader; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -178,6 +179,7 @@ public class TBasicWebService implements ITBasicWebService { } catch (RuntimeException e) { logger.info("发送错误:" + e.getMessage()); mrReportErrorService.insert(xml); + e.printStackTrace(); return ResultUtils.fail(e.getMessage()); } catch (Exception e) { logger.info("发送错误:" + e.getMessage()); @@ -194,8 +196,8 @@ public class TBasicWebService implements ITBasicWebService { * @param xml * @return */ - private CanlcelDto getCanlCelDtoByXml(String xml) { - XmlUtils xmlUtils = new XmlUtils(xml); + private CanlcelDto getCanlCelDtoByXml(String xml) throws UnsupportedEncodingException { + XmlUtils xmlUtils = new XmlUtils(new ByteArrayInputStream(xml.getBytes("UTF-8"))); //采集流水号所在位置目录 List repealDirectory = (List) FileUtils.getJsonByName("repealDirectory"); Element element = xmlUtils.getElement(repealDirectory); @@ -223,21 +225,22 @@ public class TBasicWebService implements ITBasicWebService { private String getElementText(Element element, String[] args) { String resText = ""; Element byElement = (Element) element.clone(); + Element byElement1 = null; String[] split; for (String arg : args) { split = arg.split("&"); if (split.length > 1) { for (String spi : split) { - byElement = byElement.element(spi); - if (byElement != null) { + byElement1 = byElement.element(spi); + if (byElement1 != null) { break; } } } else { - byElement = byElement.element(arg); + byElement1 = byElement.element(arg); } - if (byElement != null) { - resText = byElement.getText(); + if (byElement1 != null) { + resText = byElement1.getText(); } else { break; } diff --git a/src/main/java/com/docus/bgts/utils/XmlUtils.java b/src/main/java/com/docus/bgts/utils/XmlUtils.java index 8cef006..868ef6e 100644 --- a/src/main/java/com/docus/bgts/utils/XmlUtils.java +++ b/src/main/java/com/docus/bgts/utils/XmlUtils.java @@ -116,9 +116,10 @@ public class XmlUtils { /** * 返回数据存在的父节点 + * * @return - */ - public Element getMsgElement(){ + */ + public Element getMsgElement() { //获取目录结构 String path = FileUtils.currentPath(); //解析json映射文件