From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7

---
 cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 100 insertions(+), 13 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 f4d73c3..daf6a85 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
@@ -1,8 +1,12 @@
 package com.dsh.other.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.other.entity.Banner;
+import com.dsh.other.entity.*;
+import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO;
+import com.dsh.other.feignclient.model.AdvertisementQuery;
 import com.dsh.other.model.BannerVo;
+import com.dsh.other.model.dto.siteDto.SelectDto;
+import com.dsh.other.model.vo.questionVo.QuestionSearchVO;
 import com.dsh.other.service.IBannerService;
 import com.dsh.other.util.ResultUtil;
 import io.swagger.annotations.ApiImplicitParam;
@@ -10,12 +14,10 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,7 +32,47 @@
     private IBannerService bannerService;
 
 
+    /**
+     * 获取广告管理
+     * @return
+     */
+    @RequestMapping("/base/advertisement/listAll")
+    public List<Banner> listAll(@RequestBody AdvertisementQuery query){
+        return  bannerService.listAll(query);
+    }
+    /**
+     * 上/下架、删除常见问题 state=1为上架 2为下架
+     */
+    @RequestMapping("/base/advertisement/changeState")
+    public Object changeState(@RequestBody AdvertisementChangeStateDTO dto){
+        return bannerService.changeState(dto);
+    }
 
+    /**
+     * 根据id获取广告数据
+     */
+    @RequestMapping("/base/advertisement/getById")
+    public Banner changeState(@RequestBody Integer bannerId){
+        return bannerService.getById(bannerId);
+    }
+
+    /**
+     * 添加广告管理
+     * @return
+     */
+    @RequestMapping("/base/advertisement/addAdvertisement")
+    Object addAdvertisement(@RequestBody Banner banner){
+        return bannerService.save(banner);
+    }
+
+    /**
+     * 修改广告管理
+     * @return
+     */
+    @RequestMapping("/base/advertisement/updateAdvertisement")
+    Object updateAdvertisement(@RequestBody Banner banner){
+        return bannerService.updateById(banner);
+    }
 
     @ResponseBody
     @PostMapping("/base/banner/queryBannerList")
@@ -39,18 +81,63 @@
             @ApiImplicitParam(value = "位置(1=首页,2=首页底部,3=线上课得积分,4=看视频得奖励,5=常见问题)", 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();
+//        }
+    }
+
+
+
+
+    @ResponseBody
+    @PostMapping("/base/banner/index")
+    @ApiOperation(value = "获取首页图片", tags = {"获取首页图片"})
+    public ResultUtil querySiteTimes(){
         try {
-            List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
-            List<BannerVo> list1 = new ArrayList<>();
-            for (Banner banner : list) {
-                BannerVo bannerVo = new BannerVo();
-                BeanUtils.copyProperties(banner, bannerVo);
-                list1.add(bannerVo);
-            }
-            return ResultUtil.success(list1);
+            String result =bannerService.getFirst();
+            return ResultUtil.success(result);
         }catch (Exception e){
             e.printStackTrace();
             return ResultUtil.runErr();
         }
     }
+
+
+    @ResponseBody
+    @PostMapping("/class/hisotory")
+    public  void createHistory(@RequestBody CreateHistoryDto createHistoryDto){
+        createHistoryDto.setDate(new Date());
+
+        bannerService.createHistory(createHistoryDto);
+
+
+    }
+
+    @ResponseBody
+    @PostMapping("/class/gethisotory")
+    public  List<GetHistoryDto> getHistory(@RequestBody Integer studentId){
+        List<GetHistoryDto> list =   bannerService.gethistory(studentId);
+
+        System.out.println("=-======GetHistoryDto========"+list);
+      return   list;
+
+    }
+
+
 }

--
Gitblit v1.7.1