diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwLableController.java b/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwLableController.java index 880d1d2..ff0e627 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwLableController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwLableController.java @@ -41,10 +41,8 @@ public class GwLableController extends BaseController { private final IGwLableService iGwLableService; /** - * 查询标签封面信息 -列表 + * 查询标签封面信息列表 */ - @SaCheckPermission("official:lable:list") @GetMapping("/list") public TableDataInfo list(GwLableBo bo, PageQuery pageQuery) { return iGwLableService.queryPageList(bo, pageQuery); diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwSlideshowController.java b/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwSlideshowController.java index 9c54c61..3d26cf0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwSlideshowController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwSlideshowController.java @@ -41,8 +41,7 @@ public class GwSlideshowController extends BaseController { private final IGwSlideshowService iGwSlideshowService; /** - * 查询新闻信息 -列表 + * 查询新闻信息列表 */ @SaCheckPermission("official:slideshow:list") @GetMapping("/list") @@ -67,7 +66,7 @@ public class GwSlideshowController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("official:slideshow:query") + /*@SaCheckPermission("official:slideshow:query")*/ @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(iGwSlideshowService.queryById(id)); diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java index 75533e4..8a2534c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java @@ -71,17 +71,4 @@ public class GwSlideshowBo extends BaseEntity { @NotBlank(message = "是否置顶 0：否 1：是不能为空", groups = { AddGroup.class, EditGroup.class }) private String isTop; - /** - * 创建者id - */ - @NotNull(message = "创建者id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long createUserId; - - /** - * 更新者id - */ - @NotNull(message = "更新者id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long updateUserId; - - } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java index 3f692a0..8a0ec8c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java @@ -17,16 +17,13 @@ import com.ruoyi.official.domain.GwSlideshow; import com.ruoyi.official.mapper.GwSlideshowMapper; import com.ruoyi.official.service.IGwSlideshowService; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** * 新闻信息 -Service业务层处理 + * Service业务层处理 * * @author ruoyi * @date 2024-06-19 @@ -39,25 +36,29 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { /** * 查询新闻信息 - */ @Override - public GwSlideshowVo queryById(Long id){ + public GwSlideshowVo queryById(Long id) { GwSlideshowVo gwSlideshowVo = baseMapper.selectVoById(id); //查询详情时返回上一篇，下一篇处理 List list = baseMapper.selectList(Wrappers.lambdaQuery().orderByDesc(GwSlideshow::getCreateTime)); + getPrevNextArticles(id, gwSlideshowVo, list); + return gwSlideshowVo; + } + + + private Map getPrevNextArticles(Long id, GwSlideshowVo gwSlideshowVo, List list) { Map hashMap = new HashMap<>(16); - if(CollUtil.isNotEmpty(list)&&list.size()>1){ - List collect = list.stream().map(GwSlideshow::getId).collect(Collectors.toList()); - if (collect.contains(id)){ - int currentSubscript = collect.indexOf(id); - hashMap.put("previous",ObjectUtil.isNotEmpty(list.get(currentSubscript-1))?list.get(currentSubscript-1):null); - hashMap.put("nextArticle",ObjectUtil.isNotEmpty(list.get(currentSubscript-1))?list.get(currentSubscript+1):null); - gwSlideshowVo.setSlideshowMap(hashMap); - } + if (CollUtil.isEmpty(list)) return hashMap; + Optional first = list.stream().filter(itx -> Objects.equals(itx.getId(), id)).findFirst(); + if (first.isPresent()) { + int index = list.indexOf(first.get()); + if (index > 0) hashMap.put("previous", list.get(index - 1)); + if (index < list.size() - 1) hashMap.put("nextArticle", list.get(index + 1)); } - return gwSlideshowVo; + gwSlideshowVo.setSlideshowMap(hashMap); + return hashMap; } /** @@ -89,15 +90,12 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { lqw.eq(StringUtils.isNotBlank(bo.getNewsContent()), GwSlideshow::getNewsContent, bo.getNewsContent()); lqw.eq(StringUtils.isNotBlank(bo.getAbstracts()), GwSlideshow::getAbstracts, bo.getAbstracts()); lqw.eq(StringUtils.isNotBlank(bo.getIsTop()), GwSlideshow::getIsTop, bo.getIsTop()); - lqw.eq(bo.getCreateUserId() != null, GwSlideshow::getCreateUserId, bo.getCreateUserId()); - lqw.eq(bo.getUpdateUserId() != null, GwSlideshow::getUpdateUserId, bo.getUpdateUserId()); lqw.orderByDesc(GwSlideshow::getCreateTime); return lqw; } /** * 新增新闻信息 - */ @Override public Boolean insertByBo(GwSlideshowBo bo) { @@ -112,7 +110,6 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { /** * 修改新闻信息 - */ @Override public Boolean updateByBo(GwSlideshowBo bo) { @@ -124,28 +121,27 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(GwSlideshow entity){ + private void validEntityBeforeSave(GwSlideshow entity) { //TODO 做一些数据校验,如唯一约束 //存在已置顶的数据不允许添加、编辑 - if (ObjectUtil.isNotEmpty(entity.getId())){ + if (ObjectUtil.isNotEmpty(entity.getId())) { //编辑 boolean exists = baseMapper.exists(Wrappers.lambdaQuery().eq(GwSlideshow::getIsTop, "1")); - if (exists)throw new RuntimeException("已存在置顶的图片信息！"); - }else { + if (exists && entity.getIsTop().equals("1")) throw new RuntimeException("已存在置顶的图片信息！"); + } else { //新增 boolean exists = baseMapper.exists(Wrappers.lambdaQuery().eq(GwSlideshow::getIsTop, "1")); - if (exists)throw new RuntimeException("已存在置顶的图片信息！"); + if (exists && entity.getIsTop().equals("1")) throw new RuntimeException("已存在置顶的图片信息！"); } } /** * 批量删除新闻信息 - */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteBatchIds(ids) > 0; diff --git a/ruoyi-ui/src/views/official/slideshow/index.vue b/ruoyi-ui/src/views/official/slideshow/index.vue index 6f0637c..e9e3a22 100644 --- a/ruoyi-ui/src/views/official/slideshow/index.vue +++ b/ruoyi-ui/src/views/official/slideshow/index.vue @@ -1,14 +1,7 @@