From 553040598cff9980ae197df2c7c023ceb6014969 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 5 Sep 2019 13:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=B1=BB=E5=88=AB=20?= =?UTF-8?q?=E9=99=A4=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/pom.xml | 4 +- .../elink/esua/epdc/dto/NewsCategoryDTO.java | 51 ++++++++++++++----- .../controller/NewsCategoryController.java | 14 ++++- .../elink/esua/epdc/dao/NewsCategoryDao.java | 8 ++- .../epdc/service/NewsCategoryService.java | 10 ++++ .../service/impl/NewsCategoryServiceImpl.java | 13 ++++- .../main/resources/mapper/NewsCategoryDao.xml | 24 ++++++++- 7 files changed, 103 insertions(+), 21 deletions(-) diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index e65419204..b75f10e3b 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -93,8 +93,8 @@ lb://epdc-message-server lb://epdc-neighbor-server - lb://epdc-news-server - + + http://127.0.0.1:9064 lb://epdc-oss-server lb://epdc-events-server diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java index 316df4ede..d2d70c7b1 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java @@ -31,36 +31,59 @@ public class NewsCategoryDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 类别名称 - */ + /** + * ID + */ + private String id; + + /** + * 类别名称 + */ private String categoryName; - /** - * 类别编码 - */ + /** + * 类别编码 + */ private String categoryCode; - /** - * 描述 - */ + /** + * 描述 + */ private String description; - /** - * 排序 - */ + /** + * 排序 + */ private Integer sort; + /** + * 删除标识 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ private Integer revision; + /** + * 创建人 + */ private String createdBy; + /** + * 创建时间 + */ private Date createdTime; + /** + * 更新人 + */ private String updatedBy; + /** + * 更新时间 + */ private Date updatedTime; - private String delFlag; - } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java index 69a21af14..e5c97696b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.news.controller; +package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; @@ -65,6 +65,12 @@ public class NewsCategoryController { public Result save(@RequestBody NewsCategoryDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + if(newsCategoryService.checkCodeCategory(dto.getCategoryCode(),dto.getId())>0){ + return new Result().error("类别编码已存在"); + } + if(newsCategoryService.checkNameCategory(dto.getCategoryName(),dto.getId())>0){ + return new Result().error("类别名称已存在"); + } newsCategoryService.save(dto); return new Result(); } @@ -73,6 +79,12 @@ public class NewsCategoryController { public Result update(@RequestBody NewsCategoryDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + if(newsCategoryService.checkCodeCategory(dto.getCategoryCode(),dto.getId())>0){ + return new Result().error("类别编码已存在"); + } + if(newsCategoryService.checkNameCategory(dto.getCategoryName(),dto.getId())>0){ + return new Result().error("类别名称已存在"); + } newsCategoryService.update(dto); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java index 15d1c1718..4068cfd71 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java @@ -21,6 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.NewsCategoryEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * 新闻类别表 * @@ -29,5 +31,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface NewsCategoryDao extends BaseDao { - + + int selectCodeCount(String categoryCode,String id); + + int selectNameCount(String categoryName,String id); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java index 502d49b3a..f87b4ccbe 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java @@ -92,4 +92,14 @@ public interface NewsCategoryService extends BaseService { * @date */ void delete(String[] ids); + + /** + * + */ + int checkNameCategory(String categoryName,String id); + + /** + * + */ + int checkCodeCategory(String categoryCode,String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java index 5d237b3c2..076efd2dc 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.news.service.impl; +package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -70,6 +70,7 @@ public class NewsCategoryServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.orderByDesc("SORT"); return wrapper; } @@ -101,4 +102,14 @@ public class NewsCategoryServiceImpl extends BaseServiceImpl - - + + \ No newline at end of file