elink-star
/
esua-epdc-js
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/feature/syp_volunteer'

feature/screenDataPush
songyunpeng 5 years ago
parent
11a255d586 2000ce57dc
commit
250da896cc
7 changed files with 72 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java
  2. 9
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  3. 12
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java
  4. 7
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java
  5. 35
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
  6. 9
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
  7. 12
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml

7
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java
View File

@ -99,4 +99,9 @@ public class DeptMaCodeDTO implements Serializable {
*/
private String grid;
}
/**
* 志愿者去哪小程序网格码
*/
private String volunteerCodeUrl;
}

9
esua-epdc/epdc-admin/epdc-admin-server/pom.xml
View File

@ -173,6 +173,9 @@
<!--数据分析端小程序-->
<analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
<analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
<!--志愿者去哪儿小程序-->
<volunteer.wx.ma.appId>wxc4fe0ea629aaa309</volunteer.wx.ma.appId>
<volunteer.wx.ma.secret>34fa86621c3c1dcebd39db333e746d88</volunteer.wx.ma.secret>
<!--RocketMQ-->
<rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
@ -213,6 +216,9 @@
<!--数据分析端小程序-->
<analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
<analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
<!--志愿者去哪儿小程序-->
<volunteer.wx.ma.appId>wxc4fe0ea629aaa309</volunteer.wx.ma.appId>
<volunteer.wx.ma.secret>34fa86621c3c1dcebd39db333e746d88</volunteer.wx.ma.secret>
<!--RocketMQ-->
<rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
<rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
@ -241,6 +247,9 @@
<!--数据分析端小程序-->
<analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
<analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
<!--志愿者去哪儿小程序-->
<volunteer.wx.ma.appId>wxc4fe0ea629aaa309</volunteer.wx.ma.appId>
<volunteer.wx.ma.secret>34fa86621c3c1dcebd39db333e746d88</volunteer.wx.ma.secret>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://rm-m5e4l333jb61be50n.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>

12
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java
View File

@ -53,4 +53,14 @@ public interface DeptMaCodeDao extends BaseDao<DeptMaCodeEntity> {
* @date 2019/9/19 10:38
*/
List<Long> selectListNoCodeGridId();
}
/**
* 根据网格ID删除网格码
*/
void deleteMaCodeByGridId(Long gridId);
/**
* 根据网格长标识删除网格码
*/
void deleteMaCodeByLeaderFlag(String leaderFlag);
}

7
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java
View File

@ -51,4 +51,9 @@ public class DeptMaCodeEntity extends BaseEpdcEntity {
*/
private String leaderFlag;
}
/**
* 志愿者去哪小程序网格码
*/
private String volunteerCodeUrl;
}

35
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
View File

@ -17,6 +17,7 @@
package com.elink.esua.epdc.service.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -66,7 +67,8 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
/**
* 小程序首页
*/
private static String MA_FRONT_PAGE_URL = "pages/index/index";
private static String MA_FRONT_PAGE_URL = "pages/indexNew/indexNew";
private static String MA_FRONT_VOLUNTEER_PAGE_URL = "pages/heartNew/heartNew";
@Override
public PageData<DeptMaCodeDTO> page(Map<String, Object> params) {
@ -150,8 +152,10 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
DeptMaCodeEntity entity;
for (Long gridId : gridIdList) {
entity = new DeptMaCodeEntity();
entity.setCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL));
entity.setCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
entity.setVolunteerCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_VOLUNTEER_PAGE_URL, NumConstant.ONE_STR));
entity.setGridId(gridId);
baseDao.deleteMaCodeByGridId(gridId);
this.baseDao.insert(entity);
}
return new Result();
@ -160,24 +164,22 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
@Override
public Result createDeptMaCode(String gridId) {
DeptMaCodeEntity entity = new DeptMaCodeEntity();
entity.setCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL));
entity.setCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
entity.setVolunteerCodeUrl(this.createMaCode(gridId, MA_FRONT_VOLUNTEER_PAGE_URL, NumConstant.ONE_STR));
entity.setGridId(Long.parseLong(gridId));
entity.setLeaderFlag(YesOrNoEnum.NO.value());
baseDao.deleteMaCodeByGridId(Long.parseLong(gridId));
this.baseDao.insert(entity);
return new Result();
}
@Override
public Result createGridLeaderMaCode() {
QueryWrapper<DeptMaCodeEntity> wrapper = new QueryWrapper<>();
wrapper.eq("leader_flag", YesOrNoEnum.YES.value());
Integer selectCount = this.baseDao.selectCount(wrapper);
if (selectCount > NumConstant.ZERO) {
return new Result();
}
DeptMaCodeEntity entity = new DeptMaCodeEntity();
entity.setCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL));
entity.setCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
entity.setVolunteerCodeUrl(this.createMaCode("gridLeader", MA_FRONT_VOLUNTEER_PAGE_URL, NumConstant.ONE_STR));
entity.setLeaderFlag(YesOrNoEnum.YES.value());
baseDao.deleteMaCodeByLeaderFlag(NumConstant.ONE_STR);
this.baseDao.insert(entity);
return new Result();
}
@ -187,14 +189,21 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
*
* @param param 小程序码的参数
* @param pageUrl 小程序码的跳转链接
* @param platform 平台：0-e锦水，1-志愿者去哪
* @return java.lang.String 小程序码的下载抵制
* @author work@yujt.net.cn
* @date 2019/10/22 10:14
*/
private String createMaCode(String param, String pageUrl) {
private String createMaCode(String param, String pageUrl, String platform) {
File wxaCodeUnlimit;
WxMaService wxMaService;
try {
wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService()
if (NumConstant.ONE_STR.equals(platform)) {
wxMaService = wxMaServiceUtils.volunteerWxMaService();
} else {
wxMaService = wxMaServiceUtils.normalWxMaService();
}
wxaCodeUnlimit = wxMaService.getQrcodeService()
.createWxaCodeUnlimit(param, pageUrl, 1280, true, null, false);
} catch (WxErrorException e) {
throw new RenException("请求微信接口失败");
@ -241,4 +250,4 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
}
return null;
}
}
}

9
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
View File

@ -86,6 +86,11 @@ wx:
token: #微信小程序消息服务器配置的token
aesKey: #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON
- appid: @volunteer.wx.ma.appId@
secret: @volunteer.wx.ma.secret@
token: #微信小程序消息服务器配置的token
aesKey: #微信小程序消息服务器配置的EncodingAESKey
msgDataFormat: JSON
appId:
# 普通居民端的appId
normal: @wx.ma.appId@
@ -93,6 +98,8 @@ wx:
work: @work.wx.ma.appId@
# 数据分析端的appId
analysis: @analysis.wx.ma.appId@
# 志愿者去哪儿的appId
volunteer: @volunteer.wx.ma.appId@
feign:
@ -116,4 +123,4 @@ ribbon:
rocketmq:
name-server: @rocketmq.name.server@
producer:
group: @rocketmq.producer.group@
group: @rocketmq.producer.group@

12
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml
View File

@ -34,7 +34,15 @@
sys_dept d
WHERE
d.type_key = 'grid_party'
AND NOT EXISTS (SELECT 1 FROM epdc_dept_ma_code e WHERE e.GRID_ID = d.id AND e.DEL_FLAG = '0')
AND d.del_flag = 0
</select>
</mapper>
<delete id="deleteMaCodeByGridId">
DELETE FROM epdc_dept_ma_code WHERE GRID_ID = #{gridId}
</delete>
<delete id="deleteMaCodeByLeaderFlag">
DELETE FROM epdc_dept_ma_code WHERE LEADER_FLAG = #{leaderFlag}
</delete>
</mapper>

Write Preview
Loading…
Cancel
Save