删除/添加置顶时间

epdc-cloud-news/src/main/java/com/elink/esua/epdc/controller/ModuleTypeController.java

@@ -133,5 +133,17 @@ public class ModuleTypeController {
         return new Result().ok(moduleOption);
     }
 
+    /**
+    * @describe: 删除栏目
+    * @author wangtong
+    * @date 2021/8/11 18:06
+    * @params [id]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @DeleteMapping("{id}")
+    public Result deleteById(@PathVariable("id") String id){
+        return moduleTypeService.deleteInfoById(id);
+    }
+
 
 }

epdc-cloud-news/src/main/java/com/elink/esua/epdc/controller/NoticeController.java

@@ -123,6 +123,13 @@ public class NoticeController {
         return noticeService.saveOrUpContent(dto);
     }
 
+    /**
+     * @describe: 后台管理-内容更新
+     * @author wangtong
+     * @date 2021/8/11 10:25
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
     @PutMapping("saveOrUpContent")
     public Result updateContent(@RequestBody NoticeDTO dto) {
         return noticeService.saveOrUpContent(dto);

epdc-cloud-news/src/main/java/com/elink/esua/epdc/dao/ModuleTypeDao.java

@@ -63,4 +63,13 @@ public interface ModuleTypeDao extends BaseDao<ModuleTypeEntity> {
     * @return java.util.List<com.elink.esua.epdc.dto.ModuleOptionDTO>
     */
     List<ModuleOptionDTO> getAllModuleList();
+
+    /**
+    * @describe: 查询直属下级的数量
+    * @author wangtong
+    * @date 2021/8/11 18:21
+    * @params [id]
+    * @return int
+    */
+    int selectCountByTypeId(@Param("id") String id);
 }

epdc-cloud-news/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java

@@ -118,4 +118,13 @@ public interface NoticeDao extends BaseDao<NoticeEntity> {
     * @return java.util.List<com.elink.esua.epdc.dto.ModuleTypeDTO>
     */
     List<NoticeDTO> getModulePageList(Map<String, Object> params);
+
+    /**
+    * @describe: 根据栏目id查询数量
+    * @author wangtong
+    * @date 2021/8/11 18:17
+    * @params [typeId]
+    * @return int
+    */
+    int selectCountByTypeId(@Param("typeId") String typeId);
 }

epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java

@@ -118,6 +118,11 @@ public class NoticeEntity extends BaseEpdcEntity {
      */
     private String topFlag;
 
+    /*
+     * 置顶时间
+     */
+    private Date topTime;
+
     /**
      * 上下架状态 0-下架，1-上架
      */

epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/ModuleTypeService.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ModuleOption;
 import com.elink.esua.epdc.dto.ModuleTypeCategoryDTO;
 import com.elink.esua.epdc.dto.ModuleTypeDTO;
@@ -122,4 +123,13 @@ public interface ModuleTypeService extends BaseService<ModuleTypeEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ModuleOption>
      */
     ModuleOption getAllModuleList();
+
+    /**
+    * @describe: 删除栏目
+    * @author wangtong
+    * @date 2021/8/11 18:08
+    * @params [id]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result deleteInfoById(String id);
 }

epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/ModuleTypeServiceImpl.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dao.ModuleTypeDao;
+import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.ModuleOption;
 import com.elink.esua.epdc.dto.ModuleOptionDTO;
 import com.elink.esua.epdc.dto.ModuleTypeCategoryDTO;
@@ -62,6 +63,9 @@ public class ModuleTypeServiceImpl extends BaseServiceImpl<ModuleTypeDao, Module
     @Autowired
     private AdminFeignClient adminFeignClient;
 
+    @Autowired
+    private NoticeDao noticeDao;
+
     @Override
     public PageData<ModuleTypeDTO> page(Map<String, Object> params) {
         IPage<ModuleTypeEntity> page = baseDao.selectPage(
@@ -175,6 +179,16 @@ public class ModuleTypeServiceImpl extends BaseServiceImpl<ModuleTypeDao, Module
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ModuleTypeDTO dto) {
+        String categoryCode = dto.getTypeCode();
+        QueryWrapper<ModuleTypeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type_code", dto.getTypeCode());
+        wrapper.eq("del_flag", "0");
+        wrapper.ne("id", dto.getId());
+        if (StringUtils.isNotBlank(categoryCode)) {
+            if (baseDao.selectCount(wrapper) > 0) {
+                throw new RenException("您输入的编码已存在");
+            }
+        }
         ModuleTypeEntity entity = ConvertUtils.sourceToTarget(dto, ModuleTypeEntity.class);
         updateById(entity);
     }
@@ -309,6 +323,20 @@ public class ModuleTypeServiceImpl extends BaseServiceImpl<ModuleTypeDao, Module
         return option;
     }
 
+    @Override
+    public Result deleteInfoById(String id) {
+        int contentCount = noticeDao.selectCountByTypeId(id);
+        if(contentCount>0){
+            return new Result().error("此栏目下存在相关内容，不可删除。");
+        }
+        int childTypeConut = baseDao.selectCountByTypeId(id);
+        if(childTypeConut>0){
+            return new Result().error("请先删除子栏目。");
+        }
+        baseDao.deleteById(id);
+        return new Result().ok("删除成功");
+    }
+
 
     List<ModuleOptionDTO> getOtherDept(List<ModuleOptionDTO> deptList, JSONArray parent) {
         List<Long> already = Lists.newArrayList();

epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -273,6 +273,11 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         entity.setDeptId(noticeDeptId);
         entity.setDeptName(user.getDeptName());
         entity.setAllTypeId(StringUtils.join(dto.getAllTypeId(), ","));
+        if("0".equals(entity.getTopFlag())){
+            entity.setTopTime(null);
+        }else{
+            entity.setTopTime(new Date());
+        }
         // 塞入全部部门ids,names
         Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(noticeDeptId));
         if (!parentResult.success() || parentResult.getData() == null) {

epdc-cloud-news/src/main/resources/mapper/ModuleTypeDao.xml

@@ -41,6 +41,12 @@
             where t1.del_flag = 0
             order by t1.sort asc
     </select>
+    <select id="selectCountByTypeId" resultType="int">
+        select count(id)
+        from epdc_module_type
+        where del_flag = 0
+              and pid=#{id}
+    </select>
 
 
 </mapper>

epdc-cloud-news/src/main/resources/mapper/NoticeDao.xml

@@ -106,7 +106,13 @@
                 AND en.NOTICE_TITLE like '%${noticeTitle}%'
             </if>
             and en.type_id is not null
-        order by en.CREATED_TIME desc
+        order by en.TOP_FLAG desc,en.TOP_TIME desc,en.CREATED_TIME desc
+    </select>
+    <select id="selectCountByTypeId" resultType="int">
+        select count(id)
+        from epdc_notice
+        where DEL_FLAG='0'
+              and type_id=#{typeId}
     </select>
 
 </mapper>