zhouzh 3 роки тому
батько
коміт
e59048ef26

+ 36 - 0
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -901,6 +902,36 @@ public class RMScontroller {
         return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
+    @ApiOperation(value="新增运力信息", notes="根据rmsConsignee对象创建")
+    @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "rmsConsignee")
+    @PostMapping(value = "/insertConsignee")
+    public Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertConsignee(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsConsignee对象创建")
+    @ApiImplicitParam(name = "运力信息id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteConsignee/{id}")
+    public Map<String, Object> deleteConsignee(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteConsignee(id);
+    }
+
+    @ApiOperation(value="获取运力信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getConsigneeById/{id}")
+    public Map<String,Object> getConsigneeById(@PathVariable("id")BigDecimal id){
+        return rmsFeign.getConsigneeById(id);
+    }
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的rmsCapacity信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+            @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "RmsConsignee")
+    })
+    @PostMapping(value = "/updateConsignee", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateConsignee( @RequestBody Map<String, Object> map){
+
+        return rmsFeign.updateConsignee(map);
+    }
+
     /*
      *边写边搜索承运商
      * */
@@ -949,4 +980,9 @@ public class RMScontroller {
         return rmsFeign.deletePortYard(warehouseId);
     }
 
+    //上传图片
+    @PostMapping(value = "/upload")
+    public Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file){
+        return rmsFeign.upLoadPhoto(file);
+    }
 }

+ 20 - 1
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -462,8 +463,23 @@ public interface RmsFeign {
                                             @RequestParam("con") String con);
 
 
+    //新增收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/insertConsignee")
+    Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map);
+    //删除收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/deleteConsignee/{id}")
+    Map<String, Object> deleteConsignee(@PathVariable("id") BigDecimal id);
+    //修改收货客户信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/updateConsignee")
+    Map<String, Object> updateConsignee(Map<String, Object> map);
 
-  //边输入边搜索承运商
+    //根据id获取收货客户信息详细信息
+    @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeById/{id}")
+    Map<String,Object> getConsigneeById(@PathVariable("id") BigDecimal id);
+
+
+
+    //边输入边搜索承运商
     @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
     Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
 
@@ -515,4 +531,7 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
     Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
 
+    //上传图片
+    @PostMapping(value = "api/v1/rms/rmscardriver/upload")
+    Map<String,Object> upLoadPhoto(@RequestParam("file") MultipartFile file);
 }

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -51,7 +51,7 @@ openfeign:
     OMSFeign:
       url: ${OMSFEIGN_URL:172.16.33.166:8095}
     RmsFeign:
-      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+      url: ${RMSFEIGN_HRL:localhost:8060}
 
 # 测试环境
 #  ColumnDataFeign: