`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/vo/TblCarInfoVo.java

@@ -107,5 +107,7 @@ public class TblCarInfoVo implements Serializable {
     @ExcelProperty(value = "扩展2")
     private String ext2;
 
+    private Object location;
+
 
 }

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.util.CamelDataUtil;
 import org.dromara.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,10 +42,9 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
      */
     @Override
     public TblCarInfoVo queryById(Long id){
-        MessageUtils.sendLed("0001", "hello");
-
-        MessageUtils.sendTTs("0001", "hello");
-        return baseMapper.selectVoById(id);
+        TblCarInfoVo carInfoVo = baseMapper.selectVoById(id);
+        carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", id)));
+        return carInfoVo;
     }
 
     /**
@@ -54,6 +54,9 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
     public TableDataInfo<TblCarInfoVo> queryPageList(TblCarInfoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TblCarInfo> lqw = buildQueryWrapper(bo);
         Page<TblCarInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(carInfoVo -> {
+            carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", carInfoVo.getId())));
+        });
         return TableDataInfo.build(result);
     }
 
@@ -63,7 +66,11 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
     @Override
     public List<TblCarInfoVo> queryList(TblCarInfoBo bo) {
         LambdaQueryWrapper<TblCarInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<TblCarInfoVo> list =baseMapper.selectVoList(lqw);
+        list.forEach(carInfoVo -> {
+            carInfoVo.setLocation(RedisUtils.getCacheObject(StringUtils.format("gps_{}", carInfoVo.getId())));
+        });
+        return list;
     }
 
     private LambdaQueryWrapper<TblCarInfo> buildQueryWrapper(TblCarInfoBo bo) {

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CamelDataUtil.java

@@ -100,6 +100,7 @@ public class CamelDataUtil {
                             if(carInfoVos1.size()>0){
                                 // 查询车辆信息
                                 TblCarInfoVo carInfoVo1 = carInfoVos1.get(0);
+                                RedisUtils.setCacheObject(StringUtils.format("gps_{}", carInfoVo1.getId()), gpsData);
                                 TblCarScheduleBo tblCarScheduleBo = new TblCarScheduleBo();
                                 tblCarScheduleBo.setCarNum(carInfoVo1.getCarNum());
                                 Map<String, Object> map = Map.of("scheduleDate", DateUtils.parseDate(DateUtils.getDate()+" 00:00:00") );