From f10b1af1378e02ca604a350f5072a922576d792d Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 15 Jul 2020 18:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1=E5=92=8C?= =?UTF-8?q?=E8=A7=A3=E7=A0=81=E9=94=A6=E6=B0=B4=E6=A8=A1=E5=9D=97=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiCustomInfoController.java | 15 ++++++++++++ .../esua/epdc/feign/CustomFeignClient.java | 13 +++++++++++ .../fallback/CustomFeignClientFallback.java | 6 +++++ .../esua/epdc/service/CustomService.java | 12 ++++++++++ .../epdc/service/impl/CustomServiceImpl.java | 5 ++++ .../com/elink/esua/epdc/dto/ModuleDTO.java | 5 ++++ .../controller/EpdcAppModuleController.java | 17 ++++++++++++++ .../module/controller/ModuleController.java | 16 +++++++++++++ .../epdc/modules/module/dao/ModuleDao.java | 18 +++++++++------ .../modules/module/entity/ModuleEntity.java | 5 ++++ .../modules/module/service/ModuleService.java | 18 +++++++++------ .../service/impl/ModuleServiceImpl.java | 9 ++++++-- .../resources/mapper/module/ModuleDao.xml | 23 +++++++++++++++++-- .../com/elink/esua/epdc/dto/NoticeDTO.java | 5 ++++ .../epdc/result/EpdcNoticeListResultDTO.java | 5 ++++ .../elink/esua/epdc/entity/NoticeEntity.java | 5 ++++ .../src/main/resources/mapper/NoticeDao.xml | 3 ++- .../epdc-oss/epdc-oss-server/pom.xml | 2 +- 18 files changed, 162 insertions(+), 20 deletions(-) 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 1534ad1a..7fdf3508 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 @@ -30,11 +30,26 @@ public class ApiCustomInfoController { * @Author zhangyong * @Date 13:37 2020-05-20 **/ + @Deprecated @GetMapping("module/list") public Result> listModule() { return customService.listModule(); } + /** + * + * 根据模块分类获取模块 + * + * @params [moduleCategory] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2020/7/15 17:43 + */ + @GetMapping("module/list/{moduleCategory}") + public Result> getModuleByModuleCategory(@PathVariable("moduleCategory") String moduleCategory) { + return customService.listOfModuleByModuleCategory(moduleCategory); + } + /** * 移动端获取 了解锦水-硬核管理接口 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index 20d1874f..2b546b7f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -41,9 +41,22 @@ public interface CustomFeignClient { * @Author zhangyong * @Date 10:42 2020-05-20 **/ + @Deprecated @GetMapping(value = "custom/epdc-app/module/list", consumes = MediaType.APPLICATION_JSON_VALUE) Result> selectListModule(); + /** + * + * 根据模块分类获取模块 + * + * @params [moduleCategory] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2020/7/15 17:43 + */ + @GetMapping("custom/epdc-app/module/list/{moduleCategory}") + Result> listOfModuleByModuleCategory(@PathVariable("moduleCategory") String moduleCategory); + /** * 移动端获取 了解锦水-硬核管理接口 * @param formDTO diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index 0f2aaaec..8874bf45 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -10,6 +10,7 @@ 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; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -31,6 +32,11 @@ public class CustomFeignClientFallback implements CustomFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListModule", null); } + @Override + public Result> listOfModuleByModuleCategory(String moduleCategory) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getModuleByModuleCategory", moduleCategory); + } + @Override public Result> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListDeptInfo", 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 4cc26e20..6c3eaf53 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 @@ -42,8 +42,20 @@ public interface CustomService { * @Author zhangyong * @Date 10:42 2020-05-20 **/ + @Deprecated Result> listModule(); + /** + * + * 根据模块分类获取模块 + * + * @params [moduleCategory] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2020/7/15 17:44 + */ + Result> listOfModuleByModuleCategory(String moduleCategory); + /** * 移动端获取 了解锦水-硬核管理接口 * 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 db1fc38c..9b319702 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 @@ -89,6 +89,11 @@ public class CustomServiceImpl implements CustomService { return customFeignClient.selectListModule(); } + @Override + public Result> listOfModuleByModuleCategory(String moduleCategory) { + return customFeignClient.listOfModuleByModuleCategory(moduleCategory); + } + @Override 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/ModuleDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ModuleDTO.java index c9926b5f..1f73be39 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ModuleDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ModuleDTO.java @@ -98,4 +98,9 @@ public class ModuleDTO implements Serializable { */ private Date updatedTime; + /** + * 模块分类 + */ + private String moduleCategory; + } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/EpdcAppModuleController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/EpdcAppModuleController.java index be66920a..c5b0eaba 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/EpdcAppModuleController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/EpdcAppModuleController.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO; import com.elink.esua.epdc.modules.module.service.ModuleService; import org.springframework.beans.factory.annotation.Autowired; 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; @@ -32,8 +33,24 @@ public class EpdcAppModuleController { * @Author zhangyong * @Date 10:42 2020-05-20 **/ + @Deprecated @GetMapping("list") public Result> listModule() { return moduleService.listModule(); } + + /** + * + * 根据模块类别获取模块 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2020/7/15 17:33 + */ + @GetMapping("list/{moduleCategory}") + public Result> getModuleByModuleCategory(@PathVariable("moduleCategory") String moduleCategory) { + List data = moduleService.listOfModuleByModuleCategory(moduleCategory); + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/ModuleController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/ModuleController.java index 080de6a5..d87cc88e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/ModuleController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/ModuleController.java @@ -27,6 +27,7 @@ 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.ModuleDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO; import com.elink.esua.epdc.modules.module.excel.ModuleExcel; import com.elink.esua.epdc.modules.module.service.ModuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -102,4 +103,19 @@ public class ModuleController { public Result> getListSimpleByDictType(@PathVariable("dictType") String dictType) { return moduleService.getListSimpleByDictType(dictType); } + + /** + * + * 获取消息通知分类 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2020/7/15 16:49 + */ + @GetMapping("noticeCategory") + public Result> getNoticeCategory() { + List data = moduleService.listOfModuleByModuleCategory(null); + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/dao/ModuleDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/dao/ModuleDao.java index aab39967..08cf102c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/dao/ModuleDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/dao/ModuleDao.java @@ -54,13 +54,17 @@ public interface ModuleDao extends BaseDao { **/ int getModuleCodeCount(String moduleCode); - /* - * 移动端获取 了解锦水-模块管理接口 + @Deprecated + List selectlistModule(); + + /** + * + * 通知模块类别 * - * @param + * @params [] * @return java.util.List - * @Author zhangyong - * @Date 10:42 2020-05-20 - **/ - List selectListModule(); + * @author liuchuang + * @since 2020/7/15 17:02 + */ + List selectListModuleByModuleCategory(String moduleCategory); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/entity/ModuleEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/entity/ModuleEntity.java index e1a15aaf..3243bd85 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/entity/ModuleEntity.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/entity/ModuleEntity.java @@ -68,4 +68,9 @@ public class ModuleEntity extends BaseEpdcEntity { */ private String remark; + /** + * 模块分类 + */ + private String moduleCategory; + } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/ModuleService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/ModuleService.java index 5ed1f06c..2c089ad6 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/ModuleService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/ModuleService.java @@ -105,13 +105,17 @@ public interface ModuleService extends BaseService { **/ Result> getListSimpleByDictType(String dictType); - /* - * 移动端获取 了解锦水-模块管理接口 + @Deprecated + Result> listModule(); + + /** + * + * 通知模块类别 * - * @param + * @params [moduleCategory] * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author zhangyong - * @Date 10:42 2020-05-20 - **/ - Result> listModule(); + * @author liuchuang + * @since 2020/7/15 17:09 + */ + List listOfModuleByModuleCategory(String moduleCategory); } 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 a728578e..65fe4f00 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 @@ -119,8 +119,13 @@ public class ModuleServiceImpl extends BaseServiceImpl @Override public Result> listModule() { - List data = baseDao.selectListModule(); - return new Result().ok(data); + List data = baseDao.selectlistModule(); + return new Result>().ok(data); + } + + @Override + public List listOfModuleByModuleCategory(String moduleCategory) { + return baseDao.selectListModuleByModuleCategory(moduleCategory); } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/module/ModuleDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/module/ModuleDao.xml index 7bdc7cfb..dc6e6cb1 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/module/ModuleDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/module/ModuleDao.xml @@ -27,7 +27,8 @@ IMG_URL imgUrl, SORT sort, ENABLE_FLAG enableFlag, - REMARK remark + REMARK remark, + MODULE_CATEGORY moduleCategory FROM epdc_module WHERE DEL_FLAG = 0 @@ -47,7 +48,22 @@ AND DEL_FLAG = 0 - + SELECT + ID id, + NAME `name`, + MODULE_CODE moduleCode, + IMG_URL imgUrl, + SORT sort + FROM + epdc_module + WHERE DEL_FLAG = 0 + AND ENABLE_FLAG = 1 + AND MODULE_CODE IN('notice_impression', 'notice_taste', 'module_hardcore', 'notice_warning', 'module_file') + ORDER BY SORT,CREATED_TIME + + + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java index 754b0eac..3c84278e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java @@ -144,4 +144,9 @@ public class NoticeDTO implements Serializable { * 锦水-消息通知分类 */ private String noticeCategory; + + /** + * 联系方式 + */ + private String mobile; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java index c7c2fb9f..ac748148 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java @@ -48,4 +48,9 @@ public class EpdcNoticeListResultDTO implements Serializable { * 通知内容 */ private String noticeContent; + + /** + * 联系电话 + */ + private String mobile; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java index c31e1ffd..4480ebe1 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java @@ -111,4 +111,9 @@ public class NoticeEntity extends BaseEpdcEntity { * 锦水-消息通知分类 */ private String noticeCategory; + + /** + * 联系方式 + */ + private String mobile; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index 4930a077..9b5de6dd 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -109,7 +109,8 @@ en.RELEASE_TIME AS noticeTime, SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName, en.NOTICE_IMAGE_URL imgUrl, - en.NOTICE_CONTENT noticeContent + en.NOTICE_CONTENT noticeContent, + en.MOBILE as mobile FROM epdc_notice en RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index db4f1705..228d201b 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -199,7 +199,7 @@ true 47.104.224.45:8848 - + 47.104.224.45 fa5bf520-09c1-410c-a876-28e98c0534d3