From 891bf36378c855488c34a63f9306b327c0835005 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Wed, 3 Dec 2025 21:15:23 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82storeId;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java    | 2 ++
 .../com/ruoyi/quartz/controller/DailyTaskController.java    | 6 ++++++
 .../main/java/com/ruoyi/xkt/dto/notice/NoticePageDTO.java   | 2 ++
 .../java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java  | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java
index eb36e6930..2ad0506fd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java
@@ -23,5 +23,7 @@ public class NoticePageVO extends BasePageVO {
     @NotNull(message = "ownerType不能为空")
     @ApiModelProperty(value = "谁发的公告 1 档口  2 系统", required = true)
     private Integer ownerType;
+    @ApiModelProperty(value = "档口id")
+    private Long storeId;
 
 }
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 3c0d9ed18..cef0ea9a6 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
@@ -163,6 +163,12 @@ public class DailyTaskController extends BaseController {
         return R.ok();
     }
 
+    @PostMapping("/user-brows-history")
+    public R dailyUpdateUserBrowsingHistory(SysJob sysJob) {
+        task.dailyUpdateUserBrowsingHistory();
+        return R.ok();
+    }
+
 
 
 }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticePageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticePageDTO.java
index ae58ff086..8292dfad7 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticePageDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/notice/NoticePageDTO.java
@@ -20,5 +20,7 @@ public class NoticePageDTO extends BasePageDTO {
     private String noticeTitle;
     @ApiModelProperty(value = "谁发的公告 1 档口  2 系统")
     private Integer ownerType;
+    @ApiModelProperty(value = "档口id")
+    private Long storeId;
 
 }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java
index 4ffee52b1..72fcedf8e 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java
@@ -156,6 +156,9 @@ public class NoticeServiceImpl implements INoticeService {
         if (StringUtils.isNotBlank(pageDTO.getNoticeTitle())) {
             queryWrapper.like(Notice::getNoticeTitle, pageDTO.getNoticeTitle());
         }
+        if (ObjectUtils.isNotEmpty(pageDTO.getStoreId())) {
+            queryWrapper.eq(Notice::getStoreId, pageDTO.getStoreId());
+        }
         PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize());
         List<Notice> noticeList = this.noticeMapper.selectList(queryWrapper);
         if (CollectionUtils.isEmpty(noticeList)) {