From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
index fc84ea4..d1b90a8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
@@ -15,6 +15,9 @@
import java.util.List;
+/**
+ * 杞挱鍥�
+ */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/content/banner")
@@ -32,13 +35,13 @@
}
}
- @GetMapping("/category")
- public ResponseVO<Object> listPosition() {
- List<BannerPositionDto> bannerPositionDtos = contentBannerService.listPosition();
- return ResponseUtil.success(bannerPositionDtos);
- }
+// @GetMapping("/category")
+// public ResponseVO<Object> listPosition() {
+// List<BannerPositionDto> bannerPositionDtos = contentBannerService.listPosition();
+// return ResponseUtil.success(bannerPositionDtos);
+// }
- @PostMapping("{bannerId}")
+ @PostMapping("/{bannerId}")
public ResponseVO<Object> updateBanner(@PathVariable Long bannerId, @Validated @RequestBody BannerParam bannerParam) {
boolean result = contentBannerService.updateBanner(bannerId,bannerParam);
if (result) {
@@ -48,17 +51,17 @@
}
}
- @GetMapping("{bannerId}")
+ @GetMapping("/{bannerId}")
public ResponseVO<Object> detailBanner(@PathVariable Long bannerId) {
BannerDto result = contentBannerService.detailBanner(bannerId);
return ResponseUtil.success(result);
}
@GetMapping
- public ResponseVO<Object> listBanner(BaseConditionVO conditionVO) {
+ public ResponseVO<Object> listMainBanner(BaseConditionVO conditionVO) {
PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
List<Banner> list = contentBannerService.listBanner();
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
@PostMapping("/delete/{bannerId}")
--
Gitblit v1.9.3