From 2b4511ca363e74343e1cb678c23a9e7638800a3f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 e01dfd5..2df2b0f 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,6 +2,7 @@
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -12,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -33,7 +35,7 @@
/**
* 获取 没有学员信息的图片配置
*/
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
public List<TImgConfig> getDriver(){
return imgConfigService.list(new QueryWrapper<TImgConfig>()
.eq("position", 1));
@@ -56,4 +58,36 @@
return 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