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

# Conflicts:
#	epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
#	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
#	epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
#	epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -5,9 +5,12 @@ public interface TopicConstants {
      * 初始化客户
      */
     String INIT_CUSTOMER = "init_customer";
+    /**
+     * 项目变动
+     */
+    String PROJECT_CHANGED = "project_changed";
     /**
      * 小组成就
      */
     String GROUP_ACHIEVEMENT = "group_achievement";
-    String PROJECT_CHANGED = "project_changed";
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java

@@ -3,6 +3,7 @@ package com.epmet.mq;
 import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.EnvEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -18,7 +19,8 @@ import javax.annotation.PostConstruct;
 @Component
 @Order(value = 111)
 public class RocketMQConsumerRegister {
-
+    @Value("${spring.profiles.active}")
+    private String env;
     @Value("${rocketmq.name-server}")
     private String nameServer;
 
@@ -31,7 +33,9 @@ public class RocketMQConsumerRegister {
     @PostConstruct
     public void registerAllListeners() {
         try {
-            register(ConsomerGroupConstants.PROJECT_CHANGED_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectChangedCustomListener());
+            if (!EnvEnum.LOCAL.getCode().equals(env)) {
+                register(ConsomerGroupConstants.PROJECT_CHANGED_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.PROJECT_CHANGED, "*", new ProjectChangedCustomListener());
+            }
         } catch (MQClientException e) {
             log.error("registerAllListeners exception", e);
         }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java

@@ -11,13 +11,13 @@ public interface SystemMessageType {
     String INIT_CUSTOMER = "init_customer";
 
     /**
-     * 小组成就
+     * 项目变动
      */
-    String GROUP_ACHIEVEMENT = "group_achievement";
+    String PROJECT_CHANGED = "project_changed";
 
     /**
-     * 项目变动
+     * 小组成就
      */
-    String PROJECT_CHANGED = "project_changed";
+    String GROUP_ACHIEVEMENT = "group_achievement";
 
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java

@@ -45,13 +45,13 @@ public class SendMqMsgUtil {
      * @date 2021/4/23 3:01 下午
      * @remark 失败重试1次,调用端自行判断如果失败是否要继续执行
      */
-    public boolean sendGroupAchievementMqMsg(GroupAchievementMQMsg msgContent) {
+    public boolean sendProjectChangedMqMsg(ProjectChangedMQMsg msgContent) {
         try {
             SystemMsgFormDTO systemMsgFormDTO = new SystemMsgFormDTO();
-            systemMsgFormDTO.setMessageType(SystemMessageType.GROUP_ACHIEVEMENT);
+            systemMsgFormDTO.setMessageType(SystemMessageType.PROJECT_CHANGED);
             systemMsgFormDTO.setContent(msgContent);
             Result sendMsgResult = null;
-            log.info("sendGroupAchievementMqMsg param:{}",msgContent);
+            log.info("sendProjectChangedMqMsg param:{}",msgContent);
             int retryTime = 0;
             do {
                 sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(systemMsgFormDTO);
@@ -60,7 +60,7 @@ public class SendMqMsgUtil {
             if (sendMsgResult != null && sendMsgResult.success()) {
                 return true;
             }
-            log.error("发送(小组成就)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(systemMsgFormDTO));
+            log.error("发送(项目变动)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(systemMsgFormDTO));
         } catch (Exception e) {
             log.error("sendMqMsg exception", e);
         }
@@ -76,13 +76,13 @@ public class SendMqMsgUtil {
      * @date 2021/4/23 3:01 下午
      * @remark 失败重试1次,调用端自行判断如果失败是否要继续执行
      */
-    public boolean sendProjectChangedMqMsg(ProjectChangedMQMsg msgContent) {
+    public boolean sendGroupAchievementMqMsg(GroupAchievementMQMsg msgContent) {
         try {
             SystemMsgFormDTO systemMsgFormDTO = new SystemMsgFormDTO();
-            systemMsgFormDTO.setMessageType(SystemMessageType.PROJECT_CHANGED);
+            systemMsgFormDTO.setMessageType(SystemMessageType.GROUP_ACHIEVEMENT);
             systemMsgFormDTO.setContent(msgContent);
             Result sendMsgResult = null;
-            log.info("sendProjectChangedMqMsg param:{}",msgContent);
+            log.info("sendGroupAchievementMqMsg param:{}",msgContent);
             int retryTime = 0;
             do {
                 sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(systemMsgFormDTO);
@@ -91,7 +91,7 @@ public class SendMqMsgUtil {
             if (sendMsgResult != null && sendMsgResult.success()) {
                 return true;
             }
-            log.error("发送(项目变动)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(systemMsgFormDTO));
+            log.error("发送(小组成就)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(systemMsgFormDTO));
         } catch (Exception e) {
             log.error("sendMqMsg exception", e);
         }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -63,13 +63,13 @@ public class SystemMessageServiceImpl implements SystemMessageService {
         switch (msgType) {
             case SystemMessageType.INIT_CUSTOMER:
                 topic = TopicConstants.INIT_CUSTOMER;
-            break;
-            case SystemMessageType.GROUP_ACHIEVEMENT:
-                topic = TopicConstants.GROUP_ACHIEVEMENT;
                 break;
             case SystemMessageType.PROJECT_CHANGED:
                 topic = TopicConstants.PROJECT_CHANGED;
                 break;
+            case SystemMessageType.GROUP_ACHIEVEMENT:
+                topic = TopicConstants.GROUP_ACHIEVEMENT;
+                break;
         }
         return topic;
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java

@@ -2,6 +2,7 @@ package com.epmet.mq;
 
 import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.mq.listener.InitCustomerOrgRolesListener;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListener;
@@ -14,7 +15,8 @@ import javax.annotation.PostConstruct;
 
 @Component
 public class RocketMQConsumerRegister {
-
+    @Value("${spring.profiles.active}")
+    private String env;
     @Value("${rocketmq.name-server}")
     private String nameServer;
 
@@ -27,7 +29,9 @@ public class RocketMQConsumerRegister {
     @PostConstruct
     public void registerAllListeners() {
         try {
-            register(nameServer, ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP, MessageModel.CLUSTERING, TopicConstants.INIT_CUSTOMER, "*", new InitCustomerOrgRolesListener());
+            if (!EnvEnum.LOCAL.getCode().equals(env)) {
+                register(nameServer, ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP, MessageModel.CLUSTERING, TopicConstants.INIT_CUSTOMER, "*", new InitCustomerOrgRolesListener());
+            }
         } catch (MQClientException e) {
             e.printStackTrace();
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java

@@ -1,8 +1,6 @@
 package com.epmet.mq.listener;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
-import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.messages.InitCustomerMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -13,14 +11,11 @@ import com.epmet.dto.form.AddAgencyAndStaffFormDTO;
 import com.epmet.dto.form.AdminStaffFromDTO;
 import com.epmet.service.AgencyService;
 import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.spring.annotation.MessageModel;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.util.concurrent.TimeUnit;
 
@@ -51,7 +46,7 @@ public class InitCustomerOrgListener implements RocketMQListener<MessageExt> {
         RLock lock = null;
         try {
             lock = distributedLock.getLock(String.format("lock:init_customer_org:%s", msgObj.getCustomerId()),
-                    30l, 30l, TimeUnit.SECONDS);
+                    30L, 30l, TimeUnit.SECONDS);
             agencyService.saveRootAgency(constructRootAndAgencyDTO(msgObj));
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgRolesListener.java

@@ -53,7 +53,7 @@ public class InitCustomerOrgRolesListener implements MessageListenerConcurrently
         try {
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
             lock = distributedLock.getLock(String.format("lock:init_customer_org:%s", msgObj.getCustomerId()),
-                    30l, 30l, TimeUnit.SECONDS);
+                    30L, 30L, TimeUnit.SECONDS);
             SpringContextUtils.getBean(AgencyService.class).saveRootAgency(constructRootAndAgencyDTO(msgObj));
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/type1/RocketMQConsumerRegister.java

@@ -2,6 +2,7 @@ package com.epmet.mq.type1;
 
 import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
+import com.epmet.commons.tools.enums.EnvEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
@@ -15,7 +16,8 @@ import javax.annotation.PostConstruct;
 @Slf4j
 @Component
 public class RocketMQConsumerRegister {
-
+    @Value("${spring.profiles.active}")
+    private String env;
     @Value("${rocketmq.name-server}")
     private String nameServer;
 
@@ -28,7 +30,9 @@ public class RocketMQConsumerRegister {
     @PostConstruct
     public void registerAllListeners() {
         try {
-            register(ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.GROUP_ACHIEVEMENT, "*", new GroupAchievementCustomListener());
+            if (!EnvEnum.LOCAL.getCode().equals(env)){
+                register(ConsomerGroupConstants.GROUP_ACHIEVEMENT_COMPONENTS_GROUP, MessageModel.CLUSTERING, TopicConstants.GROUP_ACHIEVEMENT, "*", new GroupAchievementCustomListener());
+            }
         } catch (MQClientException e) {
             log.error("registerAllListeners exception", e);
         }