运输服务-报表服务 dubbo版本修改

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/dubbo/FileDubboApiService.java

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 
 @Slf4j
-@DubboService(group = "design", version = "2.0.0",timeout = 50000)
+@DubboService(group = "design", version = "1.0.0",timeout = 50000)
 public class FileDubboApiService implements FileApiDubboService {
 
     @Autowired

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -63,10 +63,10 @@ public class KwTransportService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     TransportDubboService transportDubboService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
     /**

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

@@ -63,21 +63,21 @@ import java.util.stream.Collectors;
 @Service
 public class AcceptCarriageOrderService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     RemoteSystemService remoteSystemService;
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     RemoteFleetService fleetService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteContractService remoteContractService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteManageService remoteManageService;
 
     @Resource
@@ -889,21 +889,22 @@ public class AcceptCarriageOrderService {
         List<Long> wOrderIds = logisticsOrderCirculateMapper.selectEntityBylOrderIdAndOrderIds(stopOrderTakingDTO.getLOrderId(), stringList);
         List<JSONObject> list = new ArrayList<>(stringList.size());
         String type = stopOrderTakingDTO.getType();
-        if (String.valueOf(NumberConstant.TWO).equals(type)){
-            acceptStopDocumentCommit(stopOrderTakingDTO,list,wOrderIds);
-        }else if (String.valueOf(NumberConstant.ONE).equals(type)){
-            consignStopDocumentCommit(stopOrderTakingDTO,list,wOrderIds);
-        }else {
-           return HttpResult.error("单据类型错误!");
+        if (String.valueOf(NumberConstant.TWO).equals(type)) {
+            acceptStopDocumentCommit(stopOrderTakingDTO, list, wOrderIds);
+        } else if (String.valueOf(NumberConstant.ONE).equals(type)) {
+            consignStopDocumentCommit(stopOrderTakingDTO, list, wOrderIds);
+        } else {
+            return HttpResult.error("单据类型错误!");
         }
         return HttpResult.ok(list);
     }
 
     /**
      * 托运订单-设置停止接单
+     *
      * @param stopOrderTakingDTO
      */
-    private void consignStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO,List<JSONObject> list,List<Long> wOrderIds) {
+    private void consignStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO, List<JSONObject> list, List<Long> wOrderIds) {
 
         if (CollectionUtils.isNotEmpty(wOrderIds)) {
             wOrderIds.forEach(wOrderId -> {
@@ -916,11 +917,11 @@ public class AcceptCarriageOrderService {
                 } else {
                     logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
                             .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy,LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime,new Date())
+                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
+                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
                             .eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId)
                     );
-//                    /**更新MongoDB*/
+                    /**更新MongoDB*/
                     SckwWaybillOrder order = new SckwWaybillOrder();
                     order.setStatus(NumberConstant.ONE);
                     order.setUpdateTime(new Date());
@@ -941,9 +942,10 @@ public class AcceptCarriageOrderService {
 
     /**
      * 承运订单设置停止接单
+     *
      * @param stopOrderTakingDTO
      */
-    private void acceptStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO,List<JSONObject> list,List<Long> wOrderIds) {
+    private void acceptStopDocumentCommit(StopOrderTakingDTO stopOrderTakingDTO, List<JSONObject> list, List<Long> wOrderIds) {
         if (CollectionUtils.isNotEmpty(wOrderIds)) {
             wOrderIds.forEach(wOrderId -> {
                 JSONObject jsonObject = new JSONObject();
@@ -955,8 +957,8 @@ public class AcceptCarriageOrderService {
                 } else {
                     logisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
                             .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy,LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime,new Date())
+                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
+                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
                             .eq(KwtLogisticsOrderCirculate::getWOrderId, wOrderId)
                     );
 //                    /**更新MongoDB*/
@@ -1699,4 +1701,5 @@ public class AcceptCarriageOrderService {
         order.setUpdateTime(new Date());
         logisticsOrderMapper.insert(order);
     }
+
 }

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

@@ -54,15 +54,15 @@ import java.util.stream.Collectors;
 @Service
 public class ConsignOrderService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteContractService remoteContractService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 8000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
     GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;
 
     @Autowired

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

@@ -48,10 +48,10 @@ import java.util.stream.Collectors;
 @Service
 public class DriverService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;
 
     @Autowired

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

@@ -71,11 +71,11 @@ public class KwtWaybillOrderService {
     KwtLogisticsOrderCirculateMapper logisticsOrderCirculateDao;
     @Resource
     private StreamBridge streamBridge;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteFleetService remoteFleetService;
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
 
     /**

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

@@ -66,19 +66,19 @@ public class LogisticsConsignmentService {
     @Resource
     private StreamBridge streamBridge;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     GoodsInfoService goodsInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteFleetService remoteFleetService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 6000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteContractService remoteContractService;
 
     @Autowired

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

@@ -53,13 +53,13 @@ import java.util.stream.Collectors;
 @Service
 public class TransportCommonService {
 
-    @DubboReference(version = "2.0.0", group = "design", check = false, timeout = 10000)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteContractService remoteContractService;
 
     @Autowired

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

@@ -7,7 +7,6 @@ import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -52,7 +51,7 @@ public class WaybillManagementService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteFleetService remoteFleetService;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
     @Autowired

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -48,13 +48,13 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@DubboService(group = "design", version = "2.0.0", timeout = 50000)
+@DubboService(group = "design", version = "1.0.0", timeout = 50000)
 public class TransportDubboServiceImpl implements TransportDubboService {
 
     @Resource
     private StreamBridge streamBridge;
 
-    @DubboReference(version = "2.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
     @Autowired