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

performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java

 package com.clx.performance.controller.temp;
 
+import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.param.temp.DriverTraceAddParam;
 import com.clx.performance.param.temp.TruckTraceAddParam;
 import com.clx.performance.service.trace.TruckTraceService;
+import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.vo.pc.trace.DriverTraceVO;
 import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
 import com.msl.common.result.Result;
@@ -32,6 +34,9 @@ public class TempTraceController {
     @Autowired
     private TruckTraceService truckTraceService;
 
+    @Autowired
+    private GdService gdService;
+
     @ApiOperation(value = "车辆轨迹同步", notes = "<br>By:艾庆国")
     @PostMapping("/truckTraceSync")
     public Result truckTraceSync(@RequestBody TruckTraceAddParam param) {
@@ -71,4 +76,15 @@ public class TempTraceController {
         return Result.ok(truckTraceService.getCurrentTruckPosition(truckNo));
     }
 
+    @ApiOperation(value = "线路规划", notes = "<br>By:艾庆国")
+    @PostMapping("/route")
+    public Result<List<GdRouteDTO>> route(BigDecimal originLongitude, BigDecimal originLatitude,
+                                                             BigDecimal destinationLongitude, BigDecimal destinationLatitude) {
+
+        List<GdRouteDTO> gdRouteDTOS = gdService.getRoute(originLongitude, originLatitude, destinationLongitude, destinationLatitude);
+
+
+        return Result.ok(gdRouteDTOS);
+    }
+
 }

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

@@ -5,9 +5,9 @@ import com.clx.performance.enums.vehiclewarn.VehicleWarnRangEnum;
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnRangMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnRang;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
@@ -19,8 +19,18 @@ public class VehicleWarnRangeDaoImpl extends BaseDaoImpl<VehicleWarnRangMapper,
         return list(lQrWrapper()
                         .eq(VehicleWarnRang::getWarnConfigId, warnConfigId)
                         .eq(VehicleWarnRang::getStatus, VehicleWarnRangEnum.Status.ENABLE.getCode())
-                        .le(VehicleWarnRang::getWarnEndTime, LocalDateTime.now())
                         .orderByDesc(VehicleWarnRang::getId)
                 );
     }
+
+    @Override
+    public boolean updateDisable(VehicleWarnRang item) {
+        return update(lUdWrapper()
+                .eq(VehicleWarnRang::getWarnConfigId, item.getWarnConfigId())
+                .eq(VehicleWarnRang::getWarnRang, item.getWarnRang())
+                .eq(StringUtils.isNotBlank(item.getOrderGoodsNo()), VehicleWarnRang::getOrderGoodsNo, item.getOrderGoodsNo())
+                .eq(StringUtils.isNotBlank(item.getChildNo()), VehicleWarnRang::getChildNo, item.getChildNo())
+                .set(VehicleWarnRang::getStatus, VehicleWarnRangEnum.Status.DISABLE.getCode())
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/vehiclewarn/VehicleWarnRangeDao.java

@@ -9,4 +9,5 @@ import java.util.List;
 public interface VehicleWarnRangeDao extends BaseDao<VehicleWarnRangMapper, VehicleWarnRang, Integer> {
     List<VehicleWarnRang> ListByWarnConfigId(Integer warnConfigId);
 
+    boolean updateDisable(VehicleWarnRang item);
 }

performance-web/src/main/java/com/clx/performance/dto/vehiclewarn/VehicleWarnCommonInfoDTO.java

@@ -14,6 +14,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 public class VehicleWarnCommonInfoDTO {
 
+    String childNo;                 //运单
     BigDecimal[] currentPosition;   //当前位置
 
     Integer sendAddressDistance;    //距货源地址距离

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

@@ -274,44 +274,50 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         String endTime = LocalDateTimeUtils.formatTime();
 
         // 车辆
+        // 非停留最大时间
         List<TruckTraceESPlus> list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
                 .eq(TruckTraceESPlus::getTruckNo, truckNo)
-                .gt(TruckTraceESPlus::getSpeed, PARK_SPEED)
+                .ge(TruckTraceESPlus::getSpeed, PARK_SPEED)
                 .ge(TruckTraceESPlus::getGpsTime, beginTime)
                 .le(TruckTraceESPlus::getGpsTime, endTime)
-                .orderByAsc("gpsTime")
+                .orderByDesc("gpsTime")
                 .limit(1)
         );
         if (!list.isEmpty()){
+            // 停留时间段
             list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
                     .eq(TruckTraceESPlus::getTruckNo, truckNo)
-                    .gt(TruckTraceESPlus::getSpeed, PARK_SPEED)
+                    .lt(TruckTraceESPlus::getSpeed, PARK_SPEED)
                     .gt(TruckTraceESPlus::getGpsTime, list.get(0).getGpsTime())
                     .le(TruckTraceESPlus::getGpsTime, endTime)
                     .orderByDesc("gpsTime")
             );
+            if (!list.isEmpty()) {
+                // 停留时长
                 return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(0).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime())).toMinutes();
-
+            }
         }
 
         // 司机
         List<DriverTraceESPlus> list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                 .eq(DriverTraceESPlus::getUserNo, userNo)
-                .gt(DriverTraceESPlus::getSpeed, PARK_SPEED)
+                .ge(DriverTraceESPlus::getSpeed, PARK_SPEED)
                 .ge(DriverTraceESPlus::getPositionTime, beginTime)
                 .le(DriverTraceESPlus::getPositionTime, endTime)
-                .orderByAsc("positionTime")
+                .orderByDesc("positionTime")
                 .limit(1)
         );
         if (!list1.isEmpty()){
             list1 = driverTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<DriverTraceESPlus>()
                     .eq(DriverTraceESPlus::getUserNo, userNo)
-                    .gt(DriverTraceESPlus::getSpeed, PARK_SPEED)
-                    .ge(DriverTraceESPlus::getPositionTime, list1.get(0).getPositionTime())
+                    .lt(DriverTraceESPlus::getSpeed, PARK_SPEED)
+                    .gt(DriverTraceESPlus::getPositionTime, list1.get(0).getPositionTime())
                     .le(DriverTraceESPlus::getPositionTime, endTime)
                     .orderByDesc("positionTime")
             );
-            return (int)Duration.between(LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime())).toMinutes();
+            if (!list1.isEmpty()) {
+                return (int) Duration.between(LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime())).toMinutes();
+            }
         }
 
         return 0;

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

@@ -54,6 +54,9 @@ public class VehicleWarnCommonServiceImpl implements VehicleWarnCommonService {
 
             vehicleWarnInfo.setWarnTime(LocalDateTime.now());
             vehicleWarnInfoDao.updateWarnTime(vehicleWarnInfo);
+
+            // 发送mq （预警通知）
+            vehicleWarnMqService.truckWarnNotice(vehicleWarnInfo.getId());
             return;
         }
 
@@ -121,6 +124,7 @@ public class VehicleWarnCommonServiceImpl implements VehicleWarnCommonService {
     @Override
     public BigDecimal[] getCurrentPosition(String truckNo, Long userNo){
         BigDecimal[] currentPosition = truckTraceService.getCurrentPosition(truckNo, userNo);
+        log.info("获取车辆位置, truckNo:{}, userNo:{}, currentPosition:{}", truckNo, userNo, currentPosition);
         return currentPosition;
     }
 

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

@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao;
+import com.clx.performance.dao.vehiclewarn.VehicleWarnRangeDao;
 import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnInfoEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnLogEnum;
+import com.clx.performance.enums.vehiclewarn.VehicleWarnRangEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
 import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
+import com.clx.performance.model.vehiclewarn.VehicleWarnRang;
 import com.clx.performance.param.pc.vehiclewarn.PageVehicleWarnInfoParam;
 import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoResolveUpdateParam;
 import com.clx.performance.param.pc.vehiclewarn.VehicleWarnInfoSuspendUpdateParam;
@@ -32,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -44,6 +48,8 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
     @Autowired
     private VehicleWarnLogDao vehicleWarnLogDao;
     @Autowired
+    private VehicleWarnRangeDao vehicleWarnRangeDao;
+    @Autowired
     private OrderChildDao orderChildDao;
 
     @Autowired
@@ -56,10 +62,11 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
     @Override
     public void updateSuspend(VehicleWarnInfoSuspendUpdateParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        LocalDateTime endTime = LocalDateTimeUtils.parseTime(param.getWarnEndTime());
 
         VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
-        vehicleWarnInfo.setSuspendTime(LocalDateTimeUtils.parseTime(param.getWarnEndTime()));
+        vehicleWarnInfo.setSuspendTime(endTime);
         vehicleWarnInfoDao.updateSuspendTime(vehicleWarnInfo, param.getWarnRang());
 
         VehicleWarnLog vehicleWarnLog = new VehicleWarnLog();
@@ -69,11 +76,29 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
         vehicleWarnLog.setChildNo(vehicleWarnInfo.getChildNo());
         vehicleWarnLog.setWarnName(vehicleWarnInfo.getWarnName());
         vehicleWarnLog.setWarnRang(param.getWarnRang());
-        vehicleWarnLog.setWarnEndTime(LocalDateTimeUtils.parseTime(param.getWarnEndTime()));
+        vehicleWarnLog.setWarnEndTime(endTime);
         vehicleWarnLog.setWarnTime(vehicleWarnInfo.getWarnTime());
         vehicleWarnLog.setCreateBy(loginUserInfo.getUserName());
-
         vehicleWarnLogDao.saveEntity(vehicleWarnLog);
+
+        VehicleWarnRang vehicleWarnRang = new VehicleWarnRang();
+        vehicleWarnRang.setWarnConfigId(vehicleWarnInfo.getWarnConfigId());
+        vehicleWarnRang.setWarnName(vehicleWarnInfo.getWarnName());
+        vehicleWarnRang.setWarnRang(param.getWarnRang());
+        vehicleWarnRang.setOrderGoodsNo(
+                Objects.equals(param.getWarnRang(), VehicleWarnRangEnum.WarnRange.ORDER_GOODS.getCode())
+                        ? vehicleWarnInfo.getOrderGoodsNo() : null);
+        vehicleWarnRang.setChildNo(
+                Objects.equals(param.getWarnRang(), VehicleWarnRangEnum.WarnRange.CHILD.getCode())
+                        ? vehicleWarnInfo.getChildNo() : null);
+        vehicleWarnRang.setWarnEndTime(endTime);
+        vehicleWarnRang.setStatus(VehicleWarnRangEnum.Status.ENABLE.getCode());
+        vehicleWarnRang.setCreateBy(loginUserInfo.getUserName());
+
+        // 禁用旧数据
+        vehicleWarnRangeDao.updateDisable(vehicleWarnRang);
+        // 新增新数据
+        vehicleWarnRangeDao.saveEntity(vehicleWarnRang);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -113,8 +138,8 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
         if (orderChild.getFinishTime() != null) {endTime = orderChild.getFinishTime();}
         if (endTime.isAfter(beginTime.plusDays(TRUCK_TRACE_DAY_MAX))) {endTime = beginTime.plusDays(TRUCK_TRACE_DAY_MAX);}      //最多查询3天
 
-        List<DriverTruckTraceVO> truckTraceList = truckTraceService.listTruckTraceByTime(vehicleWarnInfo.getTruckNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime));
-        List<DriverTraceVO> driverTraceList = truckTraceService.listDriverTraceByTime(vehicleWarnInfo.getDriverUserNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime));
+        List<DriverTruckTraceVO> truckTraceList = truckTraceService.calcTruckStayTime(truckTraceService.listTruckTraceByTime(vehicleWarnInfo.getTruckNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime)));
+        List<DriverTraceVO> driverTraceList = truckTraceService.calcDriverStayTime(truckTraceService.listDriverTraceByTime(vehicleWarnInfo.getDriverUserNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime)));
 
         // 接单重车、卸车空车
         for (DriverTruckTraceVO item : truckTraceList) {

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

@@ -107,8 +107,9 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         VehicleWarnChild vehicleWarnChild = vehicleWarnChildDao.findByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
         VehicleWarnCommonInfoDTO commonInfo = new VehicleWarnCommonInfoDTO();
-        commonInfo.setLastArriveSendTime(orderGoods.getLastArriveReceiveTime());
-        commonInfo.setLastArriveReceiveTime(orderGoods.getLastArriveSendTime());
+        commonInfo.setChildNo(orderChild.getChildNo());
+        commonInfo.setLastArriveSendTime(orderGoods.getLastArriveSendTime());
+        commonInfo.setLastArriveReceiveTime(orderGoods.getLastArriveReceiveTime());
         commonInfo.setCurrentTime(LocalDateTime.now());
 
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
@@ -270,7 +271,8 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         if (vehicleWarnInfo.getWarnLevel() == 2){   //2级短信
             sendSms(mobileList, vehicleWarnInfo.getWarnName(), vehicleWarnInfo.getTruckNo(), vehicleWarnInfo.getChildNo());
         }
-        else if (vehicleWarnInfo.getWarnLevel() == 3) {   //3级外呼
+        else if (vehicleWarnInfo.getWarnLevel() == 3) {   //3级外呼+短信
+            sendSms(mobileList, vehicleWarnInfo.getWarnName(), vehicleWarnInfo.getTruckNo(), vehicleWarnInfo.getChildNo());
             sendClink(mobileList, vehicleWarnInfo.getWarnName(), vehicleWarnInfo.getTruckNo(), vehicleWarnInfo.getChildNo());
         }
 

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

@@ -73,7 +73,7 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
     }
 
 
-    private void doParkTimeout(OrderChild orderChild, VehicleWarnChild vehicleWarnChild, VehicleWarnConfig vehicleWarnConfig, int parkTimee){
+    private void doParkTimeout(OrderChild orderChild, VehicleWarnChild vehicleWarnChild, VehicleWarnConfig vehicleWarnConfig, int parkTime){
         VehicleWarnInfo vehicleWarnInfo = vehicleWarnInfoDao.findByChildNoAndWarnConfigId(vehicleWarnChild.getChildNo(), vehicleWarnConfig.getId()).orNull();
         if (vehicleWarnInfo != null && Objects.equals(vehicleWarnInfo.getStatus(), VehicleWarnInfoEnum.Status.RESOLVE.getCode())){
             return;
@@ -85,7 +85,7 @@ public class VehicleWarnParkWarnServiceImpl implements VehicleWarnParkWarnServic
 
         // 超时判断
         int time = vehicleWarnConfig.getTimeoutRatio().multiply(new BigDecimal(MIN_FER_HOUR)).intValue();
-        if (parkTimee > time){return;}
+        if (parkTime > time){return;}
 
         // 更新
         vehicleWarnCommonService.vehicleWarnInfoUpdate(orderChild, vehicleWarnInfo, vehicleWarnConfig);

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

@@ -28,10 +28,8 @@ public interface TruckTraceService {
     List<List<DriverTraceVO>> splitDriverTrace(List<DriverTraceVO> driverTraceList);
 
 
-    //计算车辆的停留结束时间
     List<DriverTruckTraceVO> calcTruckStayTime(List<DriverTruckTraceVO> traceList);
 
-    //计算司机的停留结束时间
     List<DriverTraceVO> calcDriverStayTime(List<DriverTraceVO> traceList);
 
     List<List<DriverTruckTraceVO>> splitTruckTrace(List<DriverTruckTraceVO> traceList);

performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnInfoSqlProvider.java

@@ -18,8 +18,7 @@ public class VehicleWarnInfoSqlProvider {
 
             SELECT("*");
             FROM(TABLE);
-
-            if (StringUtils.isNotBlank(param.getWarnName())) {WHERE("warn_name = #{param.warnName}");}
+            if (StringUtils.isNotBlank(param.getWarnName())) {WHERE("warn_name like CONCAT('%', #{param.warnName},'%')");}
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (Objects.nonNull(param.getWarnType())) {WHERE("warn_type = #{param.warnType}");}
             if (Objects.nonNull(param.getWarnLevel())) {WHERE("warn_level = #{param.warnLevel}");}