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

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

@@ -1167,11 +1167,12 @@ public class AMScontroller{
                                                        String enableStatus,
                                                        String planStatus,
                                                      String startTime,
-                                                     String endTime) {
+                                                     String endTime,
+                                                     BigDecimal planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime);
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus,startTime,endTime,planId);
     }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 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;
@@ -282,6 +283,12 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getCapacityList(mapValue==null?new HashMap<String, Object>():mapValue,pageNum, pageSize, apiId,con);
     }
 
+
+    @PostMapping(value = "/uploadCargoPic")
+    public String uploadCargoPic(@RequestParam ("file") MultipartFile multipartFile){
+        return tmsshipFeign.uploadCargoPic(multipartFile);
+    }
+
     /**
      * 卸船作业
      * @param mapValue

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

@@ -7,10 +7,7 @@ import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -845,4 +842,11 @@ public class UniversalController extends BaseRESTfulController {
     public Map<String,Object>getCapacityTel(BigDecimal capacityId){
         return universalMapper.getCapacityTel(capacityId);
     }
+
+    //根据收货客户userId，查询收货客户信息
+    @ApiOperation(value = "根据userId查询收货客户信息")
+    @GetMapping("/getConsigneeByuserid")
+    public Map<String,Object>getConsigneeByuserid(String userId){
+        return universalMapper.getConsigneeByuserid(userId);
+    }
 }

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1532,7 +1532,8 @@ public interface AmsFeign {
                                               @RequestParam String enableStatus,
                                               @RequestParam String planStatus,
                                               @RequestParam String startTime,
-                                              @RequestParam String endTime);
+                                              @RequestParam String endTime,
+                                              @RequestParam BigDecimal planId);
 
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRealAddressByLike")
     Map<String, Object> getRealAddressByLike(@RequestParam Integer addressId,@RequestParam String index);

src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -3,7 +3,9 @@ package com.steerinfo.dil.feign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -789,4 +791,7 @@ public interface TmsshipFeign {
 
     @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
     Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/uploadCargoPic" ,consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String uploadCargoPic(@RequestPart("file") MultipartFile multipartFile);
 }

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

@@ -194,4 +194,7 @@ public interface UniversalMapper {
 
     //查询运力联系方式
     Map<String, Object> getCapacityTel(BigDecimal capacityId);
+
+    Map<String, Object> getConsigneeByuserid(String userId);
+
 }

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -40,7 +40,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8003}
   WMSHFeign:
@@ -48,7 +48,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:192.168.1.104:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:localhost:8014}
   JoinFeign:

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -991,4 +991,12 @@
         SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_ID = #{capacityId}
     </select>
+    <select id="getConsigneeByuserid" resultType="java.util.Map" parameterType="string">
+        select
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_CODE "consigneeCode",
+        RC.CONSIGNEE_COMPANY_NAME   "consigneeCompanyName"
+        from RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_SSO_ID = #{userId}
+    </select>
 </mapper>