From da7832cb294228904bc78e9eb3719502c94423a1 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 6 Aug 2025 11:35:59 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=AF=8F=E5=B9=B4=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=97=B4=E7=94=9F=E6=88=90=E6=98=A5=E5=A4=8F?= =?UTF-8?q?=E7=A7=8B=E5=86=AC=E5=AD=A3=E8=8A=82=E6=A0=87=E8=AF=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/constant/Constants.java | 3 +++ .../controller/DailyTaskController.java | 7 +++++ .../java/com/ruoyi/quartz/task/XktTask.java | 27 +++++++++++++------ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index b72d4d9b7..4b5051f25 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -220,6 +220,9 @@ public class Constants public static final String EXPRESS_REGION_NAME_MAP_CACHE_KEY = "EXPRESS_REGION_NAME_MAP"; public static final String EXPRESS_REGION_LIST_CACHE_KEY = "EXPRESS_REGION_LIST"; public static final String EXPRESS_REGION_TREE_CACHE_KEY = "EXPRESS_REGION_TREE"; + + // 上市季节年份 + public static final String RELEASE_YEAR_SEASON = "release_year_season"; /** * ES 索引 product_info */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java index bfa57e4b3..625822c09 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/DailyTaskController.java @@ -24,6 +24,13 @@ public class DailyTaskController extends BaseController { final XktTask task; + @PostMapping("/season") + public R season(SysJob sysJob) { + task.seasonTag(); + return R.ok(); + } + + @PostMapping("/daily-sale") public R dailySale(SysJob sysJob) { task.dailySale(); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java index 5252081f1..333d92669 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java @@ -16,12 +16,14 @@ import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.SimpleEntity; +import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.es.EsClientWrapper; import com.ruoyi.framework.notice.fs.FsNotice; +import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.xkt.domain.*; import com.ruoyi.xkt.dto.account.WithdrawPrepareResult; import com.ruoyi.xkt.dto.advertRound.pc.store.PCStoreRecommendDTO; @@ -119,13 +121,14 @@ public class XktTask { final StoreMemberMapper storeMemberMapper; final IExpressService expressService; final ZtoExpressManagerImpl ztoExpressManager; + final SysDictDataMapper dictDataMapper; public void test() throws IOException { System.err.println("aaa"); } /** - * 每年3月1日、6月1日、9月1日、12月1日执行 + * 每年3月1日、6月1日、9月1日、12月1日执行 生成春夏秋冬标签 */ @Transactional public void seasonTag() { @@ -146,11 +149,21 @@ public class XktTask { return; } log.info("生成季节标签:{}", seasonLabel); - - // TODO 插入到sys_dict_type sys_dict_data两张表 - // TODO 插入到sys_dict_type sys_dict_data两张表 - // TODO 插入到sys_dict_type sys_dict_data两张表 - + List dictDataList = this.dictDataMapper.selectList(new LambdaQueryWrapper() + .eq(SysDictData::getDictType, Constants.RELEASE_YEAR_SEASON).eq(SysDictData::getDelFlag, Constants.UNDELETED) + .eq(SysDictData::getStatus, "0")); + // 当前最大排序 + final Long maxSort = dictDataList.stream().max(Comparator.comparingLong(SysDictData::getDictSort)) + .map(x -> x.getDictSort()).orElse(100L); + // 往sys_dict_data表插入一条数据 + SysDictData dictData = new SysDictData(); + dictData.setDictLabel(seasonLabel); + dictData.setDictValue(seasonLabel); + dictData.setDictType(Constants.RELEASE_YEAR_SEASON); + dictData.setDictSort(maxSort + 1); + dictData.setStatus("0"); + dictData.setCreateBy("admin"); + this.dictDataMapper.insert(dictData); } /** @@ -709,8 +722,6 @@ public class XktTask { public void autoCloseTimeoutStore() { - - // TODO 更新未交年费档口 // TODO 更新未交年费档口