修改代码code 相关问题

performance-api/src/main/java/com/clx/performance/enums/DriverTruckEnum.java

@@ -83,4 +83,20 @@ public enum DriverTruckEnum {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
     }
+
+    //车辆状态：1空车 2重车
+    @Getter
+    @AllArgsConstructor
+    public enum TraceTruckStatus {
+        EMPTY(1, "空车"),
+        HEAVY(2, "重车");
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<TraceTruckStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.trace;
 
 import com.clx.order.enums.ResultEnum;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.enums.DriverTruckEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.pc.trace.QueryTraceParam;
 import com.clx.performance.service.trace.TraceMonitorService;
@@ -45,12 +46,14 @@ public class TraceMonitorServiceImpl implements TraceMonitorService {
         List<DriverTruckTraceVO> truckTrace = truckTraceService.listTruckTraceByTime(param.getTruckNo(),param.getBeginTime(),param.getEndTime());
         // 接单重车、卸车空车
         for (DriverTruckTraceVO item : truckTrace) {
-            item.setTruckStatus(2);
+            item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.HEAVY.getCode());
             if (child.getCancelTime() != null){
-                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(child.getCancelTime())){item.setTruckStatus(1);}
+                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(child.getCancelTime())){
+                    item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.EMPTY.getCode());}
             }
             if (child.getUnloadTime() != null){
-                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(child.getUnloadTime())){item.setTruckStatus(1);}
+                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(child.getUnloadTime())){
+                    item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.EMPTY.getCode());}
             }
         }
         List<DriverTraceVO> driverTrace = truckTraceService.listDriverTraceByTime(child.getDriverUserNo(),param.getBeginTime(),param.getEndTime());

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

@@ -135,8 +135,9 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     public void driverTraceSave(DriverTraceAddParam param){
 
         List<DriverTraceESPlus> list = new ArrayList<>();
+        DriverTraceESPlus es = null;
         for (DriverTraceAddParam.DriverTraceItem item : param.getTraceList()) {
-            DriverTraceESPlus es = new DriverTraceESPlus();
+            es = new DriverTraceESPlus();
             es.setUserNo(item.getUserNo());
             es.setDataType(item.getDataType());
             es.setLocation(item.getLocation());