通知管理页面 修改- 增加通知主图、通知分类

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java

@@ -135,4 +135,13 @@ public class NoticeDTO implements Serializable {
      */
     private List<Long[]> allDeptIdsShow;
 
-}
+    /**
+     * 锦水-通知主图
+     */
+    private String noticeImageUrl;
+
+    /**
+     * 锦水-消息通知分类
+     */
+    private String noticeCategory;
+}

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

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.NoticeDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.excel.NoticeExcel;
 import com.elink.esua.epdc.service.NoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,4 +112,16 @@ public class NoticeController {
         return new Result();
     }
 
-}
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 18:40 2020-05-18
+     **/
+    @GetMapping("listSimple/{dictType}")
+    public Result<List<SysSimpleDictDTO>> getListSimpleByDictType(@PathVariable("dictType") String dictType) {
+        Result<List<SysSimpleDictDTO>> list = noticeService.getListSimpleByDictType(dictType);
+        return list;
+    }
+}

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

@@ -102,4 +102,13 @@ public class NoticeEntity extends BaseEpdcEntity {
      */
     private String allDeptNames;
 
-}
+    /**
+     * 锦水-通知主图
+     */
+    private String noticeImageUrl;
+
+    /**
+     * 锦水-消息通知分类
+     */
+    private String noticeCategory;
+}

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,4 +40,15 @@ public interface AdminFeignClient {
      */
     @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
     Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @Author zhangyong
+     * @Date 18:40 2020-05-18
+     */
+    @GetMapping("/sys/dict/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> getListSimpleByDictType(@PathVariable("dictType") String dictType);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -26,4 +27,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
     }
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> getListSimpleByDictType(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleByDictType", dictType);
+    }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java

@@ -21,6 +21,7 @@ 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.NoticeDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
@@ -159,4 +160,13 @@ public interface NoticeService extends BaseService<NoticeEntity> {
      * @since 2020/3/7 1:23
      */
     void modifyOrganizationInfo(OrganizationModifyDTO dto);
-}
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 18:40 2020-05-18
+     **/
+    Result<List<SysSimpleDictDTO>> getListSimpleByDictType(String dictType);
+}

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

@@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.NoticeDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
@@ -286,4 +287,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
         return entities;
     }
-}
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> getListSimpleByDictType(String dictType) {
+        return adminFeignClient.getListSimpleByDictType(dictType);
+    }
+}