diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java index 11fa9972a..712930549 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java @@ -10,7 +10,7 @@ import javax.jws.WebService; * @Description: 供网格化平台调用webservice接口 */ // 命名空间,写一个有意义的http地址就行,并不是网上所说的要写成包名倒序,只不过写成包名倒序易读而已 -@WebService(targetNamespace = "http://service.epdc.esua.elink.com") +@WebService(targetNamespace = "https://service.epdc.esua.elink.com") public interface CityGridInterfaceServiceWebService { /** * @param requestXML diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java index 7385e6856..6b350bd43 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java @@ -12,7 +12,6 @@ import com.elink.esua.epdc.dao.ItemHandleProcessDao; import com.elink.esua.epdc.dto.ItemHandleProcessDTO; import com.elink.esua.epdc.dto.form.ItemPlatformSyncTaskDispatchFormDTO; import com.elink.esua.epdc.dto.form.ItemPlatformSyncTaskEndFormDTO; -import com.elink.esua.epdc.dto.form.TestDTO; import com.elink.esua.epdc.dto.result.DataReturnDTO; import com.elink.esua.epdc.entity.GridPlatformHandleLogEntity; import com.elink.esua.epdc.entity.InterfaceLogEntity; @@ -40,7 +39,7 @@ import java.util.regex.Pattern; * @Date 2019/12/30 16:24 */ @WebService(serviceName = "CityGridInterfaceServiceWebService", - targetNamespace = "http://service.epdc.esua.elink.com", + targetNamespace = "https://service.epdc.esua.elink.com", endpointInterface = "com.elink.esua.epdc.service.CityGridInterfaceServiceWebService") @Component public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterfaceServiceWebService { @@ -60,27 +59,43 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface @Autowired private InterfaceLogDao interfaceLogDao; + private Pattern p = Pattern.compile("\\s*|\t|\r|\n"); + /** - * @param requestXML + * @param str * @return java.lang.String * @Author yinzuomei - * @Description 测试 - * @Date 2019/12/30 12:46 + * @Description 去除字符串中的空格、回车、换行符、制表符 + * @Date 2020/1/3 10:23 **/ - @Override - public String test(String requestXML) { - logger.info("requestXML=" + requestXML); - TestDTO testDTO = JaxbUtil.converyToJavaBean(requestXML, TestDTO.class); - String xmlStr = JaxbUtil.convertToXml(testDTO); - return "调用成功" + xmlStr; + private String replaceBlank(String str) { + String dest = ""; + if (str != null) { + Matcher m = p.matcher(str); + dest = m.replaceAll(""); + } + return dest; } + public static void main(String[] args) { DataReturnDTO dataReturnDTO = new DataReturnDTO(); System.out.println(JaxbUtil.convertToXmlIgnoreStandalone(dataReturnDTO, "utf-8")); } + /** + * @param requestXML + * @return java.lang.String + * @Author yinzuomei + * @Description 测试 + * @Date 2019/12/30 12:46 + **/ + @Override + public String test(String requestXML) { + return "调用成功requestXML=" + requestXML; + } + /** * @param requestXML * @return java.lang.String @@ -121,7 +136,7 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface } finally { // 接口日志表新增一条处理记录 insertInterfaceLog(itemGridPlatformEntity, requestXML, - JaxbUtil.convertToXml(dataReturnDTO), + replaceBlank(JaxbUtil.convertToXmlIgnoreXmlHead(dataReturnDTO, "utf-8")), successFlag, InterfaceLogBusinessTypeEnum.SYNC_TASK_DISPATCH.getValue(), ItemPlatFormConstant.SyncTaskDispatch); @@ -129,17 +144,6 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface } } - private Pattern p = Pattern.compile("\\s*|\t|\r|\n"); - - private String replaceBlank(String str) { - String dest = ""; - if (str != null) { - Matcher m = p.matcher(str); - dest = m.replaceAll(""); - } - return dest; - } - /** * @param taskNum * @return com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity @@ -266,7 +270,7 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface throw new Exception("接口异常" + e.getMessage()); } finally { insertInterfaceLog(itemGridPlatformEntity, requestXML, - JaxbUtil.convertToXml(dataReturnDTO), + replaceBlank(JaxbUtil.convertToXmlIgnoreXmlHead(dataReturnDTO, "utf-8")), successFlag, InterfaceLogBusinessTypeEnum.SYNC_TASK_END.getValue(), ItemPlatFormConstant.SyncTaskEnd);//接口日志表新增一条处理记录