diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java index 094f2ffc..c0f86814 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java @@ -41,14 +41,13 @@ public class ApiCustomInfoController { /** * 移动端获取 了解锦水-硬核管理接口 * - * @param userDetail * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author zhangyong * @Date 13:41 2020-05-20 **/ @GetMapping("deptinfo/list") - public Result> listDeptInfo(@LoginUser TokenDto userDetail, EpdcDeptInfoFormDTO formDTO) { - return customService.listDeptInfo(userDetail, formDTO); + public Result> listDeptInfo(EpdcDeptInfoFormDTO formDTO) { + return customService.listDeptInfo(formDTO); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java index ecaa693b..c5946663 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java @@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.form.EpdcDeptInfoFormDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO; import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO; +import org.apache.poi.ss.formula.functions.T; import java.util.List; @@ -47,11 +48,10 @@ public interface CustomService { /** * 移动端获取 了解锦水-硬核管理接口 * - * @param userDetail * @param formDTO * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author zhangyong * @Date 13:41 2020-05-20 **/ - Result> listDeptInfo(TokenDto userDetail, EpdcDeptInfoFormDTO formDTO); + Result> listDeptInfo(EpdcDeptInfoFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java index 21dbc4d3..fc6fbfbf 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java @@ -90,8 +90,7 @@ public class CustomServiceImpl implements CustomService { } @Override - public Result> listDeptInfo(TokenDto userDetail, EpdcDeptInfoFormDTO formDTO) { - formDTO.setDeptId(userDetail.getGridId()); + public Result> listDeptInfo(EpdcDeptInfoFormDTO formDTO) { return customFeignClient.selectListDeptInfo(formDTO); } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java index 9a0c5974..08398bbe 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcDeptInfoFormDTO.java @@ -26,9 +26,4 @@ public class EpdcDeptInfoFormDTO implements Serializable { */ @Min(value = 1, message = "页容量必须大于0") private Integer pageSize; - - /** - * 部门id - */ - private long deptId; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcDeptInfoResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcDeptInfoResultDTO.java index 027ccc77..1a6054a8 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcDeptInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcDeptInfoResultDTO.java @@ -34,4 +34,9 @@ public class EpdcDeptInfoResultDTO implements Serializable { * 部门电话 */ private String mobile; + + /** + * 排序字段 + */ + private String sort; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcModuleResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcModuleResultDTO.java index 5ea0b1aa..085ee115 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcModuleResultDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcModuleResultDTO.java @@ -21,7 +21,7 @@ public class EpdcModuleResultDTO implements Serializable { private String id; /** - * 模块编码（0-政策导航，1-印象，2-味道，3-硬核，4-档案） + * 模块编码（印象：notice_impression、味道：notice_taste、档案：module_file、硬核：module_hardcore、警示：notice_warning） */ private String moduleCode; diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/enums/ModuleCategoryEnum.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/enums/ModuleCategoryEnum.java deleted file mode 100644 index 612a2c8b..00000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/enums/ModuleCategoryEnum.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.elink.esua.epdc.enums; - -import com.elink.esua.epdc.commons.tools.constant.NumConstant; - -/** - * 模块分类枚举 - * - * @author zhangyong - * @date 09:46 2020-05-19 - */ -public enum ModuleCategoryEnum { - /** - * 0 政策导航 - */ - MODULE_NAVIGATION("module_navigation", NumConstant.ZERO_STR), - /** - * 1 印象 - */ - MODULE_IMPRESSION("module_impression", NumConstant.ONE_STR), - /** - * 2 味道 - */ - MODULE_TASTE("module_taste", NumConstant.TWO_STR), - /** - * 3 硬核 - */ - MODULE_HARDCORE("module_hardcore", NumConstant.THREE_STR), - /** - * 4 档案 - */ - MODULE_FILE("module_file", NumConstant.FOUR_STR); - - private String name; - private String index; - - ModuleCategoryEnum(String name, String index) { - this.name = name; - this.index = index; - } - - public static String getName(String index) { - for (ModuleCategoryEnum c : ModuleCategoryEnum.values()) { - if (c.getIndex().equals(index)) { - return c.name; - } - } - return null; - } - - public static String getIndex(String name) { - for (ModuleCategoryEnum c : ModuleCategoryEnum.values()) { - if (c.getName().equals(name)) { - return c.index; - } - } - return null; - } - - public String getName() { - return name; - } - public String getIndex() { - return index; - } -} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/entity/DeptInfoEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/entity/DeptInfoEntity.java index 44eb91fd..7ccdac98 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/entity/DeptInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/entity/DeptInfoEntity.java @@ -52,4 +52,8 @@ public class DeptInfoEntity extends BaseEpdcEntity { */ private String mobile; + /** + * 排序字段 + */ + private String sort; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/impl/ModuleServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/impl/ModuleServiceImpl.java index 5769c9a4..876db15d 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/impl/ModuleServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/impl/ModuleServiceImpl.java @@ -27,7 +27,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO; import com.elink.esua.epdc.dto.ModuleDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; -import com.elink.esua.epdc.enums.ModuleCategoryEnum; import com.elink.esua.epdc.modules.dept.feign.AdminFeignClient; import com.elink.esua.epdc.modules.module.dao.ModuleDao; import com.elink.esua.epdc.modules.module.entity.ModuleEntity; @@ -121,22 +120,7 @@ public class ModuleServiceImpl extends BaseServiceImpl @Override public Result> listModule() { List data = baseDao.selectListModule(); - data = this.moduleCodeSwitchNumber(data); return new Result().ok(data); } - /** - * 模块编码转换成对应枚举的 下标，供前端作为消息通知的查询条件 - * @param dtos - * @return java.util.List - * @Author zhangyong - * @Date 10:55 2020-05-20 - **/ - private List moduleCodeSwitchNumber(List dtos) { - for (EpdcModuleResultDTO dto : dtos) { - dto.setModuleCode(ModuleCategoryEnum.getIndex(dto.getModuleCode())); - } - return dtos; - } - } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml index 0d999d99..69d8c165 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml @@ -14,6 +14,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java index f90cde71..42d4b16c 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java @@ -36,8 +36,10 @@ public class EpdcNoticeListV2FormDTO implements Serializable { private Integer pageSize; /** - * 通知类别:模块编码（1-印象，2-味道，5-最新通知，6-最热政策） + * 通知类别:模块编码（政策导航-最热政策：notice_navigation_hot、了解锦水-印象：notice_impression、了解锦水-味道：notice_taste、政策导航-最新通知： + * notice_navigation_new、了解锦水-警示：notice_warning） */ - @NotBlank(message = "通知类别（1-印象，2-味道，5-最新通知，6-最热政策）不能为空") + @NotBlank(message = "通知类别（政策导航-最热政策：notice_navigation_hot、了解锦水-印象：notice_impression、了解锦水-味道：notice_taste、政策导航-最新通知：\n" + + "notice_navigation_new、了解锦水-警示：notice_warning）不能为空") private String noticeCategory; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java deleted file mode 100644 index 06534692..00000000 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.elink.esua.epdc.enums; - -import com.elink.esua.epdc.commons.tools.constant.NumConstant; - -/** - * 消息通知分类枚举 - * - * @author zhangyong - * @date 09:46 2020-05-19 - */ -public enum AppNoticeCategoryEnum { - - /** - * 1 印象 - */ - NOTICE_IMPRESSION("notice_impression", NumConstant.ONE_STR), - /** - * 2 味道 - */ - NOTICE_TASTE("notice_taste", NumConstant.TWO_STR), - /** - * 3 硬核 - */ - NOTICE_HARDCORE("notice_hardcore", NumConstant.THREE_STR), - /** - * 4 档案 - */ - NOTICE_FILE("notice_file", NumConstant.FOUR_STR), - - /** - * 5 政策导航-最新通知 - */ - NOTICE_NAVIGATION_NEW("notice_navigation_new", NumConstant.FIVE_STR), - - /** - * 6 政策导航-最热政策 - */ - NOTICE_NAVIGATION_HOT("notice_navigation_hot", NumConstant.SIX_STR); - - private String name; - private String index; - - AppNoticeCategoryEnum(String name, String index) { - this.name = name; - this.index = index; - } - - public static String getName(String index) { - for (AppNoticeCategoryEnum c : AppNoticeCategoryEnum.values()) { - if (c.getIndex().equals(index)) { - return c.name; - } - } - return null; - } - - public static String getIndex(String name) { - for (AppNoticeCategoryEnum c : AppNoticeCategoryEnum.values()) { - if (c.getName().equals(name)) { - return c.index; - } - } - return null; - } - - public String getName() { - return name; - } - public String getIndex() { - return index; - } -} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index 52f51025..c49bc38e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -40,7 +40,6 @@ import com.elink.esua.epdc.dto.epdc.form.v2.EpdcNoticeListV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO; import com.elink.esua.epdc.entity.NoticeEntity; -import com.elink.esua.epdc.enums.AppNoticeCategoryEnum; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.redis.NoticeRedis; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; @@ -324,7 +323,6 @@ public class NoticeServiceImpl extends BaseServiceImpl public Result> listV2Notice(EpdcNoticeListV2FormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - formDto.setNoticeCategory(AppNoticeCategoryEnum.getName(formDto.getNoticeCategory())); List noticeList = this.baseDao.selectListV2AppNotice(formDto); return new Result().ok(noticeList);