From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期四, 26 十月 2023 18:04:58 +0800 Subject: [PATCH] 修改bug --- cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 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..5d95576 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,7 +2,9 @@ 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; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -33,7 +36,7 @@ /** * 获取 没有学员信息的图片配置 */ - @PostMapping("/imgConfig/getNoneStu") + @PostMapping("/base/imgConfig/getNoneStu") public List<TImgConfig> getDriver(){ return imgConfigService.list(new QueryWrapper<TImgConfig>() .eq("position", 1)); @@ -49,11 +52,43 @@ @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(@RequestBody 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(){ + 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