feature(电子围栏): sql优化

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

@@ -3266,7 +3266,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         for (OrderChild child : orderChildList) {
             String childNo = child.getChildNo();
             String truckNo = child.getTruckNo();
-            Long driverUserNo = child.getDriverUserNo();
             //获取卡车的位置
             TruckTraceDTO truckTraceDTO = truckTraceMap.get(truckNo);
             log.info("运单号:{}，卡车:{}，中交兴路地图位置:{}", childNo, truckNo, truckTraceDTO);

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

@@ -14,8 +14,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -169,40 +167,34 @@ public class OrderChildSqlProvider {
         return sql;
     }
 
-    public String findArtificialCancelOrder(@Param("param") ArtificialCancelOrderQueryParam param) {
-        //todo jiangwujie 改成 new SQL()形式
-        StringBuilder sql = new StringBuilder();
-        sql.append("SELECT child_no, goods_name, freight_price, order_no, ");
-        sql.append("send_address, receive_address, ");
-        sql.append("driver_user_no, driver_name, driver_mobile, ");
-        sql.append("truck_no, unload_pound_no, weight, ");
-        sql.append("cancel_remark, pound_status, status, ");
-        sql.append("DATE_FORMAT(load_deadline, '%Y-%m-%d %H:%i:%s') AS loadDeadline, ");
-        sql.append("DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS createTime, ");
-        sql.append("DATE_FORMAT(unload_time, '%Y-%m-%d %H:%i:%s') AS unloadTime ");
-        sql.append("FROM order_child ");
-        sql.append("WHERE 1=1 ");
-
-        List<String> conditions = new ArrayList<>();
-        if (StringUtils.isNotBlank(param.getOrderChildNo())) {
-            conditions.add("child_no = #{param.orderChildNo}");
-        }
-        if (StringUtils.isNotBlank(param.getTruckNo())) {
-            conditions.add("truck_no = #{param.truckNo}");
-        }
-        //todo :jiangwujie 支付状态 可以忽略 ，还是使用<= >=
-        List<Integer> statuses = Arrays.asList(
-                OrderChildEnum.Status.CREATED.getCode(),
-                OrderChildEnum.Status.GO_TO_SEND.getCode(),
-                OrderChildEnum.Status.ARRIVE_SEND.getCode(),
-                OrderChildEnum.Status.LOAD.getCode(),
-                OrderChildEnum.Status.GO_TO_RECEIVE.getCode(),
-                OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()
-        );
-        conditions.add("status IN (" + StringUtils.join(statuses, ", ") + ")");
-        sql.append("AND ");
-        sql.append(StringUtils.join(conditions, " AND "));
-        return sql.toString();
+    public String findArtificialCancelOrder(ArtificialCancelOrderQueryParam param) {
+        return new SQL() {{
+            SELECT("child_no, goods_name, freight_price, order_no, " +
+                    "send_address, receive_address, " +
+                    "driver_user_no, driver_name, driver_mobile, " +
+                    "truck_no, unload_pound_no, weight, " +
+                    "cancel_remark, pound_status, status, " +
+                    "DATE_FORMAT(load_deadline, '%Y-%m-%d %H:%i:%s') AS loadDeadline, " +
+                    "DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS createTime, " +
+                    "DATE_FORMAT(unload_time, '%Y-%m-%d %H:%i:%s') AS unloadTime ");
+            FROM("order_child ");
+            if (StringUtils.isNotBlank(param.getOrderChildNo())) {
+                WHERE("child_no = #{param.orderChildNo,jdbcType=VARCHAR}");
+            }
+            if (StringUtils.isNotBlank(param.getTruckNo())) {
+                WHERE("truck_no = #{param.truckNo,jdbcType=VARCHAR}");
+            }
+            //支付状态 可以忽略
+            WHERE("status >=" + OrderChildEnum.Status.CREATED.getCode());
+            WHERE("status <=" + OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
+        }}.toString();
+    }
+
+    public static void main(String[] args) {
+        ArtificialCancelOrderQueryParam param = new ArtificialCancelOrderQueryParam();
+        param.setTruckNo("A123456");
+        param.setOrderChildNo("CYD1234567890");
+        System.out.println(new OrderChildSqlProvider().findArtificialCancelOrder(param));
     }
 
     public String orderChildCancelRecord(@Param("page") Page<OrderChildVO> page, @Param("param") OrderChildCancelRecordParam param) {