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

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

@@ -88,8 +88,8 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     List<Double> getLossNet(@Param("param") OrderChildReportParam param);
 
     @Select("<script>" +
-            "select sum(TIMESTAMPDIFF(SECOND,load_time,arrive_send_time)) from " + TABLE +
-            " where load_time is not null and and pay_time &gt;= #{beginTime} " +
+            "select avg(TIMESTAMPDIFF(SECOND,load_time,arrive_send_time)) from " + TABLE +
+            " where load_time is not null and pay_time &gt;= #{beginTime} " +
             " <if test = 'sendSystemAddressId != null'>and send_system_address_id = #{sendSystemAddressId} </if> " +
             " <if test = 'receiveSystemAddressId != null'>and receive_system_address_id = #{receiveSystemAddressId} </if> " +
 
@@ -102,8 +102,8 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
                         String beginTime);
 
     @Select("<script>" +
-            "select sum(TIMESTAMPDIFF(SECOND,unload_time,arrive_receive_time)) from " + TABLE +
-            " where unload_time is not null and and pay_time &gt;= #{beginTime} " +
+            "select avg(TIMESTAMPDIFF(SECOND,unload_time,arrive_receive_time)) from " + TABLE +
+            " where unload_time is not null and pay_time &gt;= #{beginTime} " +
             " <if test = 'sendSystemAddressId != null'>and send_system_address_id = #{sendSystemAddressId} </if> " +
             " <if test = 'receiveSystemAddressId != null'>and receive_system_address_id = #{receiveSystemAddressId} </if> " +
 

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

@@ -113,12 +113,12 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
 
         // 接单重车、卸车空车
         for (DriverTruckTraceVO item : truckTraceList) {
-            item.setTruckStatus(1);
+            item.setTruckStatus(2);
             if (orderChild.getCancelTime() != null){
-                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(orderChild.getCancelTime())){item.setTruckStatus(0);}
+                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(orderChild.getCancelTime())){item.setTruckStatus(1);}
             }
             if (orderChild.getUnloadTime() != null){
-                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(orderChild.getUnloadTime())){item.setTruckStatus(0);}
+                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(orderChild.getUnloadTime())){item.setTruckStatus(1);}
             }
         }
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnUserDao;
 import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnUserEnum;
 import com.clx.performance.model.vehiclewarn.VehicleWarnUser;
 import com.clx.performance.param.pc.vehiclewarn.*;
@@ -20,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -43,11 +45,12 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
         if (optional.isPresent()){
             throw new ServiceSystemException(ResultEnum.VEHICLE_WARN_USER_EXIST);
         }
-
+        List<Integer> warnTypeList = Arrays.stream(VehicleWarnConfigEnum.WarnType.values())
+                .map(item -> item.getCode()).collect(Collectors.toList());
         VehicleWarnUser vehicleWarnUser = new VehicleWarnUser();
         vehicleWarnUser.setName(param.getName());
         vehicleWarnUser.setMobile(param.getMobile());
-        vehicleWarnUser.setWarmTypeJson(JSON.toJSONString(new ArrayList<>()));
+        vehicleWarnUser.setWarmTypeJson(JSON.toJSONString(warnTypeList));
         vehicleWarnUser.setCreateBy(loginUserInfo.getUserName());
 
         vehicleWarnUserDao.saveEntity(vehicleWarnUser);