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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 1510dfa..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
@@ -4,6 +4,7 @@
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;
@@ -17,7 +18,7 @@
import java.util.List;
/**
- * 图片配置控制器
+ * 图片配置控制器
*/
@Api
@CrossOrigin
@@ -36,7 +37,7 @@
* 获取 没有学员信息的图片配置
*/
@PostMapping("/base/imgConfig/getNoneStu")
- public List<TImgConfig> getDriver(){
+ public List<TImgConfig> getDriver() {
return imgConfigService.list(new QueryWrapper<TImgConfig>()
.eq("position", 1));
}
@@ -44,6 +45,7 @@
/**
* 获取系统图片
+ *
* @param position
* @return
*/
@@ -51,25 +53,25 @@
@PostMapping("/base/systemImg/querySystemImg")
@ApiOperation(value = "获取各种系统图片", tags = {"APP-公共接口"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "位置（1=无学员，2=成为会员，3=我的券包，4=线上商城，5=本周福利，6=今日免费）", name = "position", dataType = "int", required = true),
+ @ApiImplicitParam(value = "位置（1=无学员，2=成为会员，3=我的券包，4=线上商城，5=本周福利，6=今日免费,7启动页配置）", name = "position", dataType = "int", required = true),
})
- public String querySystemImg(Integer position){
+ public ResultUtil<String> querySystemImg(Integer position) {
TImgConfig imgConfig = imgConfigService.getBaseMapper().selectOne(new QueryWrapper<TImgConfig>().eq("position", position));
- return imgConfig.getContent();
+ return ResultUtil.success(imgConfig.getContent());
}
@PostMapping("/base/imgConfig/getBenefitImage")
- public UserBenefitImage getImageConfig(){
+ 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){
+ if (tImgConfigs.size() > 0) {
tImgConfigs.forEach(imgCg -> {
- switch (imgCg.getPosition()){
+ switch (imgCg.getPosition()) {
case 3:
image.setMyConpons(imgCg.getContent());
break;
--
Gitblit v1.7.1