From e65cc97ef9567045b4899f7cadd11e8b577700fd Mon Sep 17 00:00:00 2001 From: xiang Date: Mon, 6 Oct 2025 11:20:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8A=82=E5=81=87=E6=97=A5=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/stock/data/schedule/DataMsgSendJob.java | 9 ++++++++- .../script/stock/data/schedule/StockDataPullJob.java | 5 +++-- .../script/xb/schedule/xb/FundInfoQueryJob.java | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java index 56d02fb..065683a 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java @@ -1,5 +1,7 @@ package com.xiang.xservice.application.script.stock.data.schedule; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.application.script.stock.data.common.constants.RedisConstants; @@ -8,6 +10,8 @@ import com.xiang.xservice.application.script.stock.data.service.DingTalkScriptSt import com.xiang.xservice.application.script.stock.data.service.IStockDataService; import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; import com.xiang.xservice.application.script.stock.gnshyx.service.ICloudRecordDataService; +import com.xiang.xservice.common.entity.DayResult; +import com.xiang.xservice.common.enums.RedisConstant; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -15,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.time.DayOfWeek; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; @@ -34,7 +39,9 @@ public class DataMsgSendJob { @Scheduled(cron = "0/10 * * * * ?") public void stockGetTargetMsgSend() { if (DateUtils.validWeekTime()) return; - + LocalDate now = LocalDate.now(); + JSONObject dayResult = (JSONObject) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY + RedisConstant.getDate4Key(), DateUtils.getDateFromDate(now)); + if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.toJavaObject(dayResult, DayResult.class))) return; StringBuilder msg = new StringBuilder(); List list = cloudRecordDataService.getList(); for (StockGnshyxRecordDataDO stockGnshyxRecordDataDO : list) { diff --git a/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java index 8be84e3..940b695 100644 --- a/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java +++ b/script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java @@ -1,6 +1,7 @@ package com.xiang.xservice.application.script.stock.data.schedule; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.cache.service.IRedisService; @@ -34,8 +35,8 @@ public class StockDataPullJob { public void sinaDataPullJob() { if (DateUtils.validWeekTime()) return; LocalDate now = LocalDate.now(); - String dayResult = (String) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY, DateUtils.getDateFromDate(now)); - if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.parseObject(dayResult, DayResult.class))) return; + JSONObject dayResult = (JSONObject) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY + RedisConstant.getDate4Key(), DateUtils.getDateFromDate(now)); + if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.toJavaObject(dayResult, DayResult.class))) return; log.info(">>>>>>>>>>>>>>>>>新浪财经数据拉取开始>>>>>>>>>>>>>>>>>"); List dataList = cloudRecordDataService.getList(); List result = Lists.newArrayList(); 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 fa19b5d..07e6e7d 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 @@ -75,8 +75,8 @@ public class FundInfoQueryJob { // 周六周日过滤 if (DateUtils.validWeekTime()) return; LocalDate now = LocalDate.now(); - String dayResult = (String) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY, DateUtils.getDateFromDate(now)); - if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.parseObject(dayResult, DayResult.class))) return; + com.alibaba.fastjson.JSONObject dayResult = (com.alibaba.fastjson.JSONObject) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY + RedisConstant.getDate4Key(), DateUtils.getDateFromDate(now)); + if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.toJavaObject(dayResult, DayResult.class))) return; List fundInfos = xbFundMapper.queryListIn2Min(); if (CollectionUtils.isEmpty(fundInfos)) {