From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
index 0285510..d28964c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
@@ -3,17 +3,19 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.domain.vo.AppAdvertVo;
import com.ruoyi.system.domain.vo.AppBannerVo;
+import com.ruoyi.system.domain.vo.AppPopVo;
import com.ruoyi.system.domain.vo.AppQuickEntryVo;
import com.ruoyi.system.service.config.AdvertService;
import com.ruoyi.system.service.config.BannerService;
+import com.ruoyi.system.service.config.PopService;
import com.ruoyi.system.service.config.QuickEntryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -30,14 +32,18 @@
- @Autowired
+ @Resource
private BannerService bannerService;
- @Autowired
+ @Resource
private QuickEntryService quickEntryService;
- @Autowired
+ @Resource
private AdvertService advertService;
+
+ @Resource
+ private PopService popService;
+
@@ -62,7 +68,12 @@
return R.ok(appAdvertVo);
}
-
+ @RequestMapping(value = "/getPop", method = RequestMethod.POST)
+ @ApiOperation(value = "获取弹窗")
+ public R<AppPopVo> getAppPop() {
+ AppPopVo appPopVo = popService.getAppPop();
+ return R.ok(appPopVo);
+ }
--
Gitblit v1.7.1