模块分类修改

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@@ -4,11 +4,13 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
 import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
-import com.elink.esua.epdc.dto.form.ModuleCategoryFormDTO;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.service.CustomService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -101,16 +103,4 @@ public class ApiCustomInfoController {
     public Result<ArchiveDetailResultDTO> getArchiveDetail(@PathVariable("id") String id) {
         return customService.getArchiveDetail(id);
     }
-
-    /**
-     * @Description  小程序获取模块分类
-     * @Author songyunpeng
-     * @Date  2020/10/29
-     * @Param [dto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
-     **/
-    @GetMapping("module/moduleCategory")
-    public Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto){
-        return customService.getModuleCategory(dto);
-    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java

@@ -222,4 +222,17 @@ public class ApiNewsController {
     public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@LoginUser TokenDto userDetail) {
         return newsService.selectOneFristByUserId(userDetail);
     }
+
+
+    /**
+     * @Description  小程序获取模块分类
+     * @Author songyunpeng
+     * @Date  2020/10/29
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
+     **/
+    @GetMapping("module/moduleCategory")
+    public Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto){
+        return newsService.getModuleCategory(dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -2,7 +2,10 @@ 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.form.*;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -10,7 +13,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -73,15 +75,4 @@ public interface CustomFeignClient {
 
     @GetMapping(value = "custom/archive/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<ArchiveDetailResultDTO> getArchiveDetail(@PathVariable("id") String id);
-
-    /**
-     * @Description  小程序获取模块类别
-     * @Author songyunpeng
-     * @Date  2020/10/29
-     * @Param [dto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
-     **/
-    @GetMapping("custom/modulecategory/moduleCategory")
-    Result<List<ModuleCategoryResultDTO>> getModuleCategory(@RequestBody ModuleCategoryFormDTO dto);
-
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@@ -168,4 +168,14 @@ public interface NewsFeignClient {
      **/
     @GetMapping(value = "news/epdc-app/notice/v2/listNotice", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EpdcNoticeListResultDTO>> listV2Notice(EpdcNoticeListV2FormDTO formDto);
+
+    /**
+     * @Description  小程序获取模块类别
+     * @Author songyunpeng
+     * @Date  2020/10/29
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
+     **/
+    @GetMapping("news/modulecategory/moduleCategory")
+    Result<List<ModuleCategoryResultDTO>> getModuleCategory(@RequestBody ModuleCategoryFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@@ -3,7 +3,10 @@ package com.elink.esua.epdc.feign.fallback;
 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.form.*;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import org.springframework.stereotype.Component;
@@ -52,9 +55,4 @@ public class CustomFeignClientFallback implements CustomFeignClient {
     public Result<ArchiveDetailResultDTO> getArchiveDetail(String id) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getArchiveDetail", id);
     }
-
-    @Override
-    public Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "ModuleCategoryFormDTO", dto);
-    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java

@@ -83,4 +83,9 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     public Result<List<EpdcNoticeListResultDTO>> listV2Notice(EpdcNoticeListV2FormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listV2Notice", formDto);
     }
+
+    @Override
+    public Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "ModuleCategoryFormDTO", dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@@ -2,7 +2,10 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
-import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.*;
 
 import java.util.List;
@@ -87,12 +90,4 @@ public interface CustomService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO>
      **/
     Result<ArchiveDetailResultDTO> getArchiveDetail(String id);
-    /**
-     * @Description   小程序获取模块分类
-     * @Author songyunpeng
-     * @Date  2020/10/29
-     * @Param [dto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
-     **/
-    Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@@ -163,4 +163,13 @@ public interface NewsService {
      * @since 2020/10/26 14:24
      */
     Result<List<EpdcAppHomeDataResultDTO>> selectHomeData(TokenDto userDetail);
+
+    /**
+     * @Description   小程序获取模块分类
+     * @Author songyunpeng
+     * @Date  2020/10/29
+     * @Param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
+     **/
+    Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@@ -4,7 +4,10 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.form.ArchiveDeptFormDTO;
+import com.elink.esua.epdc.dto.form.ArchiveFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.CustomFeignClient;
@@ -110,9 +113,4 @@ public class CustomServiceImpl implements CustomService {
     public Result<ArchiveDetailResultDTO> getArchiveDetail(String id) {
         return customFeignClient.getArchiveDetail(id);
     }
-
-    @Override
-    public Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto) {
-        return customFeignClient.getModuleCategory(dto);
-    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -152,4 +152,9 @@ public class NewsServiceImpl implements NewsService {
         data.add(actDto);
         return new Result<List<EpdcAppHomeDataResultDTO>>().ok(data);
     }
+
+    @Override
+    public Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto) {
+        return newsFeignClient.getModuleCategory(dto);
+    }
 }

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

@@ -17,12 +17,12 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import lombok.Data;
-
 
 /**
  * 通知表
@@ -154,4 +154,14 @@ public class NoticeDTO implements Serializable {
      * 通知视频地址
      */
     private String noticeVideoUrl;
+
+    /**
+     * 类别名
+     */
+    private String categoryName;
+    /**
+     * 模块分类回显
+     */
+    private List<String> noticeCategoriesShow;
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/ModuleCategoryFormDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/ModuleCategoryFormDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.form;
+package com.elink.esua.epdc.dto.epdc.form;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/ModuleCategoryResultDTO.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.result;
+package com.elink.esua.epdc.dto.epdc.result;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/controller/ModuleCategoryController.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/ModuleCategoryController.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.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;
@@ -27,10 +27,10 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.CategoryOption;
 import com.elink.esua.epdc.dto.ModuleCategoryDTO;
-import com.elink.esua.epdc.dto.form.ModuleCategoryFormDTO;
-import com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO;
-import com.elink.esua.epdc.modules.moduleCategory.excel.ModuleCategoryExcel;
-import com.elink.esua.epdc.modules.moduleCategory.service.ModuleCategoryService;
+import com.elink.esua.epdc.dto.epdc.form.ModuleCategoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.ModuleCategoryResultDTO;
+import com.elink.esua.epdc.excel.ModuleCategoryExcel;
+import com.elink.esua.epdc.service.ModuleCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -52,7 +52,7 @@ public class NoticeController {
 
     @GetMapping("page")
     public Result<PageData<NoticeDTO>> page(@RequestParam Map<String, Object> params) {
-        PageData<NoticeDTO> page = noticeService.page(params);
+        PageData<NoticeDTO> page = noticeService.listPage(params);
         return new Result<PageData<NoticeDTO>>().ok(page);
     }
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/dao/ModuleCategoryDao.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/ModuleCategoryDao.java

@@ -15,14 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.dao;
+package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.ModuleCategoryTreeDTO;
-import com.elink.esua.epdc.dto.form.ModuleCategoryFormDTO;
-import com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO;
-import com.elink.esua.epdc.modules.moduleCategory.entity.ModuleCategoryEntity;
+import com.elink.esua.epdc.dto.epdc.form.ModuleCategoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.ModuleCategoryResultDTO;
+import com.elink.esua.epdc.entity.ModuleCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -67,4 +68,19 @@ public interface ModuleCategoryDao extends BaseDao<ModuleCategoryEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>
      **/
     List<ModuleCategoryResultDTO> selectListModuleCategory(ModuleCategoryFormDTO dto);
+    /**
+     * @Description  根据code获取父模块分类 IDs
+     * @Author songyunpeng
+     * @Date  2020/10/30
+     * @Param [noticeCategoryCode]
+     **/
+    String getModuleCategoryIdsHierarchy(String noticeCategoryCode);
+    /**
+     * @Description  根据code获取父模块分类 Codes
+     * @Author songyunpeng
+     * @Date  2020/10/30
+     * @Param [moduleCategoryIds]
+     * @return java.util.List<java.lang.String>
+     **/
+    List<String> getModuleCategoryCodesHierarchy(@Param("moduleCategoryIds") List<String> moduleCategoryIds);
 }

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

@@ -130,4 +130,12 @@ public interface NoticeDao extends BaseDao<NoticeEntity> {
      * @Date 09:43 2020-06-02
      **/
     List<Long> selectListNoticeDeptIdInfo(String noticeId);
+    /**
+     * @Description  ？
+     * @Author songyunpeng
+     * @Date  2020/10/30
+     * @Param [params]
+     * @return java.util.List<com.elink.esua.epdc.dto.NoticeDTO>
+     **/
+    List<NoticeDTO> selectListOfNoticeDTO(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/entity/ModuleCategoryEntity.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/ModuleCategoryEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.entity;
+package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/excel/ModuleCategoryExcel.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/ModuleCategoryExcel.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.excel;
+package com.elink.esua.epdc.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/redis/ModuleCategoryRedis.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/ModuleCategoryRedis.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.redis;
+package com.elink.esua.epdc.redis;
 
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import org.springframework.beans.factory.annotation.Autowired;

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/service/ModuleCategoryService.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/ModuleCategoryService.java

@@ -15,16 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.service;
+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.CategoryOption;
 import com.elink.esua.epdc.dto.ModuleCategoryDTO;
-import com.elink.esua.epdc.dto.form.ModuleCategoryFormDTO;
-import com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO;
-import com.elink.esua.epdc.modules.moduleCategory.entity.ModuleCategoryEntity;
+import com.elink.esua.epdc.dto.epdc.form.ModuleCategoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.ModuleCategoryResultDTO;
+import com.elink.esua.epdc.entity.ModuleCategoryEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -117,4 +117,12 @@ public interface ModuleCategoryService extends BaseService<ModuleCategoryEntity>
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO>>
      **/
     Result<List<ModuleCategoryResultDTO>> getModuleCategory(ModuleCategoryFormDTO dto);
+    /**
+     * @Description  根据code获取父模块分类
+     * @Author songyunpeng
+     * @Date  2020/10/30
+     * @Param [noticeCategory]
+     * @return java.util.List<java.lang.String>
+     **/
+    List<String> getModuleCategoryHierarchy(String noticeCategoryCode);
 }

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

@@ -181,4 +181,12 @@ public interface NoticeService extends BaseService<NoticeEntity> {
      * @Date 09:46 2020-05-19
      **/
     Result<List<EpdcNoticeListResultDTO>> listV2Notice(EpdcNoticeListV2FormDTO formDto);
+    /**
+     * @Description  ？
+     * @Author songyunpeng
+     * @Date  2020/10/30
+     * @Param [params]
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.NoticeDTO>
+     **/
+    PageData<NoticeDTO> listPage(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/service/impl/ModuleCategoryServiceImpl.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.service.impl;
+package com.elink.esua.epdc.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -29,16 +29,16 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dao.ModuleCategoryDao;
 import com.elink.esua.epdc.dto.CategoryOption;
 import com.elink.esua.epdc.dto.ModuleCategoryDTO;
 import com.elink.esua.epdc.dto.ModuleCategoryTreeDTO;
-import com.elink.esua.epdc.dto.form.ModuleCategoryFormDTO;
-import com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO;
-import com.elink.esua.epdc.modules.moduleCategory.dao.ModuleCategoryDao;
-import com.elink.esua.epdc.modules.moduleCategory.entity.ModuleCategoryEntity;
-import com.elink.esua.epdc.modules.moduleCategory.redis.ModuleCategoryRedis;
-import com.elink.esua.epdc.modules.moduleCategory.service.ModuleCategoryService;
-import com.elink.esua.epdc.modules.moduleCategory.utils.TreeUtils;
+import com.elink.esua.epdc.dto.epdc.form.ModuleCategoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.ModuleCategoryResultDTO;
+import com.elink.esua.epdc.entity.ModuleCategoryEntity;
+import com.elink.esua.epdc.redis.ModuleCategoryRedis;
+import com.elink.esua.epdc.service.ModuleCategoryService;
+import com.elink.esua.epdc.util.TreeUtils;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -224,6 +224,19 @@ public class ModuleCategoryServiceImpl extends BaseServiceImpl<ModuleCategoryDao
         List<ModuleCategoryResultDTO> actApplyRecordResultDTOS  = this.baseDao.selectListModuleCategory(dto);
         return new Result<List<ModuleCategoryResultDTO>>().ok(actApplyRecordResultDTOS);    }
 
+    @Override
+    public List<String> getModuleCategoryHierarchy(String noticeCategoryCode) {
+
+        String moduleCategoryIdsStr = baseDao.getModuleCategoryIdsHierarchy(noticeCategoryCode);
+        if(StringUtils.isNotBlank(moduleCategoryIdsStr)){
+            String[] strings = moduleCategoryIdsStr.split(",");
+            List<String> moduleCategoryIds = Arrays.asList(strings);
+            List<String> moduleCategoryCodes = baseDao.getModuleCategoryCodesHierarchy(moduleCategoryIds);
+            return moduleCategoryCodes;
+        }
+        return new ArrayList<>();
+    }
+
     /**
      * @Description  组装信息
      * @Author songyunpeng

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

@@ -17,10 +17,10 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -28,7 +28,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.NoticeDTO;
@@ -43,6 +42,7 @@ import com.elink.esua.epdc.entity.NoticeEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.NoticeRedis;
 import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
+import com.elink.esua.epdc.service.ModuleCategoryService;
 import com.elink.esua.epdc.service.NoticeDepartmentService;
 import com.elink.esua.epdc.service.NoticeService;
 import com.elink.esua.epdc.util.NewsUtils;
@@ -71,6 +71,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     @Autowired
     private NoticeDepartmentService noticeDepartmentService;
 
+    @Autowired
+    private ModuleCategoryService moduleCategoryService;
+
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
         String noticeTitle = (String) params.get("noticeTitle");
@@ -125,7 +128,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
         // 通知部门回显
         List<Long> listNoticeDeptId = baseDao.selectListNoticeDeptIdInfo(dto.getId());
+        List<String> moduleCategories = moduleCategoryService.getModuleCategoryHierarchy(dto.getNoticeCategory());
         dto.setAllDeptIdsShow(this.getParentAllDeptInfo(listNoticeDeptId));
+        dto.setNoticeCategoriesShow(moduleCategories);
         return dto;
     }
 
@@ -339,4 +344,20 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         List<EpdcNoticeListResultDTO> noticeList = this.baseDao.selectListV2AppNotice(formDto);
         return new Result().ok(noticeList);
     }
+
+    @Override
+    public PageData<NoticeDTO> listPage(Map<String, Object> params) {
+        IPage<NoticeDTO> page = getPage(params);
+        String noticeTitle = (String) params.get("noticeTitle");
+        String noticeCategory = ((String) params.get("noticeCategory"));
+        if (StringUtils.isNotBlank(noticeCategory)) {
+            params.put("noticeCategory", noticeCategory.trim());
+        }
+        if(StringUtils.isNotBlank(noticeTitle)){
+            params.put("noticeTitle", noticeTitle.trim());
+        }
+        params.put("createdBy",SecurityUser.getUserId());
+        List<NoticeDTO> list = baseDao.selectListOfNoticeDTO(params);
+        return new PageData<>(list, page.getTotal());
+    }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/moduleCategory/utils/TreeUtils.java → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/util/TreeUtils.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.elink.esua.epdc.modules.moduleCategory.utils;
+package com.elink.esua.epdc.util;
 
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.dto.TreeNode;

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/moduleCategory/ModuleCategoryDao.xml → esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.modules.moduleCategory.dao.ModuleCategoryDao">
+<mapper namespace="com.elink.esua.epdc.dao.ModuleCategoryDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.moduleCategory.entity.ModuleCategoryEntity" id="moduleCategoryMap">
+    <resultMap type="com.elink.esua.epdc.entity.ModuleCategoryEntity" id="moduleCategoryMap">
         <result property="id" column="ID"/>
         <result property="pid" column="PID"/>
         <result property="pids" column="PIDS"/>
@@ -23,7 +23,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-    <select id="getList" resultType="com.elink.esua.epdc.modules.moduleCategory.entity.ModuleCategoryEntity">
+    <select id="getList" resultType="com.elink.esua.epdc.entity.ModuleCategoryEntity">
         select t1.*,t1.id as value,t1.category_name as label,(select t2.category_name from epdc_module_category t2 where t2.id=t1.pid)parentName from epdc_module_category t1
         where t1.del_flag = '0' AND t1.enable_flag = '1'
         order by t1.sort asc
@@ -42,11 +42,11 @@
         ORDER BY
             t1.sort ASC
     </select>
-    <select id="getById" resultType="com.elink.esua.epdc.modules.moduleCategory.entity.ModuleCategoryEntity">
+    <select id="getById" resultType="com.elink.esua.epdc.entity.ModuleCategoryEntity">
         select t1.*,(select t2.category_name from epdc_module_category t2 where t2.id=t1.pid)parentName from epdc_module_category t1
           where t1.id = #{value} and t1.del_flag = 0
     </select>
-    <select id="selectListModuleCategory" resultType="com.elink.esua.epdc.dto.result.ModuleCategoryResultDTO">
+    <select id="selectListModuleCategory" resultType="com.elink.esua.epdc.dto.epdc.result.ModuleCategoryResultDTO">
         select ID,
            PID,
            CATEGORY_CODE,
@@ -62,6 +62,22 @@
         order by sort
         LIMIT #{pageIndex},#{pageSize}
     </select>
+    <select id="getModuleCategoryIdsHierarchy" resultType="java.lang.String">
+        select
+            CONCAT(PIDS,',',ID)
+        from epdc_module_category
+        where CATEGORY_CODE = #{noticeCategoryCode}
+    </select>
+    <select id="getModuleCategoryCodesHierarchy" resultType="java.lang.String">
+        select
+            CATEGORY_CODE
+        from epdc_module_category
+        where ID in
+        <foreach item="moduleCategoryId" collection="moduleCategoryIds" open="(" separator="," close=")">
+            #{moduleCategoryId}
+        </foreach>
+        order by LENGTH(PIDS)
+    </select>
 
 
 </mapper>

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

@@ -141,4 +141,41 @@
         WHERE nd.DEL_FLAG = 0
         AND nd.NOTICE_ID = #{noticeId}
     </select>
+    <select id="selectListOfNoticeDTO" resultType="com.elink.esua.epdc.dto.NoticeDTO">
+    select
+        t1.ID,
+        t1.NOTICE_TITLE,
+        t1.NOTICE_CONTENT,
+        t1.DEPT_NAME,
+        t1.DEPT_ID,
+        t1.READING_AMOUNT,
+        t1.CREATOR_NAME,
+        t1.NOTICE_RELEASE_STATE,
+        t1.RELEASE_TIME,
+        t1.REVISION,
+        t1.CREATED_BY,
+        t1.CREATED_TIME,
+        t1.UPDATED_BY,
+        t1.UPDATED_TIME,
+        t1.DEL_FLAG,
+        t1.PARENT_DEPT_IDS,
+        t1.PARENT_DEPT_NAMES,
+        t1.ALL_DEPT_IDS,
+        t1.ALL_DEPT_NAMES,
+        t1.NOTICE_IMAGE_URL,
+        t1.NOTICE_CATEGORY,
+        t2.CATEGORY_NAME,
+        t1.MOBILE,
+        t1.NOTICE_VIDEO_URL
+        from epdc_notice t1
+        left join epdc_module_category t2 on t1.NOTICE_CATEGORY = t2.CATEGORY_CODE
+        where t1.DEL_FLAG='0' and t2.DEL_FLAG='0' and t1.CREATED_BY = #{createdBy}
+        <if test="noticeCategory != null and noticeCategory.trim() != ''">
+            and t1.NOTICE_CATEGORY =  #{noticeCategory}
+        </if>
+        <if test="noticeTitle != null and noticeTitle.trim() != ''">
+            and t1.NOTICE_TITLE like concat('%', #{noticeTitle}, '%')
+        </if>
+        order by t1.CREATED_TIME desc
+    </select>
 </mapper>