Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

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);
+    }
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -34,7 +34,7 @@ import java.util.Map;
 public class UniversalController extends BaseRESTfulController {
 
     @Autowired
-    UniversalServiceImpl selfServiceMachineService;
+    UniversalServiceImpl universalService;
 
     @Autowired
     UniversalMapper universalMapper;
@@ -49,7 +49,7 @@ public class UniversalController extends BaseRESTfulController {
     })
     @PostMapping("/printTHD")
     public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
-        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
+        Map<String, Object> tiHuoDan = universalService.printTiHuoDan((String) mapValue.get("orderNumber"));
         return success(tiHuoDan);
     }
 
@@ -359,6 +359,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "返回MD5加密字符串")
+    @PostMapping("/sha1DigestUtils")
+    public String sha1DigestUtils(String text){
+        return universalService.sha1DigestUtils(text);
+        //获取当前订单还没有净重的计量实绩
+    }
+
     @ApiModelProperty(value = "边输边查装货卸货点")
     @PostMapping("/selectUnloadingPoint")
     public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {

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);
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -58,6 +58,7 @@ public interface UniversalMapper {
 
     // 所有承运商
     List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
+
     //边输边查卸货点
     List<Map<String, Object>> selectUnloadingPoint(String index);
 }

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.UniversalService;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -46,4 +47,12 @@ public class UniversalServiceImpl implements UniversalService {
     }
 
 
+    /**
+     * sha1加密字符串
+     * @param text
+     * @return
+     */
+    public String sha1DigestUtils(String text){
+        return DigestUtils.sha1Hex(text);
+    }
 }

src/main/resources/bootstrap.yml

@@ -51,35 +51,9 @@ 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:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-  RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+# 测试环境
 
 
 genxml:
@@ -111,6 +85,4 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-#  port: 8080
-#测试环境
-  port: 8080
+  port: 8019