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
@@ -87,14 +87,13 @@ QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>(); queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE); //获取所有国控，省控，县控站点 String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_EN); String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_HH_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) { screen-job/src/main/resources/application-cjl.yml
@@ -18,9 +18,9 @@ application: name: screen-job redis: host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com host: r-bp1xdlb9wfc6zt0msppd18.redis.rds.aliyuncs.com port: 6379 password: QxPcRedis_moarl_2320 password: moral_123456 timeout: 30000 jedis: pool: @@ -35,9 +35,9 @@ max-wait: 30000 min-idle: 32 tokenRedis: host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com host: r-bp1xdlb9wfc6zt0msppd18.redis.rds.aliyuncs.com port: 6379 password: QxPcRedis_moarl_2320 password: moral_123456 timeout: 30000 database: 14 pool: @@ -55,9 +55,9 @@ filters: stat type: com.alibaba.druid.pool.DruidDataSource max-wait: 60000 url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso01.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: Qx_moralPc_2320 password: moral_123456 test-on-borrow: false sql-script-encoding: utf-8 pool-prepared-statements: true
