From 612cb410f837cd413bf2b2ddc5a7feeaf55a1e0f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 19 Aug 2021 15:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/DataSourceConstant.java | 1 + .../data-aggregator-server/pom.xml | 18 +++++++++++ .../dataaggre/controller/InfoController.java | 6 ++-- .../epmetmessage/EpmetMessageService.java | 18 +++++++++++ .../impl/EpmetMessageServiceImpl.java | 32 +++++++++++++++++++ .../service/govorg/GovOrgService.java | 9 ------ .../govorg/impl/GovOrgServiceImpl.java | 13 -------- .../src/main/resources/bootstrap.yml | 5 +++ 8 files changed, 77 insertions(+), 25 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java index d9eea40501..c6a3b0e1bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java @@ -32,4 +32,5 @@ public interface DataSourceConstant { String EVALUATION_INDEX = "evaluationIndex"; String OPERCUSTOMIZE="opercustomize"; + String EPMET_MESSAGE="epmentmessage"; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index b9bb88e7a9..f12fd9b93d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -294,6 +294,12 @@ epmet_oper_customize_user EpmEt-db-UsEr + + + + epmet_message_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -395,6 +401,12 @@ epmet elink@833066 + + + + epmet + elink@833066 + 0 r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com @@ -496,6 +508,12 @@ epmet_oper_customize_user EpmEt-db-UsEr + + + + epmet_message_user + EpmEt-db-UsEr + 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java index 124c0faf4f..29d4ea7e24 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java @@ -4,7 +4,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.govorg.form.ReceiversFormDTO; import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO; -import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.epmetmessage.EpmetMessageService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,7 +21,7 @@ import javax.annotation.Resource; @RequestMapping("info") public class InfoController { @Resource - private GovOrgService govOrgService; + private EpmetMessageService epmetMessageService; /** * @Description 已读未读列表 @@ -33,7 +33,7 @@ public class InfoController { @PostMapping("receivers") public Result receivers(@RequestBody ReceiversFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - ReceiversResultDTO result = govOrgService.getReceiverList(formDTO); + ReceiversResultDTO result = epmetMessageService.getReceiverList(formDTO); return new Result().ok(result); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java new file mode 100644 index 0000000000..eb5cd94040 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java @@ -0,0 +1,18 @@ +package com.epmet.dataaggre.service.epmetmessage; + +import com.epmet.dataaggre.dto.govorg.form.ReceiversFormDTO; +import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO; + +/** + * @author Administrator + */ +public interface EpmetMessageService { + /** + * @Description 获取已读未读人员列表 + * @Param formDTO + * @Return {@link ReceiversResultDTO} + * @Author zhaoqifeng + * @Date 2021/8/19 14:56 + */ + ReceiversResultDTO getReceiverList(ReceiversFormDTO formDTO); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java new file mode 100644 index 0000000000..d6d9046123 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java @@ -0,0 +1,32 @@ +package com.epmet.dataaggre.service.epmetmessage.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dto.govorg.form.ReceiversFormDTO; +import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO; +import com.epmet.dataaggre.service.epmetmessage.EpmetMessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2021/8/19 15:23 + */ +@Service +@DataSource(DataSourceConstant.EPMET_MESSAGE) +@Slf4j +public class EpmetMessageServiceImpl implements EpmetMessageService { + /** + * @param formDTO + * @Description 获取已读未读人员列表 + * @Param formDTO + * @Return {@link ReceiversResultDTO} + * @Author zhaoqifeng + * @Date 2021/8/19 14:56 + */ + @Override + public ReceiversResultDTO getReceiverList(ReceiversFormDTO formDTO) { + return null; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index ab88712f20..3a2c10ea1c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -95,15 +95,6 @@ public interface GovOrgService { */ StaffDetailV2FormDTO staffDetailV2(StaffDetailV2ResultDTO formDTO); - /** - * @Description 获取已读未读人员列表 - * @Param formDTO - * @Return {@link ReceiversResultDTO} - * @Author zhaoqifeng - * @Date 2021/8/19 14:56 - */ - ReceiversResultDTO getReceiverList(ReceiversFormDTO formDTO); - /** * @Description 下级组织/部门/网格列表 * @Param formDTO diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index a56260a333..e436e72fac 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -392,19 +392,6 @@ public class GovOrgServiceImpl implements GovOrgService { return null; } - /** - * @param formDTO - * @Description 获取已读未读人员列表 - * @Param formDTO - * @Return {@link ReceiversResultDTO} - * @Author zhaoqifeng - * @Date 2021/8/19 14:56 - */ - @Override - public ReceiversResultDTO getReceiverList(ReceiversFormDTO formDTO) { - return null; - } - /** * @param formDTO * @Description 下级组织/部门/网格列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index 98ff885e99..f84136b69a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -144,6 +144,11 @@ dynamic: url: @datasource.druid.opercustomize.url@ username: @datasource.druid.opercustomize.username@ password: @datasource.druid.opercustomize.password@ + epmetmessage: + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.epmetmessage.url@ + username: @datasource.druid.epmetmessage.username@ + password: @datasource.druid.epmetmessage.password@ feign: hystrix: enabled: true