Browse Source

【书记在线】-【小程序消息推送】-lipf-20200530

feature/dangjian
李鹏飞 6 years ago
parent
commit
b075a54a7f
  1. 4
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
  2. 8
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  3. 7
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
  4. 5
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java
  5. 4
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java
  6. 4
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserRelationClientFallback.java
  7. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
  8. 18
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
  9. 24
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
  10. 82
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
  11. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/SendMessageFormDTO.java
  12. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  13. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  14. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
  15. 21
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
  16. 15
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/HttpRequest.java
  17. 2
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
  18. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  19. 2
      esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
  20. 2
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
  21. 2
      esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
  22. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
  23. 2
      esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
  24. 2
      esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
  25. 2
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
  26. 2
      esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml
  27. 4
      esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
  28. 2
      esua-epdc/epdc-module/epdc-webservice/pom.xml
  29. 2
      esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

4
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java

@ -100,10 +100,6 @@ public class SysUserDTO implements Serializable {
*/
private String userTagKey;
/**
* 微信openId
*/
private String openId;
/**
* 工作端微信work_open_id

8
esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@ -74,6 +74,12 @@
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-api-client</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
@ -239,7 +245,7 @@
<analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

7
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.result.UserWorkAndAnalyOpenIdDTO;
import com.elink.esua.epdc.dto.form.SendMessageFormDTO;
import com.elink.esua.epdc.excel.SysUserExcel;
import com.elink.esua.epdc.service.*;
import io.swagger.annotations.Api;
@ -512,9 +513,9 @@ public class SysUserController {
* @Author: wk
* @Date: 2020/5/26
*/
@GetMapping("userRelationWorkAndAnalyOpenId")
public Result<UserWorkAndAnalyOpenIdDTO> userRelationWorkAndAnalyOpenId(){
return sysUserService.selectOpenId();
@PostMapping("userRelationWorkAndAnalyOpenId")
public Result<UserWorkAndAnalyOpenIdDTO> userRelationWorkAndAnalyOpenId(@RequestBody SendMessageFormDTO formDto){
return sysUserService.selectOpenId(formDto.getUserList());
}
}

5
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java

@ -100,11 +100,6 @@ public class SysUserEntity extends BaseEntity {
*/
private String userTagKey;
/**
* 用户微信openId
*/
private String openId;
/**
* 工作端openId
*/

4
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/UserRelationFeignClient.java

@ -15,7 +15,7 @@ import java.util.List;
* @Author: wk
* @Date: 2020/5/26
*/
@FeignClient(name = ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, fallback = UserRelationClientFallback.class,url = "http://127.0.0.1:9060")
@FeignClient(name = ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, fallback = UserRelationClientFallback.class)
public interface UserRelationFeignClient {
/**
* @Description: 调用数据分析 - 书记在线的用户名单
@ -25,5 +25,5 @@ public interface UserRelationFeignClient {
* @Date: 2020/5/26
*/
@GetMapping(value = "/cloudAnalysis/masterGroup/getUserRelationList")
Result<List<String>> selectUserId();
Result<List<String>> getUserRelationList();
}

4
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserRelationClientFallback.java

@ -10,7 +10,7 @@ import java.util.List;
@Component
public class UserRelationClientFallback implements UserRelationFeignClient {
@Override
public Result<List<String>> selectUserId() {
return ModuleUtils.feignConError("epdc-cloud-analysis-server", "selectUserId");
public Result<List<String>> getUserRelationList() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CLOUD_ANALYSIS_SERVER, "getUserRelationList");
}
}

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@ -173,6 +173,6 @@ public interface SysUserService extends BaseService<SysUserEntity> {
* @Author: wk
* @Date: 2020/5/26
*/
Result<UserWorkAndAnalyOpenIdDTO> selectOpenId();
Result<UserWorkAndAnalyOpenIdDTO> selectOpenId(List<String> userList);
}

18
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@ -38,6 +38,7 @@ import com.elink.esua.epdc.feign.UserRelationFeignClient;
import com.elink.esua.epdc.service.SysDeptService;
import com.elink.esua.epdc.service.SysRoleUserService;
import com.elink.esua.epdc.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -53,6 +54,7 @@ import java.util.Map;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@Slf4j
@Service
public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntity> implements SysUserService {
@Autowired
@ -340,19 +342,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
* @Date: 2020/5/26
*/
@Override
public Result<UserWorkAndAnalyOpenIdDTO> selectOpenId() {
public Result<UserWorkAndAnalyOpenIdDTO> selectOpenId(List<String> userList) {
UserWorkAndAnalyOpenIdDTO openIdDto = new UserWorkAndAnalyOpenIdDTO();
//1.调用数据分析端-书记在线接口获取userId集合
Result<List<String>> ResultuserIdList = userRelationFeignClient.selectUserId();
List<String> userIds = ResultuserIdList.getData();
if (null == userIds|| userIds.size()==0) {
if (null == userList || userList.size() == 0) {
log.info("获取数据失败,请稍后再试");
return new Result().error("获取数据失败,请稍后再试");
}
//2.获得两项openId
List<String> workOpenIds = baseDao.selectListOpenIds(userIds,"1");
// workOpenIds.add("oZCeb5TZc2oBwT4jHb0kDmQsN0Xw");
log.info("获取数据"+userList.get(0));
List<String> workOpenIds = baseDao.selectListOpenIds(userList,"1");
openIdDto.setWorkOpenIds(workOpenIds);
List<String> AnalysisOpenIds = baseDao.selectListOpenIds(userIds,"2");
log.info("获取数据工作端:"+workOpenIds.size());
List<String> AnalysisOpenIds = baseDao.selectListOpenIds(userList,"2");
log.info("获取数据数据端:"+AnalysisOpenIds.size());
openIdDto.setAnalyOpenIds(AnalysisOpenIds);
return new Result<UserWorkAndAnalyOpenIdDTO>().ok(openIdDto);
}

24
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml

@ -3,51 +3,51 @@ spring:
driverClassName: com.mysql.jdbc.Driver
druid:
first: #数据源1
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
second: #数据源2
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
third: #数据源3
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
fourth: #数据源4
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
fifth: #数据源5
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
sixth: #数据源6
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
seventh: #数据源7
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
eighth: #数据源8
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
ninth: #数据源9
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
tenth: #数据源10
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
eleventh: #数据源11
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
twelve: #数据源12
url: jdbc:mysql://172.16.0.52:3306/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
initial-size: 10

82
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@ -116,33 +116,81 @@
<!--新闻数 通知数 议题数-->
<select id="selectListNewsNoticeEventCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
SELECT
dept.id gridId,
COUNT( DISTINCT nne.id ) newsCount,
COUNT( DISTINCT nnn.ID ) noticeCount,
COUNT( DISTINCT eee.ID ) eventCount
<!-- SELECT-->
<!-- dept.id gridId,-->
<!-- COUNT( DISTINCT nne.id ) newsCount,-->
<!-- COUNT( DISTINCT nnn.ID ) noticeCount,-->
<!-- COUNT( DISTINCT eee.ID ) eventCount-->
<!-- FROM-->
<!-- esua_epdc_admin.sys_dept dept-->
<!-- LEFT JOIN esua_epdc_news.epdc_news nne ON nne.DEPT_ID = dept.id AND nne.DEL_FLAG = '0'-->
<!-- LEFT JOIN esua_epdc_news.epdc_notice nnn ON nnn.DEPT_ID = dept.id AND nnn.DEL_FLAG = '0'-->
<!-- <if test="startTime != null and endTime != null and endTime != ''">-->
<!-- AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
<!-- </if>-->
<!-- LEFT JOIN esua_epdc_events.epdc_issue eee ON eee.GRID_ID = dept.id AND eee.DEL_FLAG = '0'-->
<!-- <if test="startTime != null and endTime != null and endTime != ''">-->
<!-- AND DATE_FORMAT(eee.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
<!-- </if>-->
<!-- where-->
<!-- dept.DEL_FLAG = '0'-->
<!-- AND dept.type_key = 'grid_party'-->
<!-- <if test="startTime != null and endTime != null and endTime != ''">-->
<!-- AND DATE_FORMAT(nne.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}-->
<!-- </if>-->
<!-- <if test="gridIdList != null and gridIdList.size() > 0">-->
<!-- AND dept.id in <include refid="foreachGridIdList"></include>-->
<!-- </if>-->
<!-- GROUP BY-->
<!-- dept.id-->
SELECT
dept.id gridId,
(
SELECT
count(1)
FROM
esua_epdc_admin.sys_dept dept
LEFT JOIN esua_epdc_news.epdc_news nne ON nne.DEPT_ID = dept.id AND nne.DEL_FLAG = '0'
LEFT JOIN esua_epdc_news.epdc_notice nnn ON nnn.DEPT_ID = dept.id AND nnn.DEL_FLAG = '0'
esua_epdc_news.epdc_news
WHERE
DEL_FLAG = '0'
<if test="startTime != null and endTime != null and endTime != ''">
AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
</if>
AND DEPT_ID = dept.id
) AS newsCount,
(
SELECT
count(1)
FROM
esua_epdc_news.epdc_notice
WHERE
DEL_FLAG = '0'
<if test="startTime != null and endTime != null and endTime != ''">
AND DATE_FORMAT(nnn.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
</if>
LEFT JOIN esua_epdc_events.epdc_issue eee ON eee.GRID_ID = dept.id AND eee.DEL_FLAG = '0'
AND DEPT_ID = dept.id
) AS noticeCount,
(SELECT
count(1)
FROM
esua_epdc_events.epdc_issue
WHERE
DEL_FLAG = '0'
<if test="startTime != null and endTime != null and endTime != ''">
AND DATE_FORMAT(eee.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
</if>
where
AND GRID_ID = dept.id
) AS eventCount
FROM
esua_epdc_admin.sys_dept dept
WHERE
dept.DEL_FLAG = '0'
AND dept.type_key = 'grid_party'
<if test="startTime != null and endTime != null and endTime != ''">
AND DATE_FORMAT(nne.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
</if>
<if test="gridIdList != null and gridIdList.size() > 0">
AND dept.id in <include refid="foreachGridIdList"></include>
</if>
GROUP BY
dept.id 
GROUP BY dept.id
</select>
<!--项目数-->

6
esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/SendMessageFormDTO.java

@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @program: esua-epdc
@ -22,4 +23,9 @@ public class SendMessageFormDTO implements Serializable {
*/
@NotNull(message = "消息推送类型不可为空")
private Integer type;
/**
* userList:成员列表
*
*/
private List<String> userList;
}

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -273,7 +273,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

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

@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserWorkAndAnalyOpenIdDTO;
import com.elink.esua.epdc.dto.form.SendMessageFormDTO;
import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@ -148,6 +149,6 @@ public interface AdminFeignClient {
* @author wanggonfeng
* @date 2020/05/26 14:18
*/
@GetMapping("sys/user/userRelationWorkAndAnalyOpenId")
Result<UserWorkAndAnalyOpenIdDTO> userRelationWorkAndAnalyOpenId();
@PostMapping("sys/user/userRelationWorkAndAnalyOpenId")
Result<UserWorkAndAnalyOpenIdDTO> userRelationWorkAndAnalyOpenId(SendMessageFormDTO formDto);
}

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

@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
import com.elink.esua.epdc.dto.form.SendMessageFormDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
import org.springframework.stereotype.Component;
@ -75,7 +76,7 @@ public class AdminFeignClientFallback implements AdminFeignClient {
}
@Override
public Result userRelationWorkAndAnalyOpenId() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "userRelationWorkAndAnalyOpenId");
public Result userRelationWorkAndAnalyOpenId(SendMessageFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "userRelationWorkAndAnalyOpenId",formDto);
}
}

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

@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl;
import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
@ -205,17 +206,26 @@ public class MessageServiceImpl implements MessageService {
}else{
throw new RenException("消息推送类型错误!");
}
if(formDto.getUserList() == null || formDto.getUserList().size() == 0){
log.info("获取成员失败!");
return new Result().error("获取成员失败!");
}
// 获取openID
Result<UserWorkAndAnalyOpenIdDTO> userIdsResult = adminFeignClient.userRelationWorkAndAnalyOpenId();
Result<UserWorkAndAnalyOpenIdDTO> userIdsResult = adminFeignClient.userRelationWorkAndAnalyOpenId(formDto);
log.info("开始推送:"+userIdsResult.toString());
if(userIdsResult == null || userIdsResult.getData() == null){
log.info("获取openid失败!");
return new Result().error("获取openid失败!");
}
// 调用获取openid接口
UserWorkAndAnalyOpenIdDTO userWorkAndAnalyOpenIdDTO = userIdsResult.getData();
List<String> analyOpenIdList = userWorkAndAnalyOpenIdDTO.getAnalyOpenIds();
List<String> workOpenIdList = userWorkAndAnalyOpenIdDTO.getWorkOpenIds();
log.info("开始推送数量数据端:"+analyOpenIdList.size());
log.info("开始推送数量工作端:"+workOpenIdList.size());
if (null != analyOpenIdList && analyOpenIdList.size() > 0) {
// 获取access_token
@ -264,6 +274,7 @@ public class MessageServiceImpl implements MessageService {
lang,
page);
System.out.println("接收者【" + openId + "】,发送结果【" + resultMsg + "】");
log.info("接收者【" + openId + "】,发送结果【" + resultMsg + "】");
//解析返回信息
Map map = JSONObject.parseObject(resultMsg, Map.class);
if (Integer.parseInt(map.get("errcode").toString()) == 0) {
@ -311,11 +322,12 @@ public class MessageServiceImpl implements MessageService {
jsonObject.put("touser",openId);
jsonObject.put("template_id",template_id);
jsonObject.put("miniprogram_state",miniprogram_state);
jsonObject.put("data",m);
jsonObject.put("data",JSON.parseObject(JSON.toJSONString(m)));
jsonObject.put("lang",lang);
jsonObject.put("page",page);
String parmStr = jsonObject.toJSONString();
log.error("传输内容"+parmStr);
String sr = HttpRequest.sendPost(url,parmStr);
return sr;
}
@ -331,6 +343,7 @@ public class MessageServiceImpl implements MessageService {
public String getAccess_token(String appid, String appsecret) {
// 获取access_token
String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" + "&appid=" + appid + "&secret=" + appsecret;
log.error("testtest");
String sr = HttpRequest.sendPost(url,"");
JSONObject json = JSONObject.parseObject(sr);

15
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/HttpRequest.java

@ -29,7 +29,9 @@ public class HttpRequest {
URLConnection connection = realUrl.openConnection();
// 设置通用的请求属性
connection.setRequestProperty("accept", "*/*");
connection.setRequestProperty("connection", "Keep-Alive");
connection.setRequestProperty("connection", "Keep-Alive");
connection.setRequestProperty("Accept-Charset", "UTF-8");
connection.setRequestProperty("Content-Type", "application/json");
connection.setRequestProperty("user-agent",
"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
// 建立实际的连接
@ -42,7 +44,7 @@ public class HttpRequest {
}
// 定义 BufferedReader输入流来读取URL的响应
in = new BufferedReader(new InputStreamReader(
connection.getInputStream()));
connection.getInputStream(),"utf-8"));
String line;
while ((line = in.readLine()) != null) {
result += line;
@ -83,12 +85,15 @@ public class HttpRequest {
URLConnection conn = realUrl.openConnection();
// 设置通用的请求属性
conn.setRequestProperty("accept", "*/*");
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("Accept-Charset", "UTF-8");
conn.setRequestProperty("Content-Type", "application/json");
conn.setRequestProperty("user-agent",
"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
// 发送POST请求必须设置如下两行
conn.setDoOutput(true);
conn.setDoInput(true);
conn.setDoInput(true);
conn.connect();
// 获取URLConnection对象对应的输出流
out = new PrintWriter(conn.getOutputStream());
// 发送请求参数
@ -97,7 +102,7 @@ public class HttpRequest {
out.flush();
// 定义BufferedReader输入流来读取URL的响应
in = new BufferedReader(
new InputStreamReader(conn.getInputStream()));
new InputStreamReader(conn.getInputStream(),"utf-8"));
String line;
while ((line = in.readLine()) != null) {
result += line;

2
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml

@ -243,7 +243,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@ -250,7 +250,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml

@ -216,7 +216,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@ -220,7 +220,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml

@ -206,7 +206,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml

@ -196,7 +196,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml

@ -205,7 +205,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@ -201,7 +201,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@ -240,7 +240,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml

@ -188,7 +188,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

4
esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@ -216,12 +216,12 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<dynamic.datasource.first.url>
<![CDATA[jdbc:mysql://172.16.0.54:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</dynamic.datasource.first.url>
<dynamic.datasource.first.username>epdc</dynamic.datasource.first.username>
<dynamic.datasource.first.password>Elink@833066</dynamic.datasource.first.password>

2
esua-epdc/epdc-module/epdc-webservice/pom.xml

@ -181,7 +181,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

2
esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

@ -221,7 +221,7 @@
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.0.52:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://rm-m5e8z9h4z06z60n8h5o.mysql.rds.aliyuncs.com:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>

Loading…
Cancel
Save