From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 d28964c..917248d 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
@@ -1,14 +1,8 @@
package com.ruoyi.system.controller.miniapp;
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 com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.service.config.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,32 +38,35 @@
@Resource
private PopService popService;
+ @Resource
+ private BottomNavService bottomNavService;
+
@RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页banner")
+ @ApiOperation(value = "获取首页banner【2.0】")
public R<List<AppBannerVo>> getHomeBanner() {
List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
return R.ok(appBannerVoList);
}
-
+
@RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页快速入口")
+ @ApiOperation(value = "获取首页快速入口【2.0】")
public R<List<AppQuickEntryVo>> getQuickEntry() {
List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
return R.ok(appQuickEntryVoList);
}
-
+
@RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
- @ApiOperation(value = "获取首页广告")
+ @ApiOperation(value = "获取首页广告【2.0】")
public R<AppAdvertVo> getAdvert() {
AppAdvertVo appAdvertVo = advertService.getAdvertVo();
return R.ok(appAdvertVo);
}
-
+
@RequestMapping(value = "/getPop", method = RequestMethod.POST)
- @ApiOperation(value = "获取弹窗")
+ @ApiOperation(value = "获取弹窗【2.0】")
public R<AppPopVo> getAppPop() {
AppPopVo appPopVo = popService.getAppPop();
return R.ok(appPopVo);
@@ -77,4 +74,11 @@
+ @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
+ @ApiOperation(value = "获取底部导航栏")
+ public R<List<AppBottomNavVO>> getBottomNav() {
+ List<AppBottomNavVO> list = bottomNavService.getAppBottomNav();
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1