新闻类别 除删除逻辑

esua-epdc/epdc-gateway/pom.xml

@@ -93,8 +93,8 @@
                 <gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
                 <gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
 <!--                <gateway.routes.epdc-neighbor-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-neighbor-server.uri>-->
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-<!--                <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>-->
+                <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
+                <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
 <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->

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;
-
 }

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 <http://www.gnu.org/licenses/>.
  */
 
-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();
     }

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;
+
 /**
  * 新闻类别表
  *
@@ -30,4 +32,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface NewsCategoryDao extends BaseDao<NewsCategoryEntity> {
 
+    int selectCodeCount(String categoryCode,String id);
+
+    int selectNameCount(String categoryName,String id);
+
 }

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<NewsCategoryEntity> {
      * @date
      */
     void delete(String[] ids);
+
+    /**
+     *
+     */
+    int checkNameCategory(String categoryName,String id);
+
+    /**
+     *
+     */
+    int checkCodeCategory(String categoryCode,String id);
 }

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 <http://www.gnu.org/licenses/>.
  */
 
-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<NewsCategoryDao, Ne
 
         QueryWrapper<NewsCategoryEntity> 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<NewsCategoryDao, Ne
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public int checkNameCategory(String categoryName,String id) {
+        return baseDao.selectNameCount(categoryName,id);
+    }
+
+    @Override
+    public int checkCodeCategory(String categoryCode,String id) {
+        return baseDao.selectCodeCount(categoryCode,id);
+    }
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml

@@ -16,6 +16,26 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-
-
+    <select id="selectCodeCount" resultType="int">
+    SELECT
+	COUNT(CATEGORY_CODE) AS codeCount
+    FROM
+	esua_epdc_news.epdc_news_category
+    WHERE
+	CATEGORY_CODE = #{categoryCode}
+        <if test="id!=null and id!=''">
+            AND id != #{id}
+        </if>
+    </select>
+    <select id="selectNameCount" resultType="int">
+    SELECT
+	COUNT(CATEGORY_NAME) AS codeCount
+    FROM
+	esua_epdc_news.epdc_news_category
+    WHERE
+	CATEGORY_NAME = #{categoryName}
+        <if test="id!=null and id!=''">
+            AND id != #{id}
+        </if>
+    </select>
 </mapper>