通讯录消息相关接口

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";
 }

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -294,6 +294,12 @@
                 <datasource.druid.opercustomize.username>epmet_oper_customize_user</datasource.druid.opercustomize.username>
                 <datasource.druid.opercustomize.password>EpmEt-db-UsEr</datasource.druid.opercustomize.password>
 
+                <datasource.druid.epmetmessage.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetmessage.url>
+                <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
+                <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -395,6 +401,12 @@
                 <datasource.druid.opercustomize.username>epmet</datasource.druid.opercustomize.username>
                 <datasource.druid.opercustomize.password>elink@833066</datasource.druid.opercustomize.password>
 
+                <datasource.druid.epmetmessage.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetmessage.url>
+                <datasource.druid.epmetmessage.username>epmet</datasource.druid.epmetmessage.username>
+                <datasource.druid.epmetmessage.password>elink@833066</datasource.druid.epmetmessage.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -496,6 +508,12 @@
                 <datasource.druid.opercustomize.username>epmet_oper_customize_user</datasource.druid.opercustomize.username>
                 <datasource.druid.opercustomize.password>EpmEt-db-UsEr</datasource.druid.opercustomize.password>
 
+                <datasource.druid.epmetmessage.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetmessage.url>
+                <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
+                <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>

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<ReceiversResultDTO> receivers(@RequestBody ReceiversFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        ReceiversResultDTO result  = govOrgService.getReceiverList(formDTO);
+        ReceiversResultDTO result  = epmetMessageService.getReceiverList(formDTO);
         return new Result<ReceiversResultDTO>().ok(result);
 
     }

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);
+}

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;
+    }
+}

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

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 下级组织/部门/网格列表

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