From bd822c12e782d48ff5c3c5e7096be16c8c34e82f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 15:09:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java
index e1f4839..df8cddb 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java
@@ -26,53 +26,57 @@
@Override
public List<Slideshow> selectList() {
- return baseMapper.selectList(new QueryWrapper<Slideshow>().lambda());
+ return baseMapper.selectList(new QueryWrapper<Slideshow>().lambda());
}
@Override
public Slideshow queryById(Integer id) {
- return baseMapper.selectOne(new QueryWrapper<Slideshow>().lambda().eq(Slideshow::getId,id));
+ return baseMapper.selectOne(new QueryWrapper<Slideshow>().lambda().eq(Slideshow::getId, id));
}
@Override
- public ResultData add(Slideshow slideshow){
- if (slideshow.getUrl()==null||slideshow.getUrl()=="")
- return ResultData.error("图片地址不能为空");
- if (slideshow.getLinkType()==null)
- return ResultData.error("跳转链接类型不能为空");
- if (slideshow.getTitle()==null||slideshow.getTitle()=="")
- return ResultData.error("标题不能为空");
- if (slideshow.getLinkType().equals(2)&&(slideshow.getContent()==null||slideshow.getContent()==""))
- return ResultData.error("类型为富文本时,富文本内容不能为空");
- if (slideshow.getLinkType().equals(4)&&(slideshow.getLink()==null||slideshow.getLink()==""))
- return ResultData.error("类型为微信文章时,文章链接容不能为空");
+ public ResultData add(Slideshow slideshow) {
+ if (slideshow.getUrl() == null || slideshow.getUrl() == "")
+ return ResultData.error("图片地址不能为空");
+ if (slideshow.getLinkType() == null)
+ return ResultData.error("跳转链接类型不能为空");
+ if (slideshow.getLinkType().equals(2)) {
+ if (slideshow.getTitle() == null || slideshow.getTitle() == "")
+ return ResultData.error("类型为富文本时,标题不能为空");
+ if (slideshow.getContent() == null || slideshow.getContent() == "")
+ return ResultData.error("类型为富文本时,富文本内容不能为空");
+ }
+ if (slideshow.getLinkType().equals(3) && (slideshow.getLink() == null || slideshow.getLink() == ""))
+ return ResultData.error("类型为微信文章时,文章链接容不能为空");
slideshow.setCreateTime(LocalDateTime.now());
- return ResultData.success( baseMapper.insert(slideshow)) ;
+ return ResultData.success(baseMapper.insert(slideshow));
}
@Override
- public ResultData update(Slideshow slideshow){
- if (slideshow.getUrl()==null||slideshow.getUrl()=="")
- return ResultData.error("图片地址不能为空");
- if (slideshow.getLinkType()==null)
- return ResultData.error("跳转链接类型不能为空");
- if (slideshow.getTitle()==null||slideshow.getTitle()=="")
- return ResultData.error("标题不能为空");
- if (slideshow.getLinkType().equals(2)&&(slideshow.getContent()==null||slideshow.getContent()==""))
- return ResultData.error("类型为富文本时,富文本内容不能为空");
- if (slideshow.getLinkType().equals(4)&&(slideshow.getLink()==null||slideshow.getLink()==""))
- return ResultData.error("类型为微信文章时,文章链接容不能为空");
- return ResultData.success(baseMapper.updateById(slideshow));
+ public ResultData update(Slideshow slideshow) {
+ if (slideshow.getUrl() == null || slideshow.getUrl() == "")
+ return ResultData.error("图片地址不能为空");
+ if (slideshow.getLinkType() == null)
+ return ResultData.error("跳转链接类型不能为空");
+ if (slideshow.getLinkType().equals(2)) {
+ if (slideshow.getTitle() == null || slideshow.getTitle() == "")
+ return ResultData.error("类型为富文本时,标题不能为空");
+ if (slideshow.getContent() == null || slideshow.getContent() == "")
+ return ResultData.error("类型为富文本时,富文本内容不能为空");
+ }
+ if (slideshow.getLinkType().equals(3) && (slideshow.getLink() == null || slideshow.getLink() == ""))
+ return ResultData.error("类型为微信文章时,文章链接容不能为空");
+ return ResultData.success(baseMapper.updateById(slideshow));
}
@Override
- public ResultData delete(Integer id){
+ public ResultData delete(Integer id) {
int i = baseMapper.deleteById(id);
- if(i>0)
- return ResultData.success();
+ if (i > 0)
+ return ResultData.success();
else
- return ResultData.error();
+ return ResultData.error();
}
}
--
Gitblit v1.7.1