运单预警

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/VehicleWarnMqHandlerServiceImpl.java

@@ -268,7 +268,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/utils/gd/GdService.java

@@ -356,4 +356,11 @@ public class GdService {
         return !Objects.isNull(value) && BigDecimal.ZERO.compareTo(value) != 0 ? value.setScale(2, 4) : BigDecimal.ZERO;
     }
 
+    public static void main(String[] args) {
+        List<GdRouteDTO> b2550e16bbc7bf9f6cd168e0f21709fc = getRoute("b2550e16bbc7bf9f6cd168e0f21709fc",
+                new BigDecimal("116.382589"), new BigDecimal("39.962763"),
+                new BigDecimal("116.4873220000"), new BigDecimal("39.9431020000"));
+
+        System.out.println(1);
+    }
 }