From 9714e97a716a0cdc9b902d41466e0d97afc765bd Mon Sep 17 00:00:00 2001 From: PengJ <2413927716@qq.com> Date: Wed, 11 Feb 2026 10:45:31 +0800 Subject: [PATCH] =?UTF-8?q?appbanner=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserPointsServiceImpl.java | 23 +++++++++---------- .../controller/SysBannerApiController.java | 23 +++++-------------- .../api/service/SysBannerApiService.java | 3 +++ .../service/impl/SysBannerApiServiceImpl.java | 18 ++++++++++++--- .../modules/system/entity/SysBannerDO.java | 5 ++++ .../system/mapper/SysBannerMapper.java | 3 ++- 6 files changed, 42 insertions(+), 33 deletions(-) diff --git a/health-bank/health-bank-biz/src/main/java/com/renkang/bank/service/impl/UserPointsServiceImpl.java b/health-bank/health-bank-biz/src/main/java/com/renkang/bank/service/impl/UserPointsServiceImpl.java index 708fcc2..d601ddc 100644 --- a/health-bank/health-bank-biz/src/main/java/com/renkang/bank/service/impl/UserPointsServiceImpl.java +++ b/health-bank/health-bank-biz/src/main/java/com/renkang/bank/service/impl/UserPointsServiceImpl.java @@ -3,9 +3,8 @@ package com.renkang.bank.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -73,7 +72,7 @@ public class UserPointsServiceImpl extends ServiceImpl 0 ? loginUser.getAge() : null); SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(vo.getOrgCode())); - if (ObjUtil.isNotEmpty(secondDepart)) { + if (ObjectUtil.isNotEmpty(secondDepart)) { vo.setDeptName(secondDepart.getDepartName()); } SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(vo.getOrgCode())); - if (ObjUtil.isNotEmpty(thirdDepart)) { + if (ObjectUtil.isNotEmpty(thirdDepart)) { vo.setOrgName(thirdDepart.getDepartName()); } } @@ -249,11 +248,11 @@ public class UserPointsServiceImpl extends ServiceImpl 0 ? loginUser.getAge() : null); SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(loginUser.getOrgCode())); - if (ObjUtil.isNotEmpty(secondDepart)) { + if (ObjectUtil.isNotEmpty(secondDepart)) { vo.setDeptName(secondDepart.getDepartName()); } SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(loginUser.getOrgCode())); - if (ObjUtil.isNotEmpty(thirdDepart)) { + if (ObjectUtil.isNotEmpty(thirdDepart)) { vo.setOrgName(thirdDepart.getDepartName()); } } @@ -343,11 +342,11 @@ public class UserPointsServiceImpl extends ServiceImpl 0 ? loginUser.getAge() : null); SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(loginUser.getOrgCode())); - if (ObjUtil.isNotEmpty(secondDepart)) { + if (ObjectUtil.isNotEmpty(secondDepart)) { vo.setDeptName(secondDepart.getDepartName()); } SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(loginUser.getOrgCode())); - if (ObjUtil.isNotEmpty(thirdDepart)) { + if (ObjectUtil.isNotEmpty(thirdDepart)) { vo.setOrgName(thirdDepart.getDepartName()); } } @@ -463,7 +462,7 @@ public class UserPointsServiceImpl extends ServiceImpl> appBannerList(@RequestParam(name = "showLocation") String showLocation) { -// Date date = new Date(); -// List list = sysBannerApiService.list(new LambdaQueryWrapper() -// .select(SysBanner::getId, SysBanner::getPhotoUrl, SysBanner::getJumpUrl, SysBanner::getTfJump, SysBanner::getMemo) -// .eq(SysBanner::getShowLocation, showLocation) -// .eq(SysBanner::getStatus, 1) -// .and(wrapper -> wrapper.eq(SysBanner::getIsLongTermEffective, 1) -// .or(wrapper1 -> wrapper1.eq(SysBanner::getIsLongTermEffective, 0).ge(SysBanner::getStartTime, date).le(SysBanner::getEndTime, date))) -// .orderByDesc(SysBanner::getSort) -// ); -// return Result.OK(list); -// } + + @Operation(summary = "轮播图-app轮播图列表（返回所有）", description = "查询轮播图列表") + @GetMapping("/selectAllBannerList") + public Result> selectAllBannerList() { + return Result.ok(sysBannerApiService.selectAllBannerList()); + } } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/SysBannerApiService.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/SysBannerApiService.java index 1d7e097..aaa53eb 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/SysBannerApiService.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/SysBannerApiService.java @@ -7,4 +7,7 @@ import java.util.List; public interface SysBannerApiService { Result> selectBannerList(String showLocation); + + List selectAllBannerList(); + } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/impl/SysBannerApiServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/impl/SysBannerApiServiceImpl.java index 00111f7..e1a737e 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/impl/SysBannerApiServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/service/impl/SysBannerApiServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.api.service.impl; import com.aliyuncs.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.query.MPJLambdaQueryWrapper; import org.apache.commons.collections4.CollectionUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; @@ -16,6 +17,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -29,19 +31,29 @@ public class SysBannerApiServiceImpl implements SysBannerApiService { @Override public Result> selectBannerList(String showLocation) { - if (StringUtils.isEmpty(showLocation)) { return Result.error("请选择展示的位置"); } - List list = healthHolidayMapper.selectBannerList(showLocation); - // 添加长期有效的banner list.addAll(getLongTermEffectiveBanner(showLocation)); // 去重返回 return Result.ok(list.stream().distinct().collect(Collectors.toList())); } + @Override + public List selectAllBannerList() { + Date date = new Date(); + return sysBannerMapper.selectJoinList(SysBannerDO.class, new MPJLambdaQueryWrapper() + .selectAll(SysBanner.class) + .eq(SysBanner::getStatus, 1) + .and(wrapper -> wrapper.eq(SysBanner::getIsLongTermEffective, 1) + .or(wrapper1 -> wrapper1.eq(SysBanner::getIsLongTermEffective, 0).ge(SysBanner::getStartTime, date).le(SysBanner::getEndTime, date))) + .orderByAsc(SysBanner::getShowLocation) + .orderByAsc(SysBanner::getSort) + ); + } + private List getLongTermEffectiveBanner(String showLocation) { LambdaQueryWrapper queryWrapper = GlobalUtils.getLambdaQueryWrapper(); queryWrapper.eq(SysBanner::getIsLongTermEffective, CommonConstant.YES) diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBannerDO.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBannerDO.java index 0311c19..d517db1 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBannerDO.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysBannerDO.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; @Data public class SysBannerDO { @@ -17,4 +18,8 @@ public class SysBannerDO { @Schema(title = "跳转参数") private String jumpUrl; + + @Dict(dicCode = "show_location") + @Schema(title = "展示位置") + private String showLocation; } diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBannerMapper.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBannerMapper.java index 1058d8e..b0d0fe0 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBannerMapper.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysBannerMapper.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.system.entity.SysBanner; @@ -12,7 +13,7 @@ import org.jeecg.modules.system.entity.SysBanner; * @Version: V1.0 */ @Mapper -public interface SysBannerMapper extends BaseMapper { +public interface SysBannerMapper extends MPJBaseMapper { /** * 分页列表查询 *