xservice/xservice-script
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 节假日校验

Browse Source
This commit is contained in:
xiang
2025-10-06 11:20:52 +08:00
parent 97b4b6a1a8
commit e65cc97ef9
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/DataMsgSendJob.java
View File

@@ -1,5 +1,7 @@
package com.xiang.xservice.application.script.stock.data.schedule; 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.basic.utils.DateUtils;
import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.cache.service.IRedisService;
import com.xiang.xservice.application.script.stock.data.common.constants.RedisConstants; 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.data.service.IStockDataService;
import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO; import com.xiang.xservice.application.script.stock.gnshyx.entity.StockGnshyxRecordDataDO;
import com.xiang.xservice.application.script.stock.gnshyx.service.ICloudRecordDataService; 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.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -15,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.DayOfWeek; import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.List; import java.util.List;
@@ -34,7 +39,9 @@ public class DataMsgSendJob {
@Scheduled(cron = "0/10 * * * * ?") @Scheduled(cron = "0/10 * * * * ?")
public void stockGetTargetMsgSend() { public void stockGetTargetMsgSend() {
if (DateUtils.validWeekTime()) return; 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(); StringBuilder msg = new StringBuilder();
List<StockGnshyxRecordDataDO> list = cloudRecordDataService.getList(); List<StockGnshyxRecordDataDO> list = cloudRecordDataService.getList();
for (StockGnshyxRecordDataDO stockGnshyxRecordDataDO : list) { for (StockGnshyxRecordDataDO stockGnshyxRecordDataDO : list) {

5
script/src/main/java/com/xiang/xservice/application/script/stock/data/schedule/StockDataPullJob.java
View File

@@ -1,6 +1,7 @@
package com.xiang.xservice.application.script.stock.data.schedule; package com.xiang.xservice.application.script.stock.data.schedule;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.xiang.xservice.basic.utils.DateUtils; import com.xiang.xservice.basic.utils.DateUtils;
import com.xiang.xservice.cache.service.IRedisService; import com.xiang.xservice.cache.service.IRedisService;
@@ -34,8 +35,8 @@ public class StockDataPullJob {
public void sinaDataPullJob() { public void sinaDataPullJob() {
if (DateUtils.validWeekTime()) return; if (DateUtils.validWeekTime()) return;
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String dayResult = (String) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY, DateUtils.getDateFromDate(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.parseObject(dayResult, DayResult.class))) return; if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.toJavaObject(dayResult, DayResult.class))) return;
log.info(">>>>>>>>>>>>>>>>>新浪财经数据拉取开始>>>>>>>>>>>>>>>>>"); log.info(">>>>>>>>>>>>>>>>>新浪财经数据拉取开始>>>>>>>>>>>>>>>>>");
List<StockGnshyxRecordDataDO> dataList = cloudRecordDataService.getList(); List<StockGnshyxRecordDataDO> dataList = cloudRecordDataService.getList();
List<StockSinaDataRecordDO> result = Lists.newArrayList(); List<StockSinaDataRecordDO> result = Lists.newArrayList();

4
script/src/main/java/com/xiang/xservice/application/script/xb/schedule/xb/FundInfoQueryJob.java
View File

@@ -75,8 +75,8 @@ public class FundInfoQueryJob {
// 周六周日过滤 // 周六周日过滤
if (DateUtils.validWeekTime()) return; if (DateUtils.validWeekTime()) return;
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String dayResult = (String) redisService.hGet(RedisConstant.DAY_INFO_PREFIX_KEY, DateUtils.getDateFromDate(now)); 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.parseObject(dayResult, DayResult.class))) return; if (com.xiang.xservice.common.utils.DateUtils.validHoliday(JSON.toJavaObject(dayResult, DayResult.class))) return;
List<com.xiang.xservice.application.script.xb.entity.pojo.xb.FundInfo> fundInfos = xbFundMapper.queryListIn2Min(); List<com.xiang.xservice.application.script.xb.entity.pojo.xb.FundInfo> fundInfos = xbFundMapper.queryListIn2Min();
if (CollectionUtils.isEmpty(fundInfos)) { if (CollectionUtils.isEmpty(fundInfos)) {