Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java

@@ -54,12 +54,12 @@ public class RenExceptionHandler {
 	 */
 	@ExceptionHandler(RenException.class)
 	public Result handleRRException(RenException ex){
-		logger.error(ExceptionUtils.getErrorStackTrace(ex));
 		if (ex.getCode() > 8000) {
 			Result result=new Result().error(ex.getCode());
 			result.setData(ex.getMsg());
 			return result;
 		}
+		logger.error(ExceptionUtils.getErrorStackTrace(ex));
 		Result result=new Result().error();
 		result.setData(ex.getMsg());
 		return result;

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java

@@ -61,7 +61,7 @@ public class HeartUserInfoDTO implements Serializable {
 	private Integer kindnessTime;
 
     /**
-     * 实际参与活动个数（签到+1）
+     * 实际参与活动个数
      */
 	private Integer participationNum;
 
@@ -100,4 +100,4 @@ public class HeartUserInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java

@@ -24,4 +24,6 @@ public class AactUserDetailFormDTO implements Serializable {
     @NotBlank(message = "主键不能为空", groups = {AddUserInternalGroup.class})
     private String actUserRelationId;
 
+    @NotBlank(message = "当前活动id不能为空", groups = {UserHistoricalActFormDTO.AddUserInternalGroup.class})
+    private String currentActId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java

@@ -49,7 +49,7 @@ public class ResiLeaderboardResultDTO implements Serializable {
 	private Boolean volunteerFlag;
 
     /**
-     * 爱心时长(单位：小时)
+     * 爱心时长(单位：分钟)
      */
 	private Integer kindnessTime;
 

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.25
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.29
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

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.25</version>
+    <version>0.0.29</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -239,7 +239,7 @@ public class ResiActListController {
      * @Date 11:21 2020-07-28
      **/
     @PostMapping("checksigninaddress")
-    public Result<ResiActAddressResultDTO> cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
+    public Result<ResiActAddressResultDTO> checkSignInAddress(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ResiActCaculateDistanceFormDTO.AddUserInternalGroup.class);
         return actInfoService.checkSignInAddress(formDTO);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@@ -97,11 +97,12 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
     /**
      * @return java.lang.Integer
      * @param userId
+     * @param currentActId
      * @author yinzuomei
      * @description 报名活动个数（act_user_realation）
      * @Date 2020/7/23 15:57
      **/
-    Integer countSignUpActNum(String userId);
+    Integer countSignUpActNum(@Param("userId")String userId,@Param("currentActId") String currentActId);
 
     /**
      * @return java.lang.Integer

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartUserInfoEntity.java

@@ -57,7 +57,7 @@ public class HeartUserInfoEntity extends BaseEpmetEntity {
 	private Integer kindnessTime;
 
     /**
-     * 实际参与活动个数（签到+1）
+     * 实际参与活动个数
      */
 	private Integer participationNum;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java

@@ -38,6 +38,7 @@ import com.epmet.dao.ActSignInRecDao;
 import com.epmet.dao.ActUserRelationDao;
 import com.epmet.dto.ActSignInRecDTO;
 import com.epmet.dto.ActUserRelationDTO;
+import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
 import com.epmet.dto.form.resi.ResiActSignInFormDTO;
 import com.epmet.entity.ActSignInPicEntity;
@@ -45,6 +46,7 @@ import com.epmet.entity.ActSignInRecEntity;
 import com.epmet.redis.ActSignInRecRedis;
 import com.epmet.service.ActLiveRecService;
 import com.epmet.service.ActSignInRecService;
+import com.epmet.service.HeartUserInfoService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +78,9 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
     @Autowired
     private ActLiveRecService actLiveRecService;
 
+//    @Autowired
+//    private HeartUserInfoService heartUserInfoService;
+
     private Logger logger = LogManager.getLogger(ActSignInRecServiceImpl.class);
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
@@ -124,6 +129,13 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
                 actSignInPicDao.insert(actLivePicEntity);
             }
         }
+
+        // 用户信息表，实际参与活动个数（签到+1）
+        // 暂时注释掉，将（实际参与活动个数）字段，放在活动结束后进行统计
+//        HeartUserInfoDTO heartUserInfoDTO = new HeartUserInfoDTO();
+//        heartUserInfoDTO.setUserId(formDTO.getUserId());
+//        heartUserInfoDTO.setParticipationNum(NumConstant.ONE);
+//        heartUserInfoService.updateHeartUserInfoByUserId(heartUserInfoDTO);
         return new Result();
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -819,7 +819,7 @@ public class WorkActServiceImpl implements WorkActService {
         //act_info表改为已完成
         actInfoDTO.setActStatus(ActConstant.ACT_STATUS_FINISHED);
         actInfoService.update(actInfoDTO);
-        //发放爱心时长、参与活动并获得积分的次数
+        //发放爱心时长、参与活动并获得积分的次数、实际参与活动个数
         updateHeartUserInfo(actInfoDTO);
         //保存结束活动日志
         this.saveActOperationRec(actId);
@@ -950,8 +950,10 @@ public class WorkActServiceImpl implements WorkActService {
             if(null==heartUserInfoDTO){
                 continue;
             }
+            boolean updateFlag=false;
             if(actInfoDTO.getReward()>0){
                 if(ActConstant.ACT_USER_STATUS_AGREE.equals(actUserRelation.getRewardFlag())){
+                    updateFlag=true;
                     heartUserInfoDTO.setObtainPointNum(heartUserInfoDTO.getObtainPointNum()+1);
                 }
             }
@@ -959,6 +961,7 @@ public class WorkActServiceImpl implements WorkActService {
                 //爱心时长发放（签到的。未签到但是有积分的）
                 if(ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(actUserRelation.getSignInFlag())){
                     //已签到的
+                    updateFlag=true;
                     heartUserInfoDTO.setKindnessTime(heartUserInfoDTO.getKindnessTime()+actInfoDTO.getServiceMin());
                     UserKindnessTimeLogEntity userKindnessTimeLogEntity=new UserKindnessTimeLogEntity();
                     userKindnessTimeLogEntity.setActId(actInfoDTO.getId());
@@ -968,6 +971,7 @@ public class WorkActServiceImpl implements WorkActService {
                 }else{
                     //未签到，但是有积分的
                     if(ActConstant.ACT_USER_STATUS_AGREE.equals(actUserRelation.getRewardFlag())){
+                        updateFlag=true;
                         heartUserInfoDTO.setKindnessTime(heartUserInfoDTO.getKindnessTime()+actInfoDTO.getServiceMin());
                         UserKindnessTimeLogEntity userKindnessTimeLogEntity=new UserKindnessTimeLogEntity();
                         userKindnessTimeLogEntity.setActId(actInfoDTO.getId());
@@ -977,7 +981,17 @@ public class WorkActServiceImpl implements WorkActService {
                     }
                 }
             }
-            if(actInfoDTO.getReward()>0||actInfoDTO.getServiceMin()>0){
+            //审核通过并且已经签到的更新实际参与活动数，+1
+            if (ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(actUserRelation.getSignInFlag())
+                    && ActConstant.ACT_USER_STATUS_PASSED.equals(actUserRelation.getStatus())) {
+                updateFlag = true;
+                if (null != heartUserInfoDTO.getParticipationNum() && heartUserInfoDTO.getParticipationNum() >= 0) {
+                    heartUserInfoDTO.setParticipationNum(heartUserInfoDTO.getParticipationNum() + 1);
+                } else if (null == heartUserInfoDTO.getParticipationNum()) {
+                    heartUserInfoDTO.setParticipationNum(NumConstant.ONE);
+                }
+            }
+            if (updateFlag) {
                 heartUserInfoService.update(heartUserInfoDTO);
             }
         }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -348,7 +348,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
          ）
          */
         resultDTO.setStatus(actUserRelationDTO.getStatus());
-        HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId());
+        HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setHistoricalActInfo(historicalActInfo);
         if(ActConstant.ACT_USER_STATUS_AUDITING.equals(resultDTO.getStatus())){
             //被拒绝过，才赋值
@@ -399,7 +399,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
             resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
         }
         //参与活动统计值
-        HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId());
+        HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());
         //减去当前的
         resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
@@ -639,11 +639,12 @@ public class WorkActUserServiceImpl implements WorkActUserService {
     /**
      * @return com.epmet.dto.result.work.HistoricalActInfo
      * @param userId
+     * @param currentActId
      * @author yinzuomei
      * @description 用户历史活动情况
      * @Date 2020/7/23 15:56
      **/
-    private HistoricalActInfo getHistoricalActInfo(String userId) {
+    private HistoricalActInfo getHistoricalActInfo(String userId,String currentActId) {
         HistoricalActInfo historicalActInfo=new HistoricalActInfo();
         /**
          * 实际参加活动个数(已经签到的)
@@ -653,7 +654,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         /**
          * 报名活动个数（act_user_realation）
          */
-         Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId);
+         Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId,currentActId);
         historicalActInfo.setSignUpActNum(signUpActNum);
         /**
          * 获得积分活动个数

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql

@@ -350,7 +350,7 @@ CREATE TABLE `heart_user_info`  (
   `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
   `VOLUNTEER_FLAG` tinyint(1) NOT NULL COMMENT '1是志愿者，0不是志愿者（志愿者注册成功后需要来更新值）',
   `KINDNESS_TIME` int(11) NOT NULL DEFAULT 0 COMMENT '爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的\r\n',
-  `PARTICIPATION_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '实际参与活动个数（签到+1）',
+  `PARTICIPATION_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '实际参与活动个数',
   `OBTAIN_POINT_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '参与活动并获得积分的次数（结束活动时，如果给用户发放积分则该数值+1）',
   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@@ -114,7 +114,7 @@
     </select>
 
     <!--  报名活动个数（act_user_realation）  -->
-    <select id="countSignUpActNum" resultType="java.lang.Integer" parameterType="java.lang.String">
+    <select id="countSignUpActNum" resultType="java.lang.Integer" parameterType="map">
         SELECT
             count( 1 ) as total
         FROM
@@ -123,6 +123,9 @@
             DEL_FLAG = '0'
             and acu.STATUS !='auditing'
             AND acu.USER_ID = #{userId}
+            <if test="currentActId != null and currentActId != ''">
+                and acu.ACT_ID != #{currentActId}
+            </if>
     </select>
 
     <!--  获得积分活动个数  -->

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml

@@ -65,7 +65,7 @@
             KINDNESS_TIME = #{kindnessTime},
         </if>
         <if test="participationNum != null and participationNum != ''">
-            PARTICIPATION_NUM = #{participationNum},
+            PARTICIPATION_NUM = PARTICIPATION_NUM + #{participationNum},
         </if>
         <if test="obtainPointNum != null and obtainPointNum != ''">
             OBTAIN_POINT_NUM = #{obtainPointNum},

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.25
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.26
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

epmet-module/epmet-message/epmet-message-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.3.25</version>
+    <version>0.3.26</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml

@@ -40,10 +40,8 @@
             user_message
         WHERE
             del_flag = '0'
-          AND (
-                CUSTOMER_ID = #{customerId}
-                AND GRID_ID = #{gridId}
-                AND USER_ID = #{userId})
+          AND CUSTOMER_ID = #{customerId}
+          AND USER_ID = #{userId}
         ORDER BY
             CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.19
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          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.17</version>
+    <version>0.0.19</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/MqSubcribeConfig.java

@@ -6,9 +6,7 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -17,20 +15,21 @@ import java.util.Map;
 /**
  * desc:订阅积分事件
  */
-@Component
+//@Component
 public class MqSubcribeConfig {
 	private Logger logger = LogManager.getLogger(MqSubcribeConfig.class);
 
 	private String mqServer = "https://epmet-dev.elinkservice.cn/estos/mq-subscriber/subscribe";
 	private String token = "1cfcbb5ade1e3202855ee5819983d773";
 
-	@PostConstruct
+	//todo 由于api订阅报错 暂时通过页面订阅
+	//@PostConstruct
 	private void subscribe() {
 		MqSubscribeFormDTO event = new MqSubscribeFormDTO();
-		event.setBelongAppId("202007161443499985fa2d397436d10356542134c8f008c48");
-		event.setEventClass("epmet_heart");
-		event.setEventTag("active_send_point");
-		String callbackUrl = "http://192.168.1.119/point/callback/sendPoint";
+		event.setBelongAppId("202007151206522723ab739c43c73afe1e696f88ef4ee45a9");
+		event.setEventClass("test_event_cls_1");
+		event.setEventTag("test_event_1");
+		String callbackUrl = "http://118.190.150.119/testpub/test/post";
 		//callbackUrl = "";
 		event.setCallbackUrl(callbackUrl);
 		List<MqSubscribeFormDTO> subscribeFormDTOList = new ArrayList<>();

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.102
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.103
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-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.3.102</version>
+    <version>0.3.103</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java

@@ -58,9 +58,9 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * 根据用户ID，查询用户所属角色: 多种身份
      *
      * @param userId
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.UserRoleResultDTO>>
+     * @return java.util.List<com.epmet.dto.result.UserRoleResultDTO>
      * @Author zhangyong
      * @Date 14:24 2020-07-23
      **/
-    Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(@Param("userId") String userId);
+    List<UserRoleResultDTO> getUserRoleInfoByUserId(@Param("userId") String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java

@@ -134,7 +134,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 
 	@Override
 	public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(String userId) {
-		return baseDao.getUserRoleInfoByUserId(userId);
+		List<UserRoleResultDTO> list = baseDao.getUserRoleInfoByUserId(userId);
+		return new Result<List<UserRoleResultDTO>>().ok(list);
 	}
 
 }