Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java

@@ -41,7 +41,6 @@ public class SendMqMsgUtils {
         }
         log.info("sendMsg param:{}", JSON.toJSONString(msg));
         try {
-            //  TODO
             ValidatorUtils.validateEntity(msg, DefaultGroup.class);
         } catch (ValidateException e) {
             return new Result<String>().error(e.getMsg());
@@ -53,9 +52,8 @@ public class SendMqMsgUtils {
             int retryTime = 0;
             Result<String> result = null;
             do {
-                retryTime++;
                 result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg));
-                log.info("sendMsg retryTime:{},result:{}", retryTime, JSON.toJSONString(result));
+                log.info("sendMsg retryTime:{},result:{}", retryTime++, JSON.toJSONString(result));
             } while ((!result.success()) && retryTime < 2);
 
             if (result.success()) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

@@ -983,6 +983,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         actPointEventMsg.setAgencyId(agencyId);
         actPointEventMsg.setGridId(gridId);
         actPointEventMsg.setGroupId(groupId);
+        actPointEventMsg.setSourceType("topic");
         actPointEventMsg.setSourceId(topicId);
         actPointEventMsg.setUserId(userId);
         actPointEventMsg.setActionFlag(MqConstant.PLUS);