Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

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

@@ -74,7 +74,6 @@ public class VehicleWarnInfoDaoImpl extends BaseDaoImpl<VehicleWarnInfoMapper, V
     public boolean updateByConfig(Integer warnConfigId, String warnName, Integer warnLevel) {
         return update(lUdWrapper()
                 .eq(VehicleWarnInfo::getWarnConfigId, warnConfigId)
-                .ne(VehicleWarnInfo::getStatus, VehicleWarnInfoEnum.Status.RESOLVE.getCode())
                 .set(VehicleWarnInfo::getWarnName, warnName)
                 .set(VehicleWarnInfo::getWarnLevel, warnLevel)
         );

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

@@ -2,9 +2,11 @@ package com.clx.performance.service.impl.vehiclewarn;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnConfigDao;
+import com.clx.performance.dao.vehiclewarn.VehicleWarnInfoDao;
 import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
 import com.clx.performance.model.vehiclewarn.VehicleWarnConfig;
+import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
 import com.clx.performance.param.pc.vehiclewarn.*;
 import com.clx.performance.service.vehiclewarn.VehicleWarnConfigService;
 import com.clx.performance.struct.vehiclewarn.VehicleWarnConfigStruct;
@@ -32,6 +34,9 @@ public class VehicleWarnConfigServiceImpl implements VehicleWarnConfigService {
     @Autowired
     private VehicleWarnConfigStruct vehicleWarnConfigStruct;
 
+    @Autowired
+    private VehicleWarnInfoDao vehicleWarnInfoDao;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void saveConfig(VehicleWarnConfigAddParam param) {
@@ -82,6 +87,10 @@ public class VehicleWarnConfigServiceImpl implements VehicleWarnConfigService {
         vehicleWarnConfig.setRadius(param.getRadius());
 
         vehicleWarnConfigDao.updateConfig(vehicleWarnConfig);
+        // 同步历史数据
+        VehicleWarnInfo vehicleWarnInfo = new VehicleWarnInfo();
+        vehicleWarnInfoDao.updateByConfig(vehicleWarnConfig.getId(), vehicleWarnInfo.getWarnName(), vehicleWarnInfo.getWarnLevel());
+
     }
     @Transactional(rollbackFor = Exception.class)
     @Override

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

@@ -22,9 +22,11 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.vehiclewarn.VehicleWarnChild;
 import com.clx.performance.model.vehiclewarn.VehicleWarnInfo;
 import com.clx.performance.model.vehiclewarn.VehicleWarnUser;
+import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.param.mq.vehiclewarn.VehicleWarnChildAddMqParam;
 import com.clx.performance.param.mq.vehiclewarn.VehicleWarnTruckWarnMqParam;
 import com.clx.performance.param.mq.vehiclewarn.VehicleWarnTruckWarnNoticeMqParam;
+import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.clx.performance.service.vehiclewarn.*;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -70,12 +72,22 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
     private OrderService orderService;
     @Autowired
     private VehicleWarnDelayWarnService vehicleWarnDelayWarnService;
+    @Autowired
+    private TruckTraceMqHandlerService truckTraceMqHandlerService;
 
     @Override
     public void orderChildAdd(VehicleWarnChildAddMqParam mq) {
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
+        // 同步车辆轨迹
+        TruckTraceSyncMqParam truckTraceSyncMqParam = new TruckTraceSyncMqParam();
+        truckTraceSyncMqParam.setChildNo(orderChild.getChildNo());
+        truckTraceSyncMqParam.setTruckNo(orderChild.getTruckNo());
+        truckTraceSyncMqParam.setBeginTime(LocalDateTimeUtils.formatTime(LocalDateTime.now().minusMinutes(5)));
+        truckTraceSyncMqParam.setEndTime(LocalDateTimeUtils.formatTime());
+        truckTraceMqHandlerService.truckTracSync(truckTraceSyncMqParam);
+
         // 计算预计时间
         BigDecimal[] currentPosition = vehicleWarnCommonService.getCurrentPosition(orderChild.getTruckNo(),
                 orderChild.getDriverUserNo());