From 1ed8b1805f67f2db0ff7b90587d2083f8e3cd6a2 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 19 Apr 2021 10:02:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/DeptMaCodeDTO.java    |  7 +++-
 .../epdc-admin/epdc-admin-server/pom.xml      |  9 ++++++
 .../elink/esua/epdc/dao/DeptMaCodeDao.java    | 12 ++++++-
 .../esua/epdc/entity/DeptMaCodeEntity.java    |  7 +++-
 .../service/impl/DeptMaCodeServiceImpl.java   | 32 ++++++++++++-------
 .../src/main/resources/application.yml        |  9 +++++-
 .../main/resources/mapper/DeptMaCodeDao.xml   | 12 +++++--
 7 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java
index 60c74d04..f730479e 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java
@@ -99,4 +99,9 @@ public class DeptMaCodeDTO implements Serializable {
      */
     private String grid;
 
-}
\ No newline at end of file
+    /**
+     * 志愿者去哪小程序网格码
+     */
+    private String volunteerCodeUrl;
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index 537f98e4..9230ffca 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -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]]>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java
index c5bb9c47..a1235662 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java
@@ -53,4 +53,14 @@ public interface DeptMaCodeDao extends BaseDao<DeptMaCodeEntity> {
      * @date 2019/9/19 10:38
      */
     List<Long> selectListNoCodeGridId();
-}
\ No newline at end of file
+
+    /**
+     * 根据网格ID删除网格码
+     */
+    void deleteMaCodeByGridId(Long gridId);
+
+    /**
+     * 根据网格长标识删除网格码
+     */
+    void deleteMaCodeByLeaderFlag(String leaderFlag);
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java
index 18a96368..37b0f0f1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java
@@ -51,4 +51,9 @@ public class DeptMaCodeEntity extends BaseEpdcEntity {
      */
     private String leaderFlag;
 
-}
\ No newline at end of file
+    /**
+     * 志愿者去哪小程序网格码
+     */
+    private String volunteerCodeUrl;
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
index 492128a0..877ed263 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
@@ -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;
@@ -150,8 +151,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_PAGE_URL, NumConstant.ONE_STR));
             entity.setGridId(gridId);
+            baseDao.deleteMaCodeByGridId(gridId);
             this.baseDao.insert(entity);
         }
         return new Result();
@@ -160,24 +163,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_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_PAGE_URL, NumConstant.ONE_STR));
         entity.setLeaderFlag(YesOrNoEnum.YES.value());
+        baseDao.deleteMaCodeByLeaderFlag(NumConstant.ONE_STR);
         this.baseDao.insert(entity);
         return new Result();
     }
@@ -187,14 +188,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 +249,4 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
index 14023ceb..e675cdea 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
@@ -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@
\ No newline at end of file
+    group: @rocketmq.producer.group@
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml
index 2889a5e8..a0ed3266 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml
@@ -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>
\ No newline at end of file
+    <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>

From 2000ce57dc5bd8ff0c8abd36ccf73d5272d7a30f Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 19 Apr 2021 10:20:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9e=E9=94=A6=E6=B0=B4?=
 =?UTF-8?q?=E5=92=8C=E5=BF=97=E6=84=BF=E8=80=85=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BD=91=E6=A0=BC=E7=A0=81=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/DeptMaCodeServiceImpl.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
index 877ed263..dfd3a77f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
@@ -67,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) {
@@ -152,7 +153,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
         for (Long gridId : gridIdList) {
             entity = new DeptMaCodeEntity();
             entity.setCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
-            entity.setVolunteerCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL, NumConstant.ONE_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);
@@ -164,7 +165,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     public Result createDeptMaCode(String gridId) {
         DeptMaCodeEntity entity = new DeptMaCodeEntity();
         entity.setCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
-        entity.setVolunteerCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL, NumConstant.ONE_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));
@@ -176,7 +177,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     public Result createGridLeaderMaCode() {
         DeptMaCodeEntity entity = new DeptMaCodeEntity();
         entity.setCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
-        entity.setVolunteerCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL, NumConstant.ONE_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);