Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sckw.core.annotation.RepeatSubmit;
 import com.sckw.core.exception.CustomPromptException;
 import com.sckw.core.model.enums.OrderRuleEnum;
 import com.sckw.core.model.enums.RedisOrderGenerateEnum;
@@ -89,6 +90,7 @@ public class AcceptCarriageOrderController {
      * @param query 查询参数
      * @return
      */
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/acceptCarriageOrderExport", method = RequestMethod.POST)
     public void exportAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
@@ -105,6 +107,7 @@ public class AcceptCarriageOrderController {
      * @param dto
      * @return
      */
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.POST)
     public HttpResult getOrderDetail(@Validated @RequestBody DocumentParamDTO dto) {
         log.info("获取订单详情参数:{}", JSONObject.toJSONString(dto));
@@ -123,6 +126,7 @@ public class AcceptCarriageOrderController {
      * @param contractParam 请求参数
      * @return
      */
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.POST)
     public HttpResult getLogisticsOrderContract(@Valid @RequestBody ContractParam contractParam) {
         try {
@@ -139,6 +143,7 @@ public class AcceptCarriageOrderController {
      * @param orderDto
      * @return
      */
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/cancelConsign", method = RequestMethod.POST)
     public HttpResult cancelConsign(@Validated @RequestBody CancelOrderDTO orderDto) {
         try {
@@ -184,6 +189,7 @@ public class AcceptCarriageOrderController {
      * @param query 请求参数
      * @return
      */
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
     public HttpResult subcontractConsignment(@RequestBody SubcontractConsignmentDTO query) {
         try {
@@ -372,6 +378,7 @@ public class AcceptCarriageOrderController {
      * @param addOrderDTO 页面传递参数
      * @return
      */
+    @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
     public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
         log.info("承运订单-页面新建订单 add {}", JSONObject.toJSONString(addOrderDTO));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -308,7 +308,7 @@ public class AcceptCarriageOrderService {
         commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
                 messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
                 messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER,
+                MessageEnum.NEW_CARRIAGE_ORDER,MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,
                 "1");
 
         //修改父级mongodb数据

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/CommonService.java

@@ -312,6 +312,14 @@ public class CommonService {
         streamBridge.send("sckw-message", JSON.toJSONString(msg));
     }
 
+    /**
+     * 给业务联系人发消息[承运方]
+     * @param carriageUnit
+     * @param map
+     * @param pcUrl
+     * @param appUrl
+     * @param messageEnum
+     */
     private void sendLogisticsCarriageMessage(KwtLogisticsOrderUnit carriageUnit, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
         //给业务联系人发消息[承运方]
         List<UserInfo> userInfoList = new ArrayList<>();
@@ -333,6 +341,14 @@ public class CommonService {
         streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
     }
 
+    /**
+     * 给业务联系人发消息[托运方]
+     * @param consignUnit
+     * @param map
+     * @param pcUrl
+     * @param appUrl
+     * @param messageEnum
+     */
     private void sendLogisticsConsignMessage(KwtLogisticsOrderUnit consignUnit, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
         //给业务联系人发消息[托运方]
         List<UserInfo> list = new ArrayList<>();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -1616,7 +1616,7 @@ public class KwtWaybillOrderService {
         SckwWaybillOrder wOrder = new SckwWaybillOrder();
         wOrder.set_id(waybillOrder.getId());
         wOrder.setLoadAmount(waybillOrder.getLoadAmount());
-        wOrder.setLoadUrls(params.getUrls());
+        wOrder.setLoadUrls(FileUtils.replaceAllBatch(params.getUrls()));
         wOrder.setLoadTime(params.getOperateTime());
         editSckwWaybillOrder(wOrder, waybillOrder, 2);
 
@@ -1751,7 +1751,7 @@ public class KwtWaybillOrderService {
         wOrder.setUnloadAmount(waybillOrder.getUnloadAmount());
         wOrder.setDeficitAmount(waybillOrder.getDeficitAmount());
         wOrder.setDeficitPrice(waybillOrder.getDeficitPrice());
-        wOrder.setUnloadUrls(params.getUrls());
+        wOrder.setUnloadUrls(FileUtils.replaceAllBatch(params.getUrls()));
         wOrder.setUnloadTime(params.getOperateTime());
         editSckwWaybillOrder(wOrder, waybillOrder, 2);
 
@@ -2062,6 +2062,7 @@ public class KwtWaybillOrderService {
 
         /**3更新榜单信息**/
         BeanUtils.copyProperties(params, ticket);
+        ticket.setUrls(FileUtils.replaceAllBatch(ticket.getUrls()));
         waybillOrderTicketDao.updateById(ticket);
 
         /**4Mongodb数据更新**/