chore:测试提交

jinpengyong

2023-09-07 2277cbd6588335980bfebe9407a5f38348ae1341

chore:测试提交

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

@@ -305,29 +305,29 @@
            for (DustldDTO dustldDTO : dustldDTOS) {
                String flyLat = dustldDTO.getFlyLat();
                String flyLon = dustldDTO.getFlyLon();
//                if (flyLon==null && flyLat==null){
//                    continue;
//                }
                if (flyLon==null && flyLat==null){
                    continue;
                }
                double latDouble1 = Double.parseDouble(flyLat);
                double lonDouble1 = Double.parseDouble(flyLon);
                for (Map<String, Object> dust : dusts) {
                    String flyLat1 = Objects.nonNull(dust.get("flyLat")) ? dust.get("flyLat").toString() :"0";
                    String flyLon1 = Objects.nonNull(dust.get("flyLon")) ? dust.get("flyLon").toString() :"0";
                    double latDouble = Double.parseDouble(flyLat1);
                    double lonDouble = Double.parseDouble(flyLon1);
//                    String flyLon1 = dust.get("flyLon").toString();
                    if (flyLat1.equals(flyLat) && flyLon1.equals(flyLon)){
                    if (latDouble1==latDouble && lonDouble1==lonDouble){
                        Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;

                        if (dustld>=0 && dustld<40 ){
                            dustld = dustld + 170;
                        }
                        if (dustld>=40 && dustld<60 ){
                        }else if (dustld>=40 && dustld<60){
                            dustld = dustld + 130;
                        }
                        if (dustld>=60 && dustld<100 ){
                        }else if (dustld>=60 && dustld<100 ){
                            dustld = dustld + 110;
                        }
                        if (dustld>=100 && dustld<150 ){
                        }else if (dustld>=100 && dustld<150){
                            dustld = dustld + 70;
                        }
                        if (dustld>=150 && dustld<180 ){
                        }else if (dustld>=150 && dustld<180){
                            dustld = dustld + 30;
                        }
                        doubleArrayList.add(dustld);

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

@@ -224,10 +224,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());

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

@@ -171,10 +171,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());
@@ -216,6 +221,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 +245,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;
                    }