From 79b9b43f2064cf88dc5c1339d1ddea3b5ab11ac1 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 15 Dec 2022 09:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E7=94=A8=E6=88=B7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/popup/api/PopupApi.java | 11 ++++++ .../com/xboe/module/popup/entity/Popup.java | 12 +++---- .../xboe/module/popup/entity/PopupUser.java | 36 +++++++++++++++++++ .../module/popup/service/IPopupService.java | 7 ++++ .../popup/service/impl/PopupServiceImpl.java | 7 ++++ 5 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/PopupUser.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java index f44f05ee..a7d4dbb6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java @@ -17,6 +17,17 @@ public class PopupApi extends ApiBaseController { @Resource IPopupService service; + + + /** + * 前端查询，只是查询出对于当前用户来说需要弹出的 + * */ + @PostMapping("/user") + public JsonResponse> userList(){ + String aid=getCurrent().getAccountId(); + List list = service.findForUser(aid); + return success(list); + } /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java index 25fb3d99..19305fda 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java @@ -15,10 +15,12 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Entity @Table(name = SysConstant.TABLE_PRE+"popup") -public class Popup extends IdEntity { +public class Popup extends IdEntity { - /** + private static final long serialVersionUID = 1L; + + /** * 开始时间 * */ @Column(name = "start_time") @@ -81,10 +83,4 @@ public class Popup extends IdEntity { private String url; - - - - - - } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/PopupUser.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/PopupUser.java new file mode 100644 index 00000000..b651c175 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/PopupUser.java @@ -0,0 +1,36 @@ +package com.xboe.module.popup.entity; + +import java.time.LocalDateTime; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +import com.xboe.core.SysConstant; +import com.xboe.core.orm.IdEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 弹出用户记录 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Entity +@Table(name = SysConstant.TABLE_PRE+"popup_user") +public class PopupUser extends IdEntity{ + + private static final long serialVersionUID = 1L; + + @Column(name = "popup_id",length=20) + private String popupId; + + @Column(name = "aid",length=20) + private String aid; + + /**状态默认是1，表已弹出过*/ + @Column(name = "status",length=1) + private Boolean status; + +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/IPopupService.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/IPopupService.java index 6ffb44a2..edb3c1a0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/IPopupService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/IPopupService.java @@ -12,6 +12,13 @@ public interface IPopupService { * 后台弹窗管理列表 * */ List list(Popup popup); + + /** + * 查询当前用户需要弹出的 + * @param aid + * @return + */ + List findForUser(String aid); /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java index 7b14484a..a6e04790 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java @@ -70,4 +70,11 @@ public class PopupServiceImpl implements IPopupService { public void delete(String id) { popupDao.deleteById(id); } + + @Override + public List findForUser(String aid) { + //根据时间查询,在时间内的。 + //如果一个用户只弹一次，还要结合 PopupUser 查询， + return null; + } }