From 08c37794bd32cf5798ce581b472b1fae4f376d61 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 26 五月 2025 18:46:32 +0800
Subject: [PATCH] init
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
index 8553a75..878c7c0 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/CompanyController.java
@@ -1,10 +1,15 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.model.TbBanner;
import com.ruoyi.system.query.CompanyListQuery;
+import com.ruoyi.system.service.TbBannerService;
import com.ruoyi.system.service.TbCompanyService;
+import com.ruoyi.system.vo.IndexCompanyListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,6 +19,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
+import java.util.List;
@Slf4j
@RestController
@@ -25,15 +31,28 @@
private TbCompanyService tbCompanyService;
@Autowired
+ private TbBannerService bannerService;
+
+ @Autowired
private TokenService tokenService;
+
+
+ @ApiOperation(value = "获取banner",tags = {"获取banner"})
+ @GetMapping("/getBannerList")
+ public R<List<TbBanner>> getBannerList() {
+ List<TbBanner> list = bannerService.list(new LambdaQueryWrapper<TbBanner>().eq(TbBanner::getDelFlag, 0));
+ return R.ok(list);
+ }
@ApiOperation(value = "获取商城首页",tags = {"获取商城首页"})
@GetMapping("/getCompanyList")
- public R<?> getCompanyList(@Valid CompanyListQuery query) {
+ public R<Page<IndexCompanyListVo>> getCompanyList(@Valid CompanyListQuery query) {
LoginUser loginUser = tokenService.getLoginUser();
Long userId = loginUser.getUserId();
- return R.ok();
+ Page<IndexCompanyListVo> page = tbCompanyService.getCompanyList(query,userId);
+
+ return R.ok(page);
}
--
Gitblit v1.7.1