From 11c092e294221f7b6ba4fed15e71bbfd37765d5c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 05 九月 2025 14:34:11 +0800
Subject: [PATCH] art: WebService接口修改，启动报警问题修改，依赖修改
---
src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java | 2
src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java | 11 ---
/dev/null | 51 -----------------
src/main/java/org/jeecg/modules/wms/dto/MESResponse.java | 23 +++++++
src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java | 14 ----
src/main/java/org/jeecg/JeecgSystemApplication.java | 4 -
pom.xml | 26 +++++---
7 files changed, 43 insertions(+), 88 deletions(-)
diff --git a/pom.xml b/pom.xml
index 060cc41..bc20c9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,16 +227,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web-services</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
<!-- CXF webservice -->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cxf</groupId>-->
+<!-- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>-->
+<!-- <version>${cxf.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
@@ -268,6 +268,10 @@
<exclusion>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>Saxon-HE</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -527,11 +531,11 @@
<version>0.8</version>
</dependency>
<!--xml瑙ｆ瀽鍖咃細濡傛灉椤圭洰涓凡鏈夛紝寮曡捣鍐茬獊锛屽彲娉ㄩ噴-->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>xerces</groupId>-->
+<!-- <artifactId>xercesImpl</artifactId>-->
+<!-- <version>2.12.0</version>-->
+<!-- </dependency>-->
<!--寮曞叆sap渚濊禆-->
<dependency>
diff --git a/src/main/java/org/jeecg/JeecgSystemApplication.java b/src/main/java/org/jeecg/JeecgSystemApplication.java
index 06fff58..bb8b518 100644
--- a/src/main/java/org/jeecg/JeecgSystemApplication.java
+++ b/src/main/java/org/jeecg/JeecgSystemApplication.java
@@ -1,7 +1,6 @@
package org.jeecg;
import lombok.extern.slf4j.Slf4j;
-import org.apache.cxf.spring.boot.autoconfigure.CxfAutoConfiguration;
import org.flowable.spring.boot.eventregistry.EventRegistryServicesAutoConfiguration;
import org.jeecg.common.util.oConvertUtils;
import org.springframework.boot.SpringApplication;
@@ -23,8 +22,7 @@
*/
@Slf4j
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, MongoAutoConfiguration.class,
- ManagementWebSecurityAutoConfiguration.class, EventRegistryServicesAutoConfiguration.class,
- CxfAutoConfiguration.class})
+ ManagementWebSecurityAutoConfiguration.class, EventRegistryServicesAutoConfiguration.class})
public class JeecgSystemApplication extends SpringBootServletInitializer {
@Override
diff --git a/src/main/java/org/jeecg/modules/wms/MESObjectFactory.java b/src/main/java/org/jeecg/modules/wms/MESObjectFactory.java
deleted file mode 100644
index aecbbed..0000000
--- a/src/main/java/org/jeecg/modules/wms/MESObjectFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jeecg.modules.wms;
-
-import org.jeecg.modules.wms.dto.ReceiveWMSScanItemListResponse;
-import org.jeecg.modules.wms.dto.WSResponse;
-import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
-import org.jeecg.modules.wms.request.WMSWebServiceSendItem;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-@XmlRegistry
-public class MESObjectFactory {
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.tempuri
- *
- */
- public MESObjectFactory() {
- }
-
- /**
- * Create an instance of {@link ReceiveWMSScanItemList }
- *
- */
- public ReceiveWMSScanItemList createReceiveWMSScanItemList() {
- return new ReceiveWMSScanItemList();
- }
-
- /**
- * Create an instance of {@link WMSWebServiceSendItem }
- *
- */
- public WMSWebServiceSendItem createWMSWebServiceSendItem() {
- return new WMSWebServiceSendItem();
- }
-
- /**
- * Create an instance of {@link ReceiveWMSScanItemListResponse }
- *
- */
- public ReceiveWMSScanItemListResponse createReceiveWMSScanItemListResponse() {
- return new ReceiveWMSScanItemListResponse();
- }
-
- /**
- * Create an instance of {@link WSResponse }
- *
- */
- public WSResponse createWSResponse() {
- return new WSResponse();
- }
-
-}
diff --git a/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java b/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
new file mode 100644
index 0000000..3a928d6
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/wms/dto/MESResponse.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.wms.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "WSResponse", propOrder = {
+ "errorCode",
+ "errorDesc"
+})
+public class MESResponse {
+ @XmlElement(name = "ErrorCode")
+ protected String errorCode;
+ @XmlElement(name = "ErrorDesc")
+ protected String errorDesc;
+}
diff --git a/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java b/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
index f2da1d4..02877a0 100644
--- a/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
+++ b/src/main/java/org/jeecg/modules/wms/dto/ReceiveWMSScanItemListResponse.java
@@ -14,5 +14,5 @@
@Setter
public class ReceiveWMSScanItemListResponse {
@XmlElement(name = "ReceiveWMSScanItemListResult")
- protected WSResponse receiveWMSScanItemListResult;
+ protected MESResponse receiveWMSScanItemListResult;
}
diff --git a/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java b/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
index 80bbc38..5740e1b 100644
--- a/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
+++ b/src/main/java/org/jeecg/modules/wms/service/MESWebServiceSoap.java
@@ -1,28 +1,18 @@
package org.jeecg.modules.wms.service;
-import org.jeecg.modules.wms.MESObjectFactory;
import org.jeecg.modules.wms.dto.WSResponse;
import org.jeecg.modules.wms.request.ReceiveWMSScanItemList;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
@WebService(name = "MESWebServiceSoap", targetNamespace = "http://xhj008.server.webservice.com/")
-@XmlSeeAlso({MESObjectFactory.class})
public interface MESWebServiceSoap {
/**
* 鎺ユ敹WMS绉诲簱淇℃伅
* @param request
* @return
*/
- @WebMethod(operationName = "ReceiveWMSScanItemList", action = "http://xhj008.server.webservice.com/ReceiveWMSScanItemList")
- @RequestWrapper(localName = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemList")
- @ResponseWrapper(localName = "ReceiveWMSScanItemListResponse", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemListResponse")
- @WebResult(name = "ReceiveWMSScanItemListResult", targetNamespace = "http://xhj008.server.webservice.com/")
- WSResponse receiveWMSScanItemList(@WebParam(name = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/") ReceiveWMSScanItemList request);
+ @WebMethod
+ WSResponse receiveWMSScanItemList(ReceiveWMSScanItemList request);
}
diff --git a/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java b/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java
index 31ce6f0..f0e64fc 100644
--- a/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java
+++ b/src/main/java/org/jeecg/modules/wms/service/impl/MESWebServiceSoapImpl.java
@@ -29,12 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
import java.math.BigDecimal;
@@ -60,12 +55,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- @WebMethod(operationName = "ReceiveWMSScanItemList", action = "http://xhj008.server.webservice.com/ReceiveWMSScanItemList")
- @RequestWrapper(localName = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemList")
- @ResponseWrapper(localName = "ReceiveWMSScanItemListResponse", targetNamespace = "http://xhj008.server.webservice.com/", className = "ReceiveWMSScanItemListResponse")
- @WebResult(name = "ReceiveWMSScanItemListResult", targetNamespace = "http://xhj008.server.webservice.com/")
@ApiLog(apiName = "鎺ユ敹WMS鐨勭Щ搴撲俊鎭�(ReceiveWMSScanItemList(MES)", apiCategory = ApiLogCategoryEnum.WMS)
- public WSResponse receiveWMSScanItemList(@WebParam(name = "ReceiveWMSScanItemList", targetNamespace = "http://xhj008.server.webservice.com/") ReceiveWMSScanItemList request) {
+ public WSResponse receiveWMSScanItemList(ReceiveWMSScanItemList request) {
WSResponse response = new WSResponse();
if (request == null || CollectionUtil.isEmpty(request.getWmsWebServiceSendItemList())) {
response.setErrorCode("N");
--
Gitblit v1.9.3