chore:测试提交

jinpengyong

2023-08-23 9fa8e33b3085eb3a52b1d7d575fda67ad495810f

 screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java

@@ -30,6 +30,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -116,10 +117,16 @@
    @Override
    public Map<String,Object> getCruiserInFo(Map<String, Object> params) {
        HashMap<String, Object> map = new HashMap<>();
        String mac = params.get("mac").toString();
        String time1 = params.get("time1").toString();
        params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
        List<CruiserDTO> data = historySecondCruiserMapper.getCruiserInfo(params);
        List<CruiserDTO> rsCruiser = data.stream().distinct().collect(Collectors.toList());
        rsCruiser.removeIf(o->{
        ArrayList<Object> list = new ArrayList<>();
        List<CruiserDTO> data = (List<CruiserDTO>) redisTemplate.opsForHash().get(RedisConstants.DATE_COORDINATE, mac + time1);
//        List<CruiserDTO> data = (List<CruiserDTO>) redisTemplate.opsForValue().get(mac + time1);
        if (ObjectUtils.isEmpty(data)){
            data = historySecondCruiserMapper.getCruiserInfo(params);
            data = data.stream().distinct().collect(Collectors.toList());
            data.removeIf(o->{
            if (ObjectUtils.isEmpty(o.getFlyLon()) || ObjectUtils.isEmpty(o.getFlyLat())) {
                return true;
            }
@@ -142,12 +149,19 @@
            }
            return false;
        });
        if(CollectionUtils.isEmpty(data)){
            return null;

            redisTemplate.opsForHash().put(RedisConstants.DATE_COORDINATE,mac+time1,data);
            //设置过期时间
            redisTemplate.opsForHash().getOperations().expire(RedisConstants.DATE_COORDINATE,600, TimeUnit.SECONDS);

        }
        map.put("rsData",rsCruiser);

//        redisTemplate.opsForValue().set(mac+time1,rsCruiser,600, TimeUnit.SECONDS);

        map.put("rsData",data);
        map.put("data",list);
        log.info(data.size()+"");
        log.info(rsCruiser.size()+"");
        log.info(data.size()+"");
        return map;
    }