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-other/src/main/java/com/dsh/other/controller/ImgConfigController.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
index 6c46c90..e75bc78 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
@@ -2,17 +2,23 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.TImgConfig;
+import com.dsh.other.feignclient.model.UserBenefitImage;
import com.dsh.other.service.TImgConfigService;
+import com.dsh.other.util.ResultUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
- * 图片配置控制器
+ * 图片配置控制器
*/
@Api
@CrossOrigin
@@ -30,10 +36,60 @@
/**
* 获取 没有学员信息的图片配置
*/
- @PostMapping("/imgConfig/getNoneStu")
- public List<TImgConfig> getDriver(){
+ @PostMapping("/base/imgConfig/getNoneStu")
+ public List<TImgConfig> getDriver() {
return imgConfigService.list(new QueryWrapper<TImgConfig>()
.eq("position", 1));
}
+
+ /**
+ * 获取系统图片
+ *
+ * @param position
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/base/systemImg/querySystemImg")
+ @ApiOperation(value = "获取各种系统图片", tags = {"APP-公共接口"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "位置（1=无学员，2=成为会员，3=我的券包，4=线上商城，5=本周福利，6=今日免费,7启动页配置）", name = "position", dataType = "int", required = true),
+ })
+ public ResultUtil<String> querySystemImg(Integer position) {
+ TImgConfig imgConfig = imgConfigService.getBaseMapper().selectOne(new QueryWrapper<TImgConfig>().eq("position", position));
+ return ResultUtil.success(imgConfig.getContent());
+ }
+
+
+ @PostMapping("/base/imgConfig/getBenefitImage")
+ public UserBenefitImage getImageConfig() {
+ UserBenefitImage image = new UserBenefitImage();
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ List<TImgConfig> tImgConfigs = imgConfigService.getBaseMapper().selectList(new QueryWrapper<TImgConfig>()
+ .notIn("position", integers));
+ if (tImgConfigs.size() > 0) {
+ tImgConfigs.forEach(imgCg -> {
+ switch (imgCg.getPosition()) {
+ case 3:
+ image.setMyConpons(imgCg.getContent());
+ break;
+ case 4:
+ image.setOnlineShop(imgCg.getContent());
+ break;
+ case 5:
+ image.setWeeksBenefit(imgCg.getContent());
+ break;
+ case 6:
+ image.setTodayFree(imgCg.getContent());
+ break;
+ default:
+ break;
+ }
+ });
+ }
+ return image;
+ }
+
}
--
Gitblit v1.7.1