chore:测试提交

jinpengyong

2023-08-21 dcb98a36af4ad7823edd61a9c3388bd024db740f

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

@@ -12,6 +12,7 @@
import com.moral.api.service.HistorySecondCruiserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SpecialDeviceService;
import com.moral.api.util.RoadUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -24,9 +25,13 @@
import org.springframework.util.ObjectUtils;

import java.sql.Wrapper;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
@@ -97,6 +102,7 @@
    @Override
    public List<SpecialDevice> selectCruisers() {
        QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
        wrapper.select("name","mac");
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        List<SpecialDevice> specialDevices = specialDeviceMapper.selectList(wrapper);
        return specialDevices;
@@ -108,7 +114,8 @@
     * @return
     */
    @Override
    public List<CruiserDTO> getCruiserInFo(Map<String, Object> params) {
    public Map<String,Object> getCruiserInFo(Map<String, Object> params) {
        HashMap<String, Object> map = new HashMap<>();
        params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
        List<CruiserDTO> data = historySecondCruiserMapper.getCruiserInfo(params);
        List<CruiserDTO> rsCruiser = data.stream().distinct().collect(Collectors.toList());
@@ -118,6 +125,18 @@
            }
            double lon = o.getFlyLon();
            double lat = o.getFlyLat();
            double[] doubles = RoadUtils.transformWGS84ToBD09(lon, lat);
            Matcher matcher = Pattern.compile("\\d*\\.\\d{8}").matcher(""+doubles[0]);
            matcher.find();
            String s = matcher.group();
            Matcher matcher1 = Pattern.compile("\\d*\\.\\d{8}").matcher(""+doubles[1]);
            matcher1.find();
            String s1 = matcher1.group();
            o.setFlyLon(Double.parseDouble(s));
            o.setFlyLat(Double.parseDouble(s1));
            o.setData(lon+"_"+lat);
//            o.setFlyLon(doubles[0]);
//            o.setFlyLat(doubles[1]);
            if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
                return true;
            }
@@ -126,8 +145,13 @@
        if(CollectionUtils.isEmpty(data)){
            return null;
        }
        map.put("rsData",rsCruiser);
        log.info(data.size()+"");
        log.info(rsCruiser.size()+"");
        return rsCruiser;
        return map;
    }




}