blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-10-13 100690a225167806a08f64eafff3326564a7154a 
 screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java


@@ -1,31 +1,5 @@


package com.moral.api.service.impl;




import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import java.util.ArrayList;


import java.util.Collection;


import java.util.Date;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.Objects;


import java.util.concurrent.TimeUnit;


import java.util.regex.Matcher;


import java.util.regex.Pattern;


import java.util.stream.Collectors;




import javax.servlet.http.HttpServletRequest;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.entity.ManageAccount;


@@ -36,11 +10,24 @@


import com.moral.api.pojo.redisBean.AccountInfoDTO;


import com.moral.api.service.ManageCoordinateDetailService;


import com.moral.api.util.RoadUtils;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;


import com.moral.util.TokenUtils;


import com.sun.org.apache.regexp.internal.RE;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import javax.servlet.http.HttpServletRequest;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.regex.Matcher;


import java.util.regex.Pattern;


import java.util.stream.Collectors;






@Service


@@ -171,10 +158,15 @@


            String[] rs = data.split("_");


            String flyLon = rs[0];


            String flyLat = rs[1];


//            double lonDouble = Double.parseDouble(flyLon);


//            double latDouble = Double.parseDouble(flyLat);


            for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {


                String latitude = manageCoordinateDetail.getLatitude().toString();


                String longitude = manageCoordinateDetail.getLongitude().toString();


                if (latitude.equals(flyLat) && longitude.equals(flyLon)){


//                double lonDouble1 = Double.parseDouble(longitude);


//                double latDouble1 = Double.parseDouble(latitude);


//                if (latDouble1==latDouble && lonDouble==lonDouble1){


                if (flyLon.equals(longitude) && flyLat.equals(latitude)){


                    manageCoordinateDetail.setCode(data);


                    manageCoordinateDetail.setLongitude(cruiserDTO.getFlyLon());


                    manageCoordinateDetail.setLatitude(cruiserDTO.getFlyLat());


@@ -205,7 +197,7 @@


        queryWrapper.eq("coordinate_id",coordinateId);


        String time1 = params.remove("time1").toString();


        String time2 = params.remove("time2").toString();


        long l = DateUtils.compareDateStr(time1, time2);


        long l = DateUtils.compareDateStrDay(time1, time2);


        if (l>0){


            params.put("time1",time1);


            params.put("time2",time2);


@@ -216,6 +208,7 @@


        int j =0;


        List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);


        List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);


        cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());


        if (ObjectUtils.isEmpty(manageCoordinateDetails)){


            for (CruiserDTO cruiserDTO : cruiserInfo) {


                Double flyLat = cruiserDTO.getFlyLat();


@@ -239,7 +232,10 @@


                for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {


                    String latitude = manageCoordinateDetail.getLatitude().toString();


                    String longitude = manageCoordinateDetail.getLongitude().toString();


                    if (latitude.equals(flyLat+"") && longitude.equals(flyLon+"")){


//                    double lonDouble1 = Double.parseDouble(longitude);


//                    double latDouble1 = Double.parseDouble(latitude);


//                    if (lonDouble1==flyLon && flyLat==latDouble1 ){


                    if (longitude.equals(flyLon+"") && latitude.equals(flyLat+"")){


                        cruiserInfo.remove(i);


                        break;


                    }