From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java | 150 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 18 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
index 5565a53..99c1429 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.controller.code;
+import com.dsh.course.entity.Img;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.model.CityManager;
import com.dsh.course.feignClient.account.model.Coach;
@@ -8,24 +9,19 @@
import com.dsh.course.feignClient.other.model.Banner;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
-import com.dsh.guns.modular.system.model.AdvertisementChangeStateDTO;
-import com.dsh.guns.modular.system.model.AdvertisementQuery;
-import com.dsh.guns.modular.system.model.CoachQuery;
-import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
+import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
/**
* 广告管理控制器
@@ -41,6 +37,8 @@
private CityManagerClient cityManagerClient;
@Autowired
private BannerClient bannerClient;
+ @Autowired
+ private IStoreService storeService;
/**
* 跳转到广告页面
@@ -48,9 +46,14 @@
@RequestMapping("")
public String index(Model model) {
- model.addAttribute("pages",1);
+ List<TTurn> pages = storeService.pageList();
+ List<Integer> ids = new ArrayList<>();
+ for (TTurn page : pages) {
+ ids.add(page.getId());
+ }
+ List<TTurn> res = storeService.getPage(ids);
+ model.addAttribute("pages",res);
model.addAttribute("models",1);
-
return PREFIX + "advertisement.html";
}
/**
@@ -62,6 +65,92 @@
model.addAttribute("roleType",roleType);
return PREFIX + "advertisement_add.html";
}
+ /**
+ * 配置基础页面
+ */
+ @ResponseBody
+ @RequestMapping(value = "/updateConfig")
+ public Object updateConfig(String p1,String p2 ,String p7) {
+ if (!p1.equals("")){
+ storeService.updateBasicConfig(1,p1);
+ }
+ if (!p2.equals("")){
+ storeService.updateBasicConfig(2,p2);
+ }
+ if (!p7.equals("")){
+ storeService.updateBasicConfig(7,p7);
+ }
+ return SUCCESS_TIP;
+ }
+ /**
+ * 配置福利页面
+ */
+ @ResponseBody
+ @RequestMapping(value = "/updateBenefits")
+ public Object updateBenefits(String p3,String p4 ,String p5,String p6) {
+ if (!p3.equals("")){
+ storeService.updateBenefits(3,p3);
+ }
+ if (!p4.equals("")){
+ storeService.updateBenefits(4,p4);
+ }
+ if (!p5.equals("")){
+ storeService.updateBenefits(5,p5);
+ }
+ if (!p6.equals("")){
+ storeService.updateBenefits(6,p6);
+ }
+ return SUCCESS_TIP;
+ }
+ /**
+ * 跳转基础页面配置
+ */
+ @RequestMapping("/config")
+ public String config(Model model) {
+ List<TImgConfig> result =storeService.getConfig();
+ for (TImgConfig tImgConfig : result) {
+ switch (tImgConfig.getPosition()){
+ case 1:
+ model.addAttribute("c1",tImgConfig.getContent());
+ break;
+ case 2:
+ model.addAttribute("c2",tImgConfig.getContent());
+ break;
+ case 7:
+ model.addAttribute("c7",tImgConfig.getContent());
+ break;
+ }
+ }
+ return PREFIX + "advertisement_config.html";
+ }
+ /**
+ * 跳转福利页面配置
+ */
+ @RequestMapping("/benefits")
+ public String benefits(Model model) {
+ List<TImgConfig> result =storeService.getConfig();
+ for (TImgConfig tImgConfig : result) {
+ switch (tImgConfig.getPosition()){
+ case 3:
+ model.addAttribute("c3",tImgConfig.getContent());
+ break;
+ case 4:
+ model.addAttribute("c4",tImgConfig.getContent());
+ break;
+ case 5:
+ model.addAttribute("c5",tImgConfig.getContent());
+ break;
+ case 6:
+ model.addAttribute("c6",tImgConfig.getContent());
+ break;
+ }
+ }
+ Integer roleType = UserExt.getUser().getObjectType();
+ model.addAttribute("roleType",roleType);
+ return PREFIX + "advertisement_benefits.html";
+ }
+
+
/**
* 跳转到广告编辑页面
@@ -69,6 +158,8 @@
@RequestMapping("/update/{id}/{type}")
public String store(Model model, @PathVariable("id") Integer id,@PathVariable("type")Integer type) {
Banner data = bannerClient.getById(id);
+ List<Map<String, Object>> pages = storeService.typeChange(data.getModel());
+ List<Map<String, Object>> types = storeService.typeChangeOne(data.getJumpPage());
// type=1 查看详情 type=2 编辑
if (type == 1){
model.addAttribute("type",1);
@@ -78,6 +169,8 @@
Integer roleType = UserExt.getUser().getObjectType();
model.addAttribute("roleType",roleType);
model.addAttribute("data",data);
+ model.addAttribute("pages",pages);
+ model.addAttribute("types",types);
return PREFIX + "advertisement_edit.html";
}
@@ -85,9 +178,10 @@
* 广告上下架
*/
@RequestMapping("/changeState")
- public Object changeState(AdvertisementChangeStateDTO dto) {
-
- return bannerClient.changeState(dto);
+ @ResponseBody
+ public Object changeState(@RequestBody AdvertisementChangeStateDTO dto) {
+ bannerClient.changeState(dto);
+ return ResultUtil.success();
}
/**
* 添加广告
@@ -95,15 +189,35 @@
@ResponseBody
@RequestMapping(value = "/addAdvertisement")
public ResultUtil addAdvertisement(@RequestBody Banner banner) {
+ if (banner.getType().equals("请选择")){
+ banner.setType(null);
+ }
+ if (banner.getPage().equals("请选择")){
+ banner.setPage(null);
+ }
+ banner.setInsertTime(new Date());
bannerClient.addAdvertisement(banner);
return ResultUtil.success("添加成功");
}
/**
- * 添加广告
+ * 编辑广告
*/
@ResponseBody
@RequestMapping(value = "/updateAdvertisement")
public ResultUtil updateAdvertisement(@RequestBody Banner banner) {
+ Banner byId = bannerClient.getById(banner.getId());
+ // 如果为空 则没有改变图片
+ if (banner.getImg().equals("")||banner==null){
+ banner.setImg(byId.getImg());
+ }
+
+ if (banner.getType().equals("请选择")){
+ banner.setType(null);
+ }
+ if (banner.getPage().equals("请选择")){
+ banner.setPage(null);
+ }
+
bannerClient.updateAdvertisement(banner);
return ResultUtil.success("添加成功");
--
Gitblit v1.7.1