Browse Source

过账api方法入参方式修改

guq 7 years ago
parent
commit
934fc65ed3

+ 9 - 5
applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -1,18 +1,22 @@
 package com.usoftchina.saas.document.api;
 package com.usoftchina.saas.document.api;
 
 
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.Result;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 
 
 import java.util.Map;
 import java.util.Map;
 
 
 @FeignClient(name = "document-server")
 @FeignClient(name = "document-server")
 public interface WarehouseApi {
 public interface WarehouseApi {
 
 
-    @GetMapping("/warehouse/post")
-    public Result post(Map<String, Object> param);
+    @PostMapping("/warehouse/post")
+    public Result post(@RequestBody Map<String, Object> map);
 
 
-    @GetMapping("/warehouse/unPost")
-    public Result unPost(Map<String, Object> param);
+    @PostMapping("/warehouse/unPost")
+    public Result unPost(@RequestBody Map<String, Object> map);
 
 
 }
 }

+ 4 - 4
applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -23,8 +23,8 @@ public class WarehouseController {
      * 过账
      * 过账
      * @return
      * @return
      */
      */
-    @GetMapping("/post")
-    public Result post(Map<String, Object> map){
+    @PostMapping("/post")
+    public Result post(@RequestBody Map<String, Object> map){
         warehouseService.post(map);
         warehouseService.post(map);
         return Result.success(map.get("result"));
         return Result.success(map.get("result"));
     }
     }
@@ -34,8 +34,8 @@ public class WarehouseController {
      * @param map
      * @param map
      * @return
      * @return
      */
      */
-    @GetMapping("/unPost")
-    public Result unPost(Map<String, Object> map){
+    @PostMapping("/unPost")
+    public Result unPost(@RequestBody Map<String, Object> map){
         warehouseService.unPost(map);
         warehouseService.unPost(map);
         return Result.success();
         return Result.success();
     }
     }

+ 2 - 1
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/SaleApplication.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 
@@ -13,7 +14,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  **/
  **/
 @SpringBootApplication
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @MapperScan("com.usoftchina.saas.sale.mapper")
-@EnableEurekaClient
+@EnableFeignClients("com.usoftchina.saas")
 public class SaleApplication extends WebMvcConfigurerAdapter{
 public class SaleApplication extends WebMvcConfigurerAdapter{
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(SaleApplication.class, args);
         SpringApplication.run(SaleApplication.class, args);

+ 22 - 0
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -5,12 +5,19 @@ import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.document.api.WarehouseApi;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.sale.service.SaleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.reactive.config.EnableWebFlux;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
 /**
  * @author: guq
  * @author: guq
@@ -21,8 +28,23 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/sale")
 @RequestMapping("/sale")
 public class SaleController {
 public class SaleController {
 
 
+
+    private Logger logger = LoggerFactory.getLogger(SaleController.class);
+
     @Autowired
     @Autowired
     private SaleService saleService;
     private SaleService saleService;
+    @Autowired
+    private WarehouseApi warehouseApi;
+
+
+    @RequestMapping("/test")
+    public void test() {
+        logger.info("xxx" + Thread.currentThread().getName() + "test");
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("code", "code");
+        map.put("id", "id");
+        warehouseApi.unPost(map);
+    }
 
 
     /**
     /**
      * 销售订单列表
      * 销售订单列表