diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 1003009805..1558df9b36 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -12,7 +12,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.utils.DateUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; /** * @author Mark sunlightcs@gmail.com @@ -509,10 +508,6 @@ public class RedisKeys { return rootPrefix.concat("sys:cors"); } - public static String getProjectChangedMsgDistinceKey(String customerId) { - return rootPrefix.concat("project_changed:consume:").concat(customerId); - } - /** * desc:获取防重复提交redis key * @param key diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractOriginFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractOriginFormDTO.java index 2eb18b8a35..d85f73bb96 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractOriginFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractOriginFormDTO.java @@ -34,4 +34,9 @@ public class ExtractOriginFormDTO implements Serializable { * 结束时间 */ private String endDate; + + /** + * 操作对象Id + */ + private String objectId; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java index 94a298d514..5b3c355827 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java @@ -87,21 +87,12 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently redisUtils = SpringContextUtils.getBean(RedisUtils.class); } - String redisKey = RedisKeys.getProjectChangedMsgDistinceKey(msgObj.getCustomerId()); - if (redisUtils.get(redisKey) == null) { - // 该线程启动消费之后,其他线程再收到该客户id的消费请求,则不消费 - redisUtils.set(redisKey, msg, 30); - try { - consumeMessage(msgObj); - } catch (Exception e) { - // 如果消费失败了,清楚该key,收到消息之后可以继续消费 - redisUtils.delete(redisKey); - throw e; - } - log.info("消费了项目变动消息,customer id:{}", msgObj.getCustomerId()); - } else { - log.info("该客户的项目变动消息刚刚消费,请等待30秒,customer id:{}", msgObj.getCustomerId()); + try { + consumeMessage(msgObj); + } catch (Exception e) { + throw e; } + log.info("消费了项目变动消息,customer id:{}", msgObj.getCustomerId()); if (org.apache.commons.lang.StringUtils.isNotBlank(pendingMsgLabel)) { try { @@ -136,6 +127,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently String dateId = DimIdGenerator.getDateDimId(new Date()); extractOriginFormDTO.setDateId(dateId); + extractOriginFormDTO.setObjectId(msgObj.getProjectId()); Future aBoolean = SpringContextUtils.getBean(FactOriginExtractService.class).submitProjectRelationData(extractOriginFormDTO,null); try { Object o = aBoolean.get();