root
/
jianshui-all
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' into kk

Browse Source
beta-prop-all^2
dongxiaoke 2 years ago
parent e1190fa456 b6e0563ae4
commit e5f41bffd9
2 changed files with 83 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 33
      jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java
  2. 12
      jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java

33
jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java
Unescape View File

@ -77,7 +77,34 @@ public class WebserviceResponseHandler implements SOAPHandler<SOAPMessageContext
} }
} }
// public static void addCDataToLeafNodes(Node node) {
// NodeList childNodes = node.getChildNodes();
// for (int i = 0; i < childNodes.getLength(); i++) {
// Node childNode = childNodes.item(i);
// if (childNode.getNodeType() == Node.ELEMENT_NODE) {
// addCDataToLeafNodes(childNode);
// String cdatameg = "<"+childNode.getNodeName()+">"+childNode.getNodeValue()+"</"+childNode.getNodeName()+">";
// CDATASection cdata = childNode.getOwnerDocument().createCDATASection(cdatameg);
// node.removeChild(childNode);
// node.appendChild(cdata);
// }
// else if (childNode.getNodeType() == Node.TEXT_NODE) {
// if (!childNode.getNodeValue().isEmpty()) {
// CDATASection cdata = childNode.getOwnerDocument().createCDATASection(childNode.getNodeValue());
// node.removeChild(childNode);
// node.appendChild(cdata);
// }
// }
// }
// }
// 提到外面的 // 提到外面的
// TODO 未修完成
// public static void addCDataToLeafNodes(Node node){ // public static void addCDataToLeafNodes(Node node){
// NodeList childNodes = node.getChildNodes(); // NodeList childNodes = node.getChildNodes();
// for (int i = 0; i < childNodes.getLength(); i++){ // for (int i = 0; i < childNodes.getLength(); i++){
@ -87,7 +114,11 @@ public class WebserviceResponseHandler implements SOAPHandler<SOAPMessageContext
// addCDataToLeafNodes(childNode); // addCDataToLeafNodes(childNode);
// } // }
// else if (xiaochildNode!=null&&xiaochildNode.getNodeType() == Node.TEXT_NODE) { // else if (xiaochildNode!=null&&xiaochildNode.getNodeType() == Node.TEXT_NODE) {
// String cdatameg = "<"+childNode.getNodeName()+">"+xiaochildNode.getNodeValue()+"</"+childNode.getNodeName()+">"; // String cdatameg = "<"+childNode.getNodeName()+">"+"<![CDATA["+xiaochildNode.getNodeValue()+"]]&gt;"+"</"+childNode.getNodeName()+">";
// CDATASection cdata = childNode.getOwnerDocument().createCDATASection(cdatameg);
// node.replaceChild(cdata,childNode);
// }else {
// String cdatameg = "<"+childNode.getNodeName()+">"+"<![CDATA[]]&gt;"+"</"+childNode.getNodeName()+">";
// CDATASection cdata = childNode.getOwnerDocument().createCDATASection(cdatameg); // CDATASection cdata = childNode.getOwnerDocument().createCDATASection(cdatameg);
// node.replaceChild(cdata,childNode); // node.replaceChild(cdata,childNode);
// } // }

12
jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
Unescape View File

@ -33,6 +33,7 @@ import org.springframework.stereotype.Component;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import javax.jws.WebMethod; import javax.jws.WebMethod;
import javax.jws.WebService; import javax.jws.WebService;
import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding;
@ -695,7 +696,6 @@ public class InvoiceCheckWebServiceImpl {
} }
// getInvoiceVO转成JSONObject // getInvoiceVO转成JSONObject
// JSONObject getInvoiceVOJson = (JSONObject) JSONObject.toJSON(getInvoiceVO); // JSONObject getInvoiceVOJson = (JSONObject) JSONObject.toJSON(getInvoiceVO);
String getInvoiceVOJsonStr = JSON.toJSONString(getInvoiceVO, SerializerFeature.WriteSlashAsSpecial); String getInvoiceVOJsonStr = JSON.toJSONString(getInvoiceVO, SerializerFeature.WriteSlashAsSpecial);
@ -708,18 +708,12 @@ public class InvoiceCheckWebServiceImpl {
// 航信明细行从1开始 // 航信明细行从1开始
getInvoiceSphVO.setId(getInvoiceSphVO.getId() + count); getInvoiceSphVO.setId(getInvoiceSphVO.getId() + count);
// 防止转义 // 防止转义
if (!InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){
String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial); String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial);
getInvoiceSphVOJsonStr = getInvoiceSphVOJsonStr.replace("免税","0.0%").replace("***","0.00"); // getInvoiceSphVOJsonStr = getInvoiceSphVOJsonStr.replace("免税","0.0%").replace("***","0.00");
JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr); JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr);
Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson); Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson);
getInvoiceDoc.appendChild(sphElement); getInvoiceDoc.appendChild(sphElement);
}else {
String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial);
JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr);
Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson);
getInvoiceDoc.appendChild(sphElement);
}
count++; count++;
} }