From 08df3092c22dc494875cc06f5928fc3fc69ac25e Mon Sep 17 00:00:00 2001 From: yechenhao Date: Mon, 18 May 2020 02:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kiisoo/ic/job/count/CountDTOMessage.java | 4 ---- .../count/CountDTOMessageEventProducer.java | 6 ++--- .../count/CountDTOMessageEventTranslator.java | 20 ---------------- ...java => CountDTOMessageGroupConsumer.java} | 3 +-- .../ic/job/count/CountDTOMessagePublish.java | 23 ------------------- .../kiisoo/ic/job/count/CustomerCountJob.java | 7 ++---- .../kiisoo/ic/job/detail/CustomerDataJob.java | 4 ++-- .../ic/job/detail/DTOMessagePublish.java | 23 ------------------- .../ic/job/detail/DetailDTOMessage.java | 2 -- .../detail/DetailDTOMessageEventProducer.java | 3 ++- .../DetailDTOMessageEventTranslator.java | 20 ---------------- ...ava => DetailDTOMessageGroupConsumer.java} | 3 +-- .../ic/job/detail/EventExceptionHandler.java | 23 ------------------- 13 files changed, 10 insertions(+), 131 deletions(-) delete mode 100644 src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventTranslator.java rename src/main/java/com/kiisoo/ic/job/count/{CountDTOMessageGroup1Consumer.java => CountDTOMessageGroupConsumer.java} (96%) delete mode 100644 src/main/java/com/kiisoo/ic/job/count/CountDTOMessagePublish.java delete mode 100644 src/main/java/com/kiisoo/ic/job/detail/DTOMessagePublish.java delete mode 100644 src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventTranslator.java rename src/main/java/com/kiisoo/ic/job/detail/{DetailDTOMessageGroup1Consumer.java => DetailDTOMessageGroupConsumer.java} (96%) delete mode 100644 src/main/java/com/kiisoo/ic/job/detail/EventExceptionHandler.java diff --git a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessage.java b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessage.java index 87c2581..509fc4f 100644 --- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessage.java +++ b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessage.java @@ -1,14 +1,10 @@ package com.kiisoo.ic.job.count; -import com.kiisoo.ic.customer.CustomerService; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; -import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; -import com.kiisoo.ic.wx.service.QWMailListManageService; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import me.chanjar.weixin.cp.bean.WxCpUserExternalContactInfo; import java.util.List; diff --git a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventProducer.java b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventProducer.java index 38bd703..8a0d8b3 100644 --- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventProducer.java +++ b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventProducer.java @@ -1,9 +1,6 @@ package com.kiisoo.ic.job.count; -import com.kiisoo.ic.customer.CustomerService; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; -import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; -import com.kiisoo.ic.wx.service.QWMailListManageService; import com.lmax.disruptor.RingBuffer; public class CountDTOMessageEventProducer { @@ -19,7 +16,8 @@ public class CountDTOMessageEventProducer { } public void produceData(int index, String cpUserId) { - long seq = ringBuffer.next(); // 获得下一个Event槽的下标 + // 获得下一个Event槽的下标 + long seq = ringBuffer.next(); try { // 给Event填充数据 //给这个区块放入 数据 如果此处不理解,想想RingBuffer的结构图 diff --git a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventTranslator.java b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventTranslator.java deleted file mode 100644 index d42fc59..0000000 --- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageEventTranslator.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.kiisoo.ic.job.count; - -import com.lmax.disruptor.EventTranslator; - -import java.util.Random; - -public class CountDTOMessageEventTranslator implements EventTranslator { - - private Random random = new Random(); - - private CountDTOMessage generateTradeTransaction(CountDTOMessage trade) { -// System.out.println("DTOMessageEventTranslator" + trade.toString()); - return trade; - } - - @Override - public void translateTo(CountDTOMessage countDtoMessage, long l) { - this.generateTradeTransaction(countDtoMessage); - } -} diff --git a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroup1Consumer.java b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java similarity index 96% rename from src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroup1Consumer.java rename to src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java index 4e6c619..263b6de 100644 --- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroup1Consumer.java +++ b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java @@ -11,14 +11,13 @@ import me.chanjar.weixin.cp.api.WxCpExternalContactService; import me.chanjar.weixin.cp.api.WxCpService; import org.apache.commons.collections.CollectionUtils; -import java.text.SimpleDateFormat; import java.util.List; import java.util.UUID; import static com.kiisoo.ic.config.WxCpConfiguration.APPLICATIONID; @Slf4j -public class CountDTOMessageGroup1Consumer implements WorkHandler { +public class CountDTOMessageGroupConsumer implements WorkHandler { int i = 0; /** diff --git a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessagePublish.java b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessagePublish.java deleted file mode 100644 index 06f824d..0000000 --- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessagePublish.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.kiisoo.ic.job.count; - -import com.lmax.disruptor.dsl.Disruptor; - -import java.util.concurrent.CountDownLatch; - -public class CountDTOMessagePublish implements Runnable { - private Disruptor disruptor; - private CountDownLatch latch; - - public CountDTOMessagePublish(Disruptor disruptor, CountDownLatch latch) { - this.disruptor = disruptor; - this.latch = latch; - } - - @Override - public void run() { - for (int i = 0; i < 3; i++) { - disruptor.publishEvent(new CountDTOMessageEventTranslator()); - } - latch.countDown(); - } -} diff --git a/src/main/java/com/kiisoo/ic/job/count/CustomerCountJob.java b/src/main/java/com/kiisoo/ic/job/count/CustomerCountJob.java index b9c9c3b..1515021 100644 --- a/src/main/java/com/kiisoo/ic/job/count/CustomerCountJob.java +++ b/src/main/java/com/kiisoo/ic/job/count/CustomerCountJob.java @@ -2,13 +2,10 @@ package com.kiisoo.ic.job.count; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.config.WxCpConfiguration; -import com.kiisoo.ic.customer.CustomerService; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; -import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; -import com.kiisoo.ic.wx.service.QWMailListManageService; import com.lmax.disruptor.BlockingWaitStrategy; import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.dsl.Disruptor; @@ -57,9 +54,9 @@ public class CustomerCountJob { RingBuffer ringBuffer = disruptor.getRingBuffer(); // 创建100个消费者来处理同一个生产者发的消息(这100个消费者不重复消费消息) - CountDTOMessageGroup1Consumer[] consumers = new CountDTOMessageGroup1Consumer[THREAD_NUMBERS]; + CountDTOMessageGroupConsumer[] consumers = new CountDTOMessageGroupConsumer[THREAD_NUMBERS]; for (int i = 0; i < consumers.length; i++) { - consumers[i] = new CountDTOMessageGroup1Consumer(); + consumers[i] = new CountDTOMessageGroupConsumer(); } disruptor.handleEventsWithWorkerPool(consumers); diff --git a/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java b/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java index c7a1fbb..cb5c968 100644 --- a/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java +++ b/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java @@ -56,9 +56,9 @@ public class CustomerDataJob { RingBuffer ringBuffer = disruptor.getRingBuffer(); // 创建100个消费者来处理同一个生产者发的消息(这100个消费者不重复消费消息) - DetailDTOMessageGroup1Consumer[] consumers = new DetailDTOMessageGroup1Consumer[THREAD_NUMBERS]; + DetailDTOMessageGroupConsumer[] consumers = new DetailDTOMessageGroupConsumer[THREAD_NUMBERS]; for (int i = 0; i < consumers.length; i++) { - consumers[i] = new DetailDTOMessageGroup1Consumer(); + consumers[i] = new DetailDTOMessageGroupConsumer(); } disruptor.handleEventsWithWorkerPool(consumers); diff --git a/src/main/java/com/kiisoo/ic/job/detail/DTOMessagePublish.java b/src/main/java/com/kiisoo/ic/job/detail/DTOMessagePublish.java deleted file mode 100644 index 5b7fe5f..0000000 --- a/src/main/java/com/kiisoo/ic/job/detail/DTOMessagePublish.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.kiisoo.ic.job.detail; - -import com.lmax.disruptor.dsl.Disruptor; - -import java.util.concurrent.CountDownLatch; - -public class DTOMessagePublish implements Runnable { - private Disruptor disruptor; - private CountDownLatch latch; - - public DTOMessagePublish(Disruptor disruptor, CountDownLatch latch) { - this.disruptor = disruptor; - this.latch = latch; - } - - @Override - public void run() { - for (int i = 0; i < 3; i++) { - disruptor.publishEvent(new DetailDTOMessageEventTranslator()); - } - latch.countDown(); - } -} diff --git a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessage.java b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessage.java index efbb85c..cffe06f 100644 --- a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessage.java +++ b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessage.java @@ -1,8 +1,6 @@ package com.kiisoo.ic.job.detail; import com.kiisoo.ic.customer.CustomerService; -import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; -import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.wx.service.QWMailListManageService; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventProducer.java b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventProducer.java index 28e21e9..8321937 100644 --- a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventProducer.java +++ b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventProducer.java @@ -23,7 +23,8 @@ public class DetailDTOMessageEventProducer { } public void produceData(int index,Long storeId, String cpUserId) { - long seq = ringBuffer.next(); // 获得下一个Event槽的下标 + // 获得下一个Event槽的下标 + long seq = ringBuffer.next(); try { // 给Event填充数据 //给这个区块放入 数据 如果此处不理解,想想RingBuffer的结构图 diff --git a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventTranslator.java b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventTranslator.java deleted file mode 100644 index 782db1d..0000000 --- a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageEventTranslator.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.kiisoo.ic.job.detail; - -import com.lmax.disruptor.EventTranslator; - -import java.util.Random; - -public class DetailDTOMessageEventTranslator implements EventTranslator { - - private Random random = new Random(); - - private DetailDTOMessage generateTradeTransaction(DetailDTOMessage trade) { -// System.out.println("DTOMessageEventTranslator" + trade.toString()); - return trade; - } - - @Override - public void translateTo(DetailDTOMessage detailDtoMessage, long l) { - this.generateTradeTransaction(detailDtoMessage); - } -} diff --git a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageGroup1Consumer.java b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageGroupConsumer.java similarity index 96% rename from src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageGroup1Consumer.java rename to src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageGroupConsumer.java index dfe5c98..20bbe61 100644 --- a/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageGroup1Consumer.java +++ b/src/main/java/com/kiisoo/ic/job/detail/DetailDTOMessageGroupConsumer.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.UUID; @Slf4j -public class DetailDTOMessageGroup1Consumer implements WorkHandler { +public class DetailDTOMessageGroupConsumer implements WorkHandler { int i = 0; /** @@ -31,7 +31,6 @@ public class DetailDTOMessageGroup1Consumer implements WorkHandler