From 24372b4a9db418e94f177981b3fabb7a2bcfe4a7 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 13 May 2020 10:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=20-=20=20=E6=B4=BB=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=20=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/AppUserServiceImpl.java |  1 +
 .../epdc/constant/HeartNoticeConstant.java    |  6 +++++
 .../impl/ActUserRelationServiceImpl.java      | 23 ++++++++++++++++++-
 .../constant/VolunteerInfoNoticeConstant.java |  4 ++++
 .../impl/VolunteerInfoServiceImpl.java        | 14 ++++++++++-
 .../src/main/resources/application.yml        |  1 -
 6 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 1492b37e..79cd6cd7 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -1170,6 +1170,7 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setSex(IdentityNoUtils.getSex(identityNo));
             formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN));
             formDto.setUserId(tokenDto.getUserId());
+            formDto.setGridId(tokenDto.getGridId());
             // 新增志愿者
             Result<Integer> insertCountResult = userFeignClient.insertVolunteerInfo(formDto);
             if (!insertCountResult.success()) {
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java
index 4f3850b8..f39a31e2 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java
@@ -16,6 +16,12 @@ public interface HeartNoticeConstant {
      */
     String NOTICE_SIGN_UP_PASSED = "您报名的活动【审核通过】";
 
+    /**
+     * 活动报名自动审核
+     */
+    String AUTH_NOTICE_SIGN_UP= "自动审核";
+
+
     /**
      * 活动取消
      */
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index 08ede80e..60393345 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -349,7 +349,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         //6、插入points记录
         //通过动作编码获取动作信息
         Result<BehaviorResultDto> behaviorCodeInfo = pointsFeignClient.getBehaviorCodeInfo(BehaviorEnum.BREAK_PROMISE.getValue());
-        if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData()==null){
+        if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData() == null) {
             throw new RenException("获取动作编码信息异常或无此动作编码");
         }
         PointsLogsDTO pointsLogsDTO = new PointsLogsDTO();
@@ -480,6 +480,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 actUserLog.setOperationType(actUserDefaultState);// 默认状态
                 actUserLog.setOperationTime(new Date());
                 actUserLogDao.insert(actUserLog);
+                //给用户发送消息通知
+                this.sendNotice(actUserRelationDTO, actUserDefaultState, actInfoDTO);
             }
             // 审核不通过，活动的报名人数减少
             if (!NumConstant.ONE_STR.equals(actUserDefaultState)) {
@@ -495,4 +497,23 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         return new Result().ok("该活动对已报名的志愿者自动审核成功");
     }
 
+    //自动审核 定时任务 消息通知
+    private void sendNotice(ActUserRelationDTO actUserRelationDTO, String actUserDefaultState, ActInfoDTO actInfoDTO) {
+        EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        informationFormDTO.setUserId(actUserRelationDTO.getUserId());
+        informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE);
+        informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACT_FAILURE);
+        informationFormDTO.setBusinessId(actUserRelationDTO.getActId());
+        informationFormDTO.setRelBusinessContent(actInfoDTO.getTitle());
+        //审核不通过
+        if (!NumConstant.ONE_STR.equals(actUserDefaultState)) {
+            informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_NOT_PASSED);
+            informationFormDTO.setContent(HeartNoticeConstant.AUTH_NOTICE_SIGN_UP);
+        } else {
+            informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_PASSED);
+            informationFormDTO.setContent(HeartNoticeConstant.AUTH_NOTICE_SIGN_UP);
+        }
+        newsTask.insertUserInformation(informationFormDTO);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
index 2c8c0b9b..d503cc3d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
@@ -11,6 +11,10 @@ public interface VolunteerInfoNoticeConstant {
      */
     String NOTICE_CERTIFICATION_NOT_PASSED = "您的志愿者认证【审核未通过】";
     String NOTICE_CERTIFICATION_PASSED = "您的志愿者认证【审核通过】";
+    String AUTH_NOTICE_CERTIFICATION_PASSED_CONTENT = "自动审核";
+
+
+
     /**
      * 消息所属业务类型：volunteer志愿者审核
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
index c53cabd4..7156605c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
@@ -228,10 +228,22 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
         deleteVolunteerByUserId(volunteerEntity.getUserId());
         insert(volunteerEntity);
+        this.sendNotice(volunteerEntity);
         userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value());
         return new Result().ok(NumConstant.ONE);
     }
-
+    //组装发送消息
+    private void sendNotice(VolunteerInfoEntity volunteerInfoEntity) {
+        EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        // 审核不通过
+        informationFormDTO.setTitle(VolunteerInfoNoticeConstant.NOTICE_CERTIFICATION_PASSED);
+        informationFormDTO.setContent(VolunteerInfoNoticeConstant.AUTH_NOTICE_CERTIFICATION_PASSED_CONTENT);
+        informationFormDTO.setUserId(volunteerInfoEntity.getUserId());
+        informationFormDTO.setType(VolunteerInfoNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE);
+        informationFormDTO.setBusinessType(VolunteerInfoNoticeConstant.NOTICE__BUSINESS_TYPE_VOLUNTEER);
+        informationFormDTO.setBusinessId(volunteerInfoEntity.getId());
+        newsTask.insertUserInformation(informationFormDTO);
+    }
     /**
      * 清除志愿者认证历史
      *
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
index 7d33801b..d332a553 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -77,7 +77,6 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 rocketmq:
   name-server: @rocketmq.name.server@