From f6c53786b68181e95c03648441735f5534dbcfd7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 02 Apr 2021 10:59:29 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java | 24 +++++++++++++++---------
src/main/java/com/xcong/excoin/rabbit/consumer/FollowConsumer.java | 5 ++---
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
index b66d405..f82fc86 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
@@ -125,18 +125,23 @@
for (FollowFollowerSettingEntity followerSetting : followerSettings) {
// 加redis锁，同一个用户不能同时触发两个跟单任务，否则会出现金额问题
while (true) {
- List<Object> followerMemberId = redisUtils.lGet(AppContants.MEMBER_HAS_FOLLOW, 0, -1);
- log.info("#跟单用户任务已存在:{}, 当前:{}#", followerMemberId, followerSetting.getMemberId());
- log.info("#------->{}#", followerMemberId.contains(followerSetting.getMemberId().intValue()));
- if (CollUtil.isEmpty(followerMemberId) || !followerMemberId.contains(followerSetting.getMemberId().intValue())) {
+ boolean flag = redisUtils.setNotExist(AppContants.MEMBER_HAS_FOLLOW + "_" + followerSetting.getMemberId(), "1", 1);
+// List<Object> followerMemberId = redisUtils.lGet(AppContants.MEMBER_HAS_FOLLOW, 0, -1);
+// log.info("#跟单用户任务已存在:{}, 当前:{}#", followerMemberId, followerSetting.getMemberId());
+// log.info("#------->{}#", followerMemberId.contains(followerSetting.getMemberId().intValue()));
+// if (CollUtil.isEmpty(followerMemberId) || !followerMemberId.contains(followerSetting.getMemberId().intValue())) {
+// log.info("跳出");
+// hasExist.add(followerSetting.getMemberId());
+// redisUtils.lSet(AppContants.MEMBER_HAS_FOLLOW, hasExist);
+// break;
+// }
+
+ if (flag) {
log.info("跳出");
- hasExist.add(followerSetting.getMemberId());
- redisUtils.lSet(AppContants.MEMBER_HAS_FOLLOW, hasExist);
break;
}
-
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -262,8 +267,9 @@
LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.OPEN_ORDER_TITLE, StrUtil.format(NoticeConstant.OPEN_ORDER_CONTENT, holdOrderEntity.getSymbol() + "开空", openPrice.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), followTraderInfoEntity.getNickname()));
}
}
+ redisUtils.del(AppContants.MEMBER_HAS_FOLLOW + "_" + followerSetting.getMemberId());
}
- redisUtils.del(AppContants.MEMBER_HAS_FOLLOW);
+// redisUtils.del(AppContants.MEMBER_HAS_FOLLOW);
}
}
diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/FollowConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/FollowConsumer.java
index 12480e9..b5db176 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/FollowConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/FollowConsumer.java
@@ -26,8 +26,7 @@
public void addFollowOrder(Message message, Channel channel) {
String content = new String(message.getBody());
log.info("==收到跟单下单消息 : {}", content);
- synchronized (this) {
- followOrderOperationService.addFollowerOrder(Long.parseLong(content));
- }
+
+ followOrderOperationService.addFollowerOrder(Long.parseLong(content));
}
}
--
Gitblit v1.9.1