fix:秒级数据调整补充提交

cjl

2023-10-13 fc4f8786cbc684bda0937fa54fbb3db569b537fc

fix:秒级数据调整补充提交

 screen-common/src/main/java/com/moral/util/DateUtils.java

@@ -291,7 +291,7 @@
    }

    /**
     * 转化dateTimeStr为Date类型
     * 转化dateTimeStr为Date类型 去除时间
     *
     * @param dateTimeStr
     * @return

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

@@ -90,11 +90,12 @@
        String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_EN);

        List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
        Date time = DateUtils.dataToTimeStampTime(DateUtils.convertDate(time1), DateUtils.yyyy_MM_dd_HH_EN);
        Date time = DateUtils.dataToTimeStampTime(DateUtils.getDate(time1, DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN);

        //String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        String timeStr = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);


        List<HistoryAqi> historyAqis = new ArrayList<>();

        for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {