亿联云消息网关发送消息消息体修改

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java

@@ -67,4 +67,6 @@ public class BasePointEventMsg implements Serializable {
 	 * 只针对[邀请已注册的用户入组]事件生效
 	 */
 	private Date targetDate;
+
+	private String eventTag;
 	}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java

@@ -117,5 +117,35 @@ public class MqPointCallbackController {
 		log.info("pubActiveLive consumer success,formDTO:{}", JSON.toJSONString(formList));
 		return new Result<Boolean>().ok(true);
 	}
+
+	/**
+	 * @Description 楼院小组积分事件统一回调入口
+	 * @param mqMsg
+	 * @return com.epmet.commons.tools.utils.Result<java.lang.Boolean>
+	 * @author wangc
+	 * @date 2020.12.23 09:33
+	*/
+	@RequestMapping("resigrouppointcallback")
+	public Result<Boolean> resiGroupPointCallback(@RequestBody ReceiveMqMsg mqMsg){
+		log.debug("resi_group point event callback receive mqMsg:{}", JSON.toJSONString(mqMsg));
+		if (mqMsg == null || StringUtils.isBlank(mqMsg.getMsg())) {
+			log.warn("resi_group point event mqMsg is empty");
+			return new Result<Boolean>().ok(true);
+		}
+		List<BasePointEventMsg> formList = JSON.parseArray(mqMsg.getMsg(), BasePointEventMsg.class);
+
+		try {
+
+			formList.forEach(obj -> {
+				userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj);
+			});
+
+		} catch (Exception e) {
+			logger.error("resi_group point event callback fail", e);
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getMsg());
+		}
+		log.info("resi_group point event callback success,formDTO:{}", JSON.toJSONString(formList));
+		return new Result<Boolean>().ok(true);
+	}
 }
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java

@@ -319,6 +319,7 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
             //事件code
             mqBaseMsgDTO.setEventTag(isNew ? EventEnum.INVITE_NEW_RESIDENT_INTO_GROUP.getEventTag() : EventEnum.INVITE_RESIDENT_INTO_GROUP.getEventTag());
+            mqBaseMsgDTO.setEventClass("resi_group");
             List<BasePointEventMsg> pointEventMsgList = new ArrayList<>();
             BasePointEventMsg pointEventMsg = new BasePointEventMsg();
             pointEventMsg.setCustomerId(resiGroupDTO.getCustomerId());
@@ -326,7 +327,7 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             pointEventMsg.setActionFlag(MqConstant.PLUS);
             pointEventMsg.setIsCommon(false);
             pointEventMsg.setTargetDate(current);
-
+            pointEventMsg.setEventTag(mqBaseMsgDTO.getEventTag());
             pointEventMsgList.add(pointEventMsg);
 
             mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -524,6 +524,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		if(StringUtils.isNotBlank(inviter)){
 			//mq的事件类型
 			MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO();
+			mqBaseMsgDTO.setEventClass("resi_group");
 			//事件code
 			mqBaseMsgDTO.setEventTag(isNew ? EventEnum.INVITE_NEW_RESIDENT_INTO_GROUP.getEventTag() : EventEnum.INVITE_RESIDENT_INTO_GROUP.getEventTag());
 			List<BasePointEventMsg> pointEventMsgList = new ArrayList<>();
@@ -533,6 +534,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			pointEventMsg.setActionFlag(MqConstant.PLUS);
 			pointEventMsg.setIsCommon(false);
 			pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime());
+			pointEventMsg.setEventTag(mqBaseMsgDTO.getEventTag());
 			pointEventMsgList.add(pointEventMsg);
 
 			mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));