Pārlūkot izejas kodu

新增倒仓功能点

larry 5 gadi atpakaļ
vecāks
revīzija
cbf9642ca6

+ 15 - 2
pom.xml

@@ -49,7 +49,10 @@
49
 			<groupId>org.springframework.cloud</groupId>
49
 			<groupId>org.springframework.cloud</groupId>
50
 			<artifactId>spring-cloud-starter-config</artifactId>
50
 			<artifactId>spring-cloud-starter-config</artifactId>
51
 		</dependency>
51
 		</dependency>
52
-
52
+		<dependency>
53
+        	<groupId>org.springframework.cloud</groupId>
54
+        	<artifactId>spring-cloud-starter-openfeign</artifactId>
55
+        </dependency>
53
 		<dependency>
56
 		<dependency>
54
 			<groupId>org.apache.commons</groupId>
57
 			<groupId>org.apache.commons</groupId>
55
 			<artifactId>commons-lang3</artifactId>
58
 			<artifactId>commons-lang3</artifactId>
@@ -114,7 +117,17 @@
114
 		    <version>1.3.2</version>
117
 		    <version>1.3.2</version>
115
 		</dependency>
118
 		</dependency>
116
 		<!-- 调用webService的cxf jar包 -->
119
 		<!-- 调用webService的cxf jar包 -->
120
+		<!--添加webservice-->
117
 		<dependency>
121
 		<dependency>
122
+		   <groupId>org.apache.cxf</groupId>
123
+		   <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
124
+		   <version>3.2.4</version>
125
+        </dependency>
126
+        <dependency>
127
+            <groupId>org.springframework.boot</groupId>
128
+            <artifactId>spring-boot-starter-web-services</artifactId>
129
+        </dependency>
130
+		<!-- <dependency>
118
 			<groupId>org.apache.cxf</groupId>
131
 			<groupId>org.apache.cxf</groupId>
119
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
132
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
120
 			<version>3.3.2</version>
133
 			<version>3.3.2</version>
@@ -128,7 +141,7 @@
128
 			<groupId>org.apache.cxf</groupId>
141
 			<groupId>org.apache.cxf</groupId>
129
 			<artifactId>cxf-rt-transports-http-jetty</artifactId>
142
 			<artifactId>cxf-rt-transports-http-jetty</artifactId>
130
 			<version>3.3.2</version>
143
 			<version>3.3.2</version>
131
-		</dependency>
144
+		</dependency> -->
132
 		<!-- JSONObject jar包 -->
145
 		<!-- JSONObject jar包 -->
133
 		<dependency>
146
 		<dependency>
134
 		    <groupId>net.sf.json-lib</groupId>    
147
 		    <groupId>net.sf.json-lib</groupId>    

+ 0 - 3
src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseRopController.java

@@ -1,6 +1,5 @@
1
 package com.chinaitop.depot.storage.controller;
1
 package com.chinaitop.depot.storage.controller;
2
 
2
 
3
-import java.io.IOException;
4
 import java.util.Date;
3
 import java.util.Date;
5
 import java.util.HashMap;
4
 import java.util.HashMap;
6
 import java.util.List;
5
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.Map;
9
 import javax.annotation.Resource;
8
 import javax.annotation.Resource;
10
 
9
 
11
 import org.springframework.http.MediaType;
10
 import org.springframework.http.MediaType;
12
-import org.springframework.web.bind.annotation.PostMapping;
13
 import org.springframework.web.bind.annotation.RequestMapping;
11
 import org.springframework.web.bind.annotation.RequestMapping;
14
 import org.springframework.web.bind.annotation.RequestMethod;
12
 import org.springframework.web.bind.annotation.RequestMethod;
15
 import org.springframework.web.bind.annotation.RestController;
13
 import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +19,6 @@ import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop;
21
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample;
19
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample;
22
 import com.chinaitop.depot.storage.service.StorageChangeStoragehouseRopService;
20
 import com.chinaitop.depot.storage.service.StorageChangeStoragehouseRopService;
23
 import com.chinaitop.depot.storage.utils.ParameterUtil;
21
 import com.chinaitop.depot.storage.utils.ParameterUtil;
24
-import com.fasterxml.jackson.databind.ObjectMapper;
25
 import com.github.pagehelper.PageHelper;
22
 import com.github.pagehelper.PageHelper;
26
 import com.github.pagehelper.PageInfo;
23
 import com.github.pagehelper.PageInfo;
27
 
24
 

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/unissoft/model/ResponseEntity.java

@@ -1,4 +1,4 @@
1
-package com.chinaitop.depot.storage.unissoft.model;
1
+package com.chinaitop.unissoft.model;
2
 
2
 
3
 
3
 
4
 import java.io.Serializable;
4
 import java.io.Serializable;

+ 6 - 7
src/main/java/com/chinaitop/depot/storage/unissoft/serviceconfig/CxfConfig.java

@@ -1,18 +1,17 @@
1
-package com.chinaitop.depot.storage.unissoft.serviceconfig;
1
+package com.chinaitop.unissoft.serviceconfig;
2
 
2
 
3
 
3
 
4
-import javax.xml.ws.Endpoint;
5
-
6
-import com.chinaitop.depot.storage.unissoft.webservice.ContractPassService;
7
-import com.chinaitop.depot.storage.unissoft.webservice.ContractPassServiceImpl;
8
-import com.chinaitop.depot.storage.unissoft.webservice.NoticePassService;
9
-import com.chinaitop.depot.storage.unissoft.webservice.NoticePassServiceImpl;
4
+import com.chinaitop.unissoft.webservice.ContractPassService;
5
+import com.chinaitop.unissoft.webservice.ContractPassServiceImpl;
6
+import com.chinaitop.unissoft.webservice.NoticePassService;
7
+import com.chinaitop.unissoft.webservice.NoticePassServiceImpl;
10
 import org.apache.cxf.Bus;
8
 import org.apache.cxf.Bus;
11
 import org.apache.cxf.bus.spring.SpringBus;
9
 import org.apache.cxf.bus.spring.SpringBus;
12
 import org.apache.cxf.jaxws.EndpointImpl;
10
 import org.apache.cxf.jaxws.EndpointImpl;
13
 import org.springframework.context.annotation.Bean;
11
 import org.springframework.context.annotation.Bean;
14
 import org.springframework.context.annotation.Configuration;
12
 import org.springframework.context.annotation.Configuration;
15
 
13
 
14
+import javax.xml.ws.Endpoint;
16
 
15
 
17
 
16
 
18
 @Configuration
17
 @Configuration

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/unissoft/webservice/ContractPassService.java

@@ -1,4 +1,4 @@
1
-package com.chinaitop.depot.storage.unissoft.webservice;
1
+package com.chinaitop.unissoft.webservice;
2
 
2
 
3
 
3
 
4
 import javax.jws.WebParam;
4
 import javax.jws.WebParam;

+ 5 - 7
src/main/java/com/chinaitop/depot/storage/unissoft/webservice/ContractPassServiceImpl.java

@@ -1,20 +1,18 @@
1
-package com.chinaitop.depot.storage.unissoft.webservice;
1
+package com.chinaitop.unissoft.webservice;
2
 
2
 
3
 
3
 
4
-
5
-import javax.annotation.Resource;
6
-
7
-import com.chinaitop.depot.storage.service.PushsService;
4
+import com.chinaitop.pushs.service.PushsService;
8
 import org.springframework.stereotype.Service;
5
 import org.springframework.stereotype.Service;
9
 
6
 
7
+import javax.annotation.Resource;
10
 
8
 
11
 
9
 
12
 @Service
10
 @Service
13
 @SuppressWarnings("all")
11
 @SuppressWarnings("all")
14
-public class ContractPassServiceImpl implements ContractPassService{
12
+public class ContractPassServiceImpl implements ContractPassService {
15
 
13
 
16
 	@Resource
14
 	@Resource
17
-    private com.chinaitop.depot.storage.service.PushsService PushsService;
15
+	private PushsService PushsService;
18
 
16
 
19
 
17
 
20
 	@Override
18
 	@Override

+ 1 - 2
src/main/java/com/chinaitop/depot/storage/unissoft/webservice/NoticePassService.java

@@ -1,11 +1,10 @@
1
-package com.chinaitop.depot.storage.unissoft.webservice;
1
+package com.chinaitop.unissoft.webservice;
2
 
2
 
3
 
3
 
4
 import javax.jws.WebParam;
4
 import javax.jws.WebParam;
5
 import javax.jws.WebService;
5
 import javax.jws.WebService;
6
 
6
 
7
 
7
 
8
-
9
 @WebService
8
 @WebService
10
 public interface NoticePassService {
9
 public interface NoticePassService {
11
 
10
 

+ 5 - 6
src/main/java/com/chinaitop/depot/storage/unissoft/webservice/NoticePassServiceImpl.java

@@ -1,18 +1,17 @@
1
-package com.chinaitop.depot.storage.unissoft.webservice;
1
+package com.chinaitop.unissoft.webservice;
2
 
2
 
3
 
3
 
4
+import com.chinaitop.pushs.service.PushsService;
5
+import org.springframework.stereotype.Service;
4
 
6
 
5
 import javax.annotation.Resource;
7
 import javax.annotation.Resource;
6
 
8
 
7
-import com.chinaitop.depot.storage.service.PushsService;
8
-import org.springframework.stereotype.Service;
9
-
10
 @Service
9
 @Service
11
 @SuppressWarnings("all")
10
 @SuppressWarnings("all")
12
-public class NoticePassServiceImpl implements NoticePassService{
11
+public class NoticePassServiceImpl implements NoticePassService {
13
 
12
 
14
 	@Resource
13
 	@Resource
15
-	private com.chinaitop.depot.storage.service.PushsService PushsService;
14
+	private PushsService PushsService;
16
 
15
 
17
 	@Override
16
 	@Override
18
 	public String updateContractStatus(String changeStorageHouseData) {
17
 	public String updateContractStatus(String changeStorageHouseData) {