From 50050ada04e8ae7bbbeb6342b4e3e35fba3890ec Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 17:36:47 +0800
Subject: [PATCH] 合并代码
---
cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java | 59 ++++++++++++++++++++++-------------------------------------
1 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
index daf6a85..632d169 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
@@ -34,17 +34,19 @@
/**
* 获取广告管理
+ *
* @return
*/
@RequestMapping("/base/advertisement/listAll")
- public List<Banner> listAll(@RequestBody AdvertisementQuery query){
- return bannerService.listAll(query);
+ public List<Banner> listAll(@RequestBody AdvertisementQuery query) {
+ return bannerService.listAll(query);
}
+
/**
* 上/下架、删除常见问题 state=1为上架 2为下架
*/
@RequestMapping("/base/advertisement/changeState")
- public Object changeState(@RequestBody AdvertisementChangeStateDTO dto){
+ public Object changeState(@RequestBody AdvertisementChangeStateDTO dto) {
return bannerService.changeState(dto);
}
@@ -52,25 +54,27 @@
* 根据id获取广告数据
*/
@RequestMapping("/base/advertisement/getById")
- public Banner changeState(@RequestBody Integer bannerId){
+ public Banner changeState(@RequestBody Integer bannerId) {
return bannerService.getById(bannerId);
}
/**
* 添加广告管理
+ *
* @return
*/
@RequestMapping("/base/advertisement/addAdvertisement")
- Object addAdvertisement(@RequestBody Banner banner){
+ Object addAdvertisement(@RequestBody Banner banner) {
return bannerService.save(banner);
}
/**
* 修改广告管理
+ *
* @return
*/
@RequestMapping("/base/advertisement/updateAdvertisement")
- Object updateAdvertisement(@RequestBody Banner banner){
+ Object updateAdvertisement(@RequestBody Banner banner) {
return bannerService.updateById(banner);
}
@@ -78,41 +82,22 @@
@PostMapping("/base/banner/queryBannerList")
@ApiOperation(value = "获取banner数据", tags = {"APP-加入玩湃"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "位置（1=首页，2=首页底部，3=线上课得积分，4=看视频得奖励，5=常见问题）", name = "position", dataType = "int", required = true),
+ @ApiImplicitParam(value = "广告类型位置（1=首页，2=首页底部，3=线上课得积分，4=看视频得奖励，5=常见问题，6=社区世界杯顶部，7=社区世界杯底部", name = "position", dataType = "int", required = true),
})
- public ResultUtil<List<BannerVo>> queryBannerList(Integer position){
-// try {
-// List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
-
-// if (position == 4) {
- List<BannerVo> list2 = bannerService.list1(position);
- return ResultUtil.success(list2);
-// }
-
-// List<BannerVo> list1 = new ArrayList<>();
-// for (Banner banner : list) {
-// BannerVo bannerVo = new BannerVo();
-// BeanUtils.copyProperties(banner, bannerVo);
-// list1.add(bannerVo);
-// }
-// return ResultUtil.success(list1);
-// }catch (Exception e){
-// e.printStackTrace();
-// return ResultUtil.runErr();
-// }
+ public ResultUtil<List<BannerVo>> queryBannerList(Integer position) {
+ List<BannerVo> list2 = bannerService.list1(position);
+ return ResultUtil.success(list2);
}
-
-
@ResponseBody
@PostMapping("/base/banner/index")
@ApiOperation(value = "获取首页图片", tags = {"获取首页图片"})
- public ResultUtil querySiteTimes(){
+ public ResultUtil querySiteTimes() {
try {
- String result =bannerService.getFirst();
+ String result = bannerService.getFirst();
return ResultUtil.success(result);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -121,7 +106,7 @@
@ResponseBody
@PostMapping("/class/hisotory")
- public void createHistory(@RequestBody CreateHistoryDto createHistoryDto){
+ public void createHistory(@RequestBody CreateHistoryDto createHistoryDto) {
createHistoryDto.setDate(new Date());
bannerService.createHistory(createHistoryDto);
@@ -131,11 +116,11 @@
@ResponseBody
@PostMapping("/class/gethisotory")
- public List<GetHistoryDto> getHistory(@RequestBody Integer studentId){
- List<GetHistoryDto> list = bannerService.gethistory(studentId);
+ public List<GetHistoryDto> getHistory(@RequestBody Integer studentId) {
+ List<GetHistoryDto> list = bannerService.gethistory(studentId);
- System.out.println("=-======GetHistoryDto========"+list);
- return list;
+ System.out.println("=-======GetHistoryDto========" + list);
+ return list;
}
--
Gitblit v1.7.1