diff --git a/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java index a5ecd43..c703d51 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java @@ -76,7 +76,7 @@ public class FundInfoQueryJob { if (DateUtils.validWeekTime()) return; LocalDate now = LocalDate.now(); com.alibaba.fastjson.JSONObject dayResult = (com.alibaba.fastjson.JSONObject) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY + RedisConstant.getDate4Key(), DateUtils.getDateFromDate(now)); - com.xiang.xservice.common.utils.DateUtils dateUtils = new com.xiang.xservice.common.utils.DateUtils(); + com.xiang.xservice.common.utils.DateUtils dateUtils = new com.xiang.xservice.common.utils.DateUtils(redisService); if (dateUtils.validHoliday(JSON.toJavaObject(dayResult, DayResult.class))) return; List fundInfos = xbFundMapper.queryListIn2Min(); diff --git a/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java b/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java index 6b55a9c..b3a708e 100644 --- a/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java +++ b/script/src/main/java/com/xiang/xservice/common/utils/DateUtils.java @@ -1,31 +1,25 @@ package com.xiang.xservice.common.utils; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.common.entity.DayResult; -import com.xiang.xservice.common.enums.RedisConstant; +import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import java.time.LocalDate; - /** * @Author: xiang * @Date: 2025-10-04 10:34 */ @Slf4j @RequiredArgsConstructor +@AllArgsConstructor public class DateUtils { private IRedisService redisService; public Boolean validHoliday(DayResult result) { - LocalDate now = LocalDate.now(); - JSONObject dayResult = (JSONObject) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY + RedisConstant.getDate4Key(), com.xiang.xservice.basic.utils.DateUtils.getDateFromDate(now)); - DayResult day = JSON.toJavaObject(dayResult, DayResult.class); - if (validHolidayTime(day.getDate(), day.getStatusDesc(), day.getWeek(), day.getStatus())) + if (validHolidayTime(result.getDate(), result.getStatusDesc(), result.getWeek(), result.getStatus())) return Boolean.TRUE; return Boolean.FALSE; }