fix:国控站显示提交

swb

2024-11-15 da0cb6ec9344641c5d1820e099131b58149b3fbc

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

@@ -53,11 +53,10 @@
    public void sort(String startTime, String endTime) {

        if (ObjectUtils.isEmpty(startTime)&&ObjectUtils.isEmpty(endTime)){
            //当前时间的前一个小时
            startTime = DateUtils.getDateStringOfHour(-2, "yyyy-MM-dd HH:00:00");

            //当前时间的前一天
            startTime = DateUtils.getDateStringOfDay(-1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            //获取当前时间
            endTime = DateUtils.getCurDate("yyyy-MM-dd HH:00:00");
            endTime = DateUtils.getCurDate(DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        }
        List<HistorySecondCruiser> result = historySecondCruiserMapper.getResult(startTime, endTime);

@@ -103,7 +102,7 @@
                            if (latDouble1==latDouble && lonDouble1==lonDouble){
                                Double dustld = Objects.nonNull(dust.get("dustld"))?Double.parseDouble(dust.get("dustld").toString()):0d;
                                doubleArrayList.add(dustld);
                                break;
//                                break;
                            }
                        }
                    }
@@ -116,7 +115,7 @@
                    secondCruiserSort.setValue(rsAvg);
                    secondCruiserSort.setMac(mac);
                    secondCruiserSort.setOrganizationId(organizationId);
                    secondCruiserSort.setTime(endTime);
                    secondCruiserSort.setTime(startTime);
                    list1.add(secondCruiserSort);
                }
            }