Browse Source

调用SP程序修改

chenw 7 years ago
parent
commit
88dbe6351b

+ 2 - 1
applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.document.api;
 
+import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -9,6 +10,6 @@ import java.util.Map;
 public interface WarehouseApi {
 
     @GetMapping("/api/document/warehouse/post")
-    public String callProcedure(Map<String, Object> param);
+    public Result callProcedure(Map<String, Object> param);
 
 }

+ 11 - 0
applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/WarehouseDTO.java

@@ -0,0 +1,11 @@
+package com.usoftchina.saas.document.dto;
+
+import java.io.Serializable;
+
+public class WarehouseDTO implements Serializable {
+
+    private long wh_id;
+    private String wh_code;
+    private String wh_name;
+
+}

+ 1 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -36,7 +36,7 @@ public class ProductController {
     @RequestMapping("/updateLatestPurchasePrice")
     public void updateLatestPurchasePrice(@RequestParam(value = "id") Long pu_id) {
         productService.updateLatestPurchasePrice(pu_id);
-    };
+    }
 
 
 }

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

@@ -1,15 +1,15 @@
 package com.usoftchina.saas.document.controller;
 
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.document.po.Warehouse;
 import com.usoftchina.saas.document.service.WarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
 @RestController
-@RequestMapping("/api/document/warehouse")
+@RequestMapping("/warehouse")
 public class WarehouseController {
 
     @Autowired
@@ -20,9 +20,14 @@ public class WarehouseController {
      * @return
      */
     @GetMapping("/post")
-    public String post(Map<String, Object> map){
-        String result = warehouseService.callProcedure(map);
-        return result;
+    public Result post(Map<String, Object> map){
+        warehouseService.callProcedure(map);
+        return Result.success(map.get("result"));
     }
 
+    @PostMapping("/save")
+    public Result saveFormData(@RequestBody Warehouse data){
+        boolean result = warehouseService.save(data);
+        return Result.success(result);
+    }
 }

+ 1 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -7,6 +7,6 @@ import java.util.Map;
 
 public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
-    String callProcedure(Map<String, Object> map);
+    void callProcedure(Map<String, Object> map);
 
 }

+ 2 - 3
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/WarehouseServiceImpl.java

@@ -16,9 +16,8 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
     private WarehouseMapper warehouseMapper;
 
     @Override
-    public String callProcedure(Map<String, Object> map){
-        String result = warehouseMapper.callProcedure(map);
-        return result;
+    public void callProcedure(Map<String, Object> map){
+        warehouseMapper.callProcedure(map);
     }
 
 }

+ 1 - 1
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/WarehouseService.java

@@ -8,6 +8,6 @@ import java.util.Map;
 
 public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
 
-    String callProcedure(Map<String, Object> map);
+    void callProcedure(Map<String, Object> map);
 
 }

+ 8 - 5
applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -20,12 +20,15 @@
         <result column="wh_text4" property="wh_text4" jdbcType="VARCHAR" />
         <result column="wh_text5" property="wh_text5" jdbcType="VARCHAR" />
     </resultMap>
-    <select id="callProcedure" parameterMap="testParamMap" statementType="CALLABLE">
-        call sp_test(?, ?)
+    <select id="callProcedure" parameterMap="paramMap" statementType="CALLABLE">
+        CALL SP_COMMITPRODINOUT(?, ?, ?, ?, ?)
     </select>
-    <parameterMap id="testParamMap" type="java.util.Map">
-        <parameter property="inParam" jdbcType="VARCHAR" mode="IN" />
-        <parameter property="outParam" jdbcType="VARCHAR" mode="OUT" />
+    <parameterMap id="paramMap" type="java.util.Map">
+        <parameter property="inoutNo" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="class" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="commitid" jdbcType="INTEGER" mode="IN" />
+        <parameter property="companyid" jdbcType="INTEGER" mode="IN" />
+        <parameter property="result" jdbcType="VARCHAR" mode="OUT" />
     </parameterMap>
     
 </mapper>