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

performance-web/pom.xml

@@ -87,6 +87,12 @@
             <artifactId>coding-api</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.msl</groupId>
+            <artifactId>server-spring-boot-starter</artifactId>
+        </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>com.msl</groupId>-->
         <!--            <artifactId>cache-spring-boot-starter</artifactId>-->

performance-web/src/main/java/com/clx/performance/controller/system/AppServerController.java

-package com.clx.performance.controller.system;
-
-import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.registry.NacosRegistration;
-import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
-import com.msl.common.result.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 应用服务器控制
- *
- * @author wanglq
- * Date 2022/11/28
- * Time 15:43
- */
-@RestController
-@RequestMapping("/appServer")
-@Slf4j
-public class AppServerController {
-    @Autowired
-    private NacosRegistration registration;
-    @Autowired
-    private NacosServiceRegistry registry;
-
-    /**
-     * 下线服务
-     *
-     * @return
-     */
-    @GetMapping("/deregister")
-    public Result<Void> deregister() {
-        NacosDiscoveryProperties properties = registration.getNacosDiscoveryProperties();
-        String service = properties.getService();
-        String group = properties.getGroup();
-        String clusterName = properties.getClusterName();
-        String ip = properties.getIp();
-        int port = properties.getPort();
-        log.info("deregister from nacos, serviceName:{}, groupName:{}, clusterName:{}, ip:{}, port:{}", service, group, clusterName, ip, port);
-        registry.deregister(registration);
-        return Result.ok();
-    }
-
-    /**
-     * 应用状态
-     *
-     * @return
-     */
-    @GetMapping("/status")
-    public Result<String> status() {
-        return Result.ok("up");
-    }
-}

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -193,4 +193,5 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<LineWarnOrderChildStatisticsDTO>sumArriveRecieveNumByOrderGoodsNoList(List<String> orderGoodsNoList);
     List<LineWarnOrderChildStatisticsDTO>sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList);
 
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -616,4 +616,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public List<LineWarnOrderChildStatisticsDTO> sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList) {
         return baseMapper.sumUnloadNumByOrderGoodsNoList(orderGoodsNoList);
     }
+
+
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -158,4 +158,5 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
             "</script>")
     List<LineWarnOrderChildStatisticsDTO>sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList);
 
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -50,7 +50,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "openOrderPageGoodsList")
-    IPage<OrderGoodsAPPVO> openOrderPageGoodsList(Page<OrderGoodsAPPVO> page, List<String> orderGoodsNoList);
+    IPage<OrderGoodsAPPVO> openOrderPageGoodsList(@Param("page") Page<OrderGoodsAPPVO> page, @Param("orderGoodsNoList") List<String> orderGoodsNoList);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "exclusiveOrderPageGoodsList")
     IPage<OrderGoodsAPPVO> exclusiveOrderPageGoodsList(Page<OrderGoodsAPPVO> page, List<String> param);

performance-web/src/main/java/com/clx/performance/model/OrderGoodsFleetOpenTruck.java

@@ -7,14 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Optional;
 
 /**
  * 货单定向绑定车辆表
@@ -28,7 +25,7 @@ public class OrderGoodsFleetOpenTruck implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("truck_no")
+    @TableField("truck_list_json")
     @ApiModelProperty("车辆列表")
     private String truckListJson;
 
@@ -52,21 +49,4 @@ public class OrderGoodsFleetOpenTruck implements HasKey<Integer> {
     public Integer gainKey() {
     return this.id;
     }
-
-    @Getter
-    @AllArgsConstructor
-    public enum Status {
-        NORMAL(1, "正常"),
-        CANCEL(2, "取消"),
-        ORDER(3, "已接单"),
-
-        ;
-
-        private final int code;
-        private final String msg;
-
-        public static Optional<Status> getByCode(int code) {
-            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
-        }
-    }
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -292,7 +292,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         OrderGoodsTruckBind bind = null;
         List<OrderGoodsTruckBind> orderGoodsTruckBindList = orderGoodsTruckBindDao.getValidByTruckNo(truckNo).orNull();
         if (Objects.equals(orderGoods.getPendingOrderWay(),
-                OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())) {
+                OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode()) ||
+                Objects.equals(orderGoods.getPendingOrderWay(),
+                OrderGoodsPendingOrderWayStatusEnum.Status.FLEET_EXCLUSIVE.getCode())) {
             if (CollectionUtils.isEmpty(orderGoodsTruckBindList)) {
                 throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR);
             }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -121,13 +121,24 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
+
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
-        List<String> truckList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo).stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+        List<String> truckList;
+
+        if(Objects.equals(orderGoodsVO.getPendingOrderWay(),PendingOrderWayStatusEnum.Status.FLEET_DX.getCode())){
+            truckList = orderGoodsTruckBindDao.
+                    listByField(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                    .stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+        }else{
+            truckList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo).stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+        }
+
         String orderNo = orderGoodsVO.getOrderNo();
         orderGoodsVO.setTruckList(truckList);
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
         orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
+        orderGoodsVO.setDispatchedOrders(truckList.size());
         return orderGoodsVO;
     }
 
@@ -162,7 +173,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 page.getRecords().forEach(item->item.setDispatchedOrders(map.get(item.getOrderGoodsNo())));
             }
         }
-        return orderGoodsDao.pageOrderGoodsList(param);
+        return page;
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -85,7 +85,7 @@ public class OrderGoodsSqlProvider {
     }
 
 
-    public String openOrderPageGoodsList(@Param("page") Page<OrderGoodsAPPVO> page, @Param("param") List<String> orderGoodsNoList) {
+    public String openOrderPageGoodsList(@Param("page") Page<OrderGoodsAPPVO> page, @Param("orderGoodsNoList") List<String> orderGoodsNoList) {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
@@ -107,10 +107,10 @@ public class OrderGoodsSqlProvider {
                 StringJoiner sj = new StringJoiner(",","a.order_goods_no in (",")");
                 orderGoodsNoList.forEach(item -> sj.add("'"+item+"'"));
                 WHERE(" (a.pending_order_way = " + PendingOrderWayStatusEnum.Status.GK.getCode() + " OR (a.pending_order_way = " +
-                        PendingOrderWayStatusEnum.Status.FLEET_GK.getCode() + "and "  + sj + "))");
+                        PendingOrderWayStatusEnum.Status.FLEET_GK.getCode() + " and "  + sj + "))");
             }
             WHERE("a.last_arrive_send_time >= now()");
-            WHERE("(a.order_goods_status IN ( "+OrderGoodsStatusEnum.Status.PAYING.getCode()+","+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
+            WHERE("a.order_goods_status IN ( "+OrderGoodsStatusEnum.Status.PAYING.getCode()+","+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
             WHERE("a.residue_transport_weight >=35");
             ORDER_BY("a.pending_order_time desc");
         }}.toString();
@@ -126,8 +126,9 @@ public class OrderGoodsSqlProvider {
             WHERE("a.stop_flag = "+ OrderGoodsStopEnum.Status.NO.getCode());
             WHERE(" a.pending_order_way = " + PendingOrderWayStatusEnum.Status.FLEET_GK.getCode());
             WHERE("a.last_arrive_send_time >= now()");
-            WHERE("(a.order_goods_status IN ( "+OrderGoodsStatusEnum.Status.PAYING.getCode()+","+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
+            WHERE("a.order_goods_status IN ( "+OrderGoodsStatusEnum.Status.PAYING.getCode()+","+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
             WHERE("a.residue_transport_weight >=35");
+            WHERE("b.id is not null");
         }}.toString();
         return sql;
     }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsTruckBindSqlProvider.java

 package com.clx.performance.sqlProvider;
 
-import com.clx.order.enums.VehicleUsageEnum;
+import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import org.apache.ibatis.jdbc.SQL;
 
@@ -42,7 +42,10 @@ public class OrderGoodsTruckBindSqlProvider {
             FROM("order_goods_truck_bind a");
             LEFT_OUTER_JOIN("order_goods b on a.order_goods_no = b.order_goods_no");
             WHERE("a.truck_no IN ("  + truckList.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
-            WHERE("b.vehicle_usage = " + VehicleUsageEnum.Status.OWN.getCode()  + " or a.`status` =" + OrderGoodsTruckBindEnum.Status.NORMAL.getCode());
+            WHERE("a.`status` =" + OrderGoodsTruckBindEnum.Status.NORMAL.getCode());
+            WHERE("b.order_goods_status IN ( " + OrderGoodsStatusEnum.Status.PAYING.getCode() + ","
+                    + OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode() +")");
+
         }}.toString();
     }
 
@@ -50,7 +53,6 @@ public class OrderGoodsTruckBindSqlProvider {
         return new SQL(){{
             SELECT(" a.order_goods_no,count(*) truckNum ");
             FROM("order_goods_truck_bind a");
-            WHERE("a.order_goods_no IN ("  + fleetNoList.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
             StringJoiner sj = new StringJoiner(",","a.order_goods_no in (",")");
             fleetNoList.forEach(item -> sj.add("'"+item+"'"));
             WHERE(sj.toString());