From 3462a19f48a250ab53caa814407ee08007275b55 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 3 Aug 2020 17:56:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5-=20=E6=B4=BB=E5=8A=A8=E5=BD=93=E5=89=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ActInfoServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index 2470f86c76..01b232aa3b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -297,13 +298,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         } else if (currentTime.after(actInfoEntity.getSignUpEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) {
             /*报名结束，活动未开始：显示：截止报名*/
             return ActConstant.CURRENT_STATUS_USER_END_SIGN_UP;
-        } else if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
-            // 活动开始-结束的时间段内： 显示:已开始
+        } else if (currentTime.after(actInfoEntity.getActStartTime())) {
+            // 活动开始以后： 显示:已开始
             return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
-        } else {
-            // 最后，显示：已结束
-            return ActConstant.CURRENT_STATUS_USER_FINISHED;
         }
+        // 活动的状态是：finished ，显示：已结束
+        return ActConstant.CURRENT_STATUS_USER_FINISHED;
     }
 
     /**
@@ -326,8 +326,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return ActConstant.CURRENT_STATUS_USER_POINTS_CONFIRM;
         }
 
-        if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
-            /* 活动开始-结束的时间段内 */
+        if (currentTime.after(actInfoEntity.getActStartTime())) {
+            /* 活动开始后 */
             return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
         } else if (currentTime.before(actInfoEntity.getSignUpEndTime())) {
             /* 报名截至时间前 */

From a1b24f5e0e377699fc8415deeeb275a04b28b458 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 4 Aug 2020 09:39:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index 532a1ec5b2..2c11d426dd 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -303,7 +303,6 @@
             and <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
             then 'end_sign_up'
             when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
-            and <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW()
             then 'in_progress'
             end as actCurrentState
 		FROM act_info i
@@ -311,7 +310,6 @@
         WHERE i.DEL_FLAG = '0'
         AND i.CUSTOMER_ID = #{customerId}
         AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled'
-        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW()
         ORDER BY i.CREATED_TIME DESC
         LIMIT 0, #{num}
     </select>

From d34509f12aa29b7a8b7fbbf7456b65f50cff3839 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 4 Aug 2020 09:56:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E3=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E5=86=B5=EF=BC=8C=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/ActMessageConstant.java  | 10 ----------
 .../epmet/service/impl/ActLiveRecServiceImpl.java    | 12 +++++++++---
 .../epmet/service/impl/VolunteerInfoServiceImpl.java |  3 ---
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java
index 5fcbb51334..9806de9b80 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java
@@ -26,16 +26,6 @@ public interface ActMessageConstant {
      */
     String ACT_POINTS_EVENT_REMARK="参与%s";
 
-    /**
-     * 居民端-用户认证志愿者，发送消息
-     */
-    String POINTS_EVENT_VOLUNTEER_AUTHENTICATE="用户%s，认证志愿者";
-
-    /**
-     * 居民端-添加实况，发送消息
-     */
-    String ACT_POINTS_EVENT_VOLUNTEER_LIVE="用户%s，添加活动实况,活动:%s";
-
     /**
      * 工作端-重新发布活动，通知待审核+已经审核通过的用户
      */
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
index d1f11ccf68..30d9b151ec 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
@@ -39,6 +39,7 @@ import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.ActMessageConstant;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dao.ActLiveRecDao;
+import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.ActLivePicDTO;
 import com.epmet.dto.ActLiveRecDTO;
 import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
@@ -48,6 +49,7 @@ import com.epmet.entity.ActLivePicEntity;
 import com.epmet.entity.ActLiveRecEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.ActLiveRecRedis;
+import com.epmet.service.ActInfoService;
 import com.epmet.service.ActLiveRecService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -77,6 +79,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     @Autowired
     private ActLivePicDao actLivePicDao;
 
+    @Autowired
+    private ActInfoService actInfoService;
+
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
@@ -217,8 +222,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     }
 
     private void grantActPoints(ResiActInsertLiveFormDTO formDTO){
-        //备注
-        String remark=String.format(ActMessageConstant.ACT_POINTS_EVENT_VOLUNTEER_LIVE,formDTO.getUserId(),formDTO.getActId());
+        // 查询 活动信息
+        ActInfoDTO actInfoDTO = actInfoService.get(formDTO.getActId());
+
         MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
         //mq的事件类型
         mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_INSERT_LIVE.getEventClass());
@@ -230,7 +236,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
-        actPointEventMsg.setRemark(remark);
+        actPointEventMsg.setRemark(actInfoDTO.getTitle());
         actPointEventMsg.setSourceId(formDTO.getActId());
         actPointEventMsgList.add(actPointEventMsg);
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 8ac75314f7..b99a71bde4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -99,8 +99,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     private void grantActPoints(ResiVolunteerAuthenticateFormDTO formDTO){
-        //备注
-        String remark=String.format(ActMessageConstant.POINTS_EVENT_VOLUNTEER_AUTHENTICATE,formDTO.getUserId());
         MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
         //mq的事件类型
         mqBaseMsgDTO.setEventClass(EventEnum.REGISTER_VOLUNTEER.getEventClass());
@@ -112,7 +110,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
-        actPointEventMsg.setRemark(remark);
         actPointEventMsgList.add(actPointEventMsg);
 
         mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));

From 8b5f0302fdb7b9afb0f3373e0e752bd9a3b049a4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 4 Aug 2020 09:59:00 +0800
Subject: [PATCH 4/4] heart+1=>31

---
 .../epmet-heart-server/deploy/docker-compose-dev.yml            | 2 +-
 epmet-module/epmet-heart/epmet-heart-server/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
index 7147290341..9cc42e154b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.30
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.31
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index fd1aeb191c..a2a079992c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.30</version>
+    <version>0.0.31</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>