From d5076cc7cd7018528ccacaed54d128a3a65cb2e9 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Sun, 17 May 2020 02:31:38 +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

---
 .../java/com/kiisoo/ic/job/CustomerDataJob.java   | 15 +++++++++------
 src/main/java/com/kiisoo/ic/job/DTOMessage.java   |  2 +-
 .../kiisoo/ic/job/DTOMessageEventProducer.java    |  4 ++--
 .../java/com/kiisoo/ic/job/DTOMessageHandler.java |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/job/CustomerDataJob.java b/src/main/java/com/kiisoo/ic/job/CustomerDataJob.java
index 3802042..6926e95 100644
--- a/src/main/java/com/kiisoo/ic/job/CustomerDataJob.java
+++ b/src/main/java/com/kiisoo/ic/job/CustomerDataJob.java
@@ -1,6 +1,8 @@
 package com.kiisoo.ic.job;
 
 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;
@@ -9,11 +11,9 @@ import com.lmax.disruptor.*;
 import com.lmax.disruptor.dsl.Disruptor;
 import com.lmax.disruptor.dsl.ProducerType;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.concurrent.*;
 
@@ -31,6 +31,9 @@ public class CustomerDataJob {
     private static final int THREAD_NUMBERS = 50;
 
 
+    @Autowired
+    private PrivilageCpUserDOMapper privilageCpUserDOMapper;
+
     @Autowired
     private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
 
@@ -64,11 +67,11 @@ public class CustomerDataJob {
         disruptor.start();
 
         DTOMessageEventProducer producer = new DTOMessageEventProducer(ringBuffer, qwMailListManageService, customerService, poiStoreStaffDOMapper);
-        List<PrivilageCpUserStoreDO> privilageCpUserStoreDOS = privilageCpUserStoreDOMapper.selectList(null);
+        List<PrivilageCpUserDO> privilageCpUserDOS = privilageCpUserDOMapper.selectList(null);
         int index =0;
-        for (PrivilageCpUserStoreDO privilageCpUserStoreDO : privilageCpUserStoreDOS) {
-            String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(privilageCpUserStoreDO.getStoreId());
-            producer.produceData(index,privilageCpUserStoreDO, cpUserId);
+        for (PrivilageCpUserDO privilageCpUserDO : privilageCpUserDOS) {
+            Long storeId = privilageCpUserStoreDOMapper.selectOneByCpUserId(privilageCpUserDO.getCpUserId());
+            producer.produceData(index,storeId,privilageCpUserDO.getCpUserId());
             index++;
         }
 
diff --git a/src/main/java/com/kiisoo/ic/job/DTOMessage.java b/src/main/java/com/kiisoo/ic/job/DTOMessage.java
index e734f69..ae62a6d 100644
--- a/src/main/java/com/kiisoo/ic/job/DTOMessage.java
+++ b/src/main/java/com/kiisoo/ic/job/DTOMessage.java
@@ -21,7 +21,7 @@ public class DTOMessage {
     private int index;
     private String id;
     private String cpUserId;
-    private PrivilageCpUserStoreDO privilageCpUserStoreDO;
+    private Long storeId;
     private QWMailListManageService qwMailListManageService;
     private CustomerService customerService;
     private PoiStoreStaffDOMapper poiStoreStaffDOMapper;
diff --git a/src/main/java/com/kiisoo/ic/job/DTOMessageEventProducer.java b/src/main/java/com/kiisoo/ic/job/DTOMessageEventProducer.java
index 8aac2c9..b7addef 100644
--- a/src/main/java/com/kiisoo/ic/job/DTOMessageEventProducer.java
+++ b/src/main/java/com/kiisoo/ic/job/DTOMessageEventProducer.java
@@ -23,14 +23,14 @@ public class DTOMessageEventProducer {
         this.poiStoreStaffDOMapper = poiStoreStaffDOMapper;
     }
 
-    public void produceData(int index,PrivilageCpUserStoreDO privilageCpUserStoreDO, String cpUserId) {
+    public void produceData(int index,Long storeId, String cpUserId) {
         long seq = ringBuffer.next(); // 获得下一个Event槽的下标
         try {
             // 给Event填充数据
             //给这个区块放入 数据  如果此处不理解，想想RingBuffer的结构图
             ringBuffer.get(seq).setIndex(index);
             ringBuffer.get(seq).setCpUserId(cpUserId);
-            ringBuffer.get(seq).setPrivilageCpUserStoreDO(privilageCpUserStoreDO);
+            ringBuffer.get(seq).setStoreId(storeId);
             ringBuffer.get(seq).setQwMailListManageService(qwMailListManageService);
             ringBuffer.get(seq).setCustomerService(customerService);
             ringBuffer.get(seq).setPoiStoreStaffDOMapper(poiStoreStaffDOMapper);
diff --git a/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java b/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java
index 8874708..e94c044 100644
--- a/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java
+++ b/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java
@@ -39,8 +39,8 @@ public class DTOMessageHandler implements EventHandler<DTOMessage> {
         CustomerService customerService = dtoMessage.getCustomerService();
         PoiStoreStaffDOMapper poiStoreStaffDOMapper = dtoMessage.getPoiStoreStaffDOMapper();
         QWMailListManageService qwMailListManageService = dtoMessage.getQwMailListManageService();
-        PrivilageCpUserStoreDO cpUserStoreDO = dtoMessage.getPrivilageCpUserStoreDO();
-        List<Map<String,Object>> tagList = poiStoreStaffDOMapper.selectStaffTagByStoreId(cpUserStoreDO.getStoreId());
+        Long storeId = dtoMessage.getStoreId();
+        List<Map<String,Object>> tagList = poiStoreStaffDOMapper.selectStaffTagByStoreId(storeId);
         Map<String,Long> tagMap = new HashMap<>();
         for (Map<String,Object> map:tagList){
             tagMap.put((String)map.get("tag"),(Long)map.get("staffId"));