xls 消费改为2个

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerGoblinXlsRedisStreamConfig.java

@@ -44,13 +44,13 @@ public class ConsumerGoblinXlsRedisStreamConfig extends RedisStreamConfig {
         return subscription;
     }
 
-//    @Bean
-//    public Subscription subscriptionGoblinXls1(RedisConnectionFactory factory) {
-//        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
-//        var subscription = receiveGoblinXls(listenerContainer, 1);
-//        listenerContainer.start();
-//        return subscription;
-//    }
+    @Bean
+    public Subscription subscriptionGoblinXls1(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveGoblinXls(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
 //
 //    @Bean
 //    public Subscription subscriptionGoblinXls2(RedisConnectionFactory factory) {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractXlsRedisReceiver.java

@@ -59,14 +59,18 @@ public abstract class AbstractXlsRedisReceiver implements StreamListener<String,
         boolean aBoolean = false;
         try {
             String[] path = message.get("message").split(",");
-            xlsPath = path[0];
+            if (path.length == 0) {
+                xlsPath = "";
+            } else {
+                xlsPath = path[0];
+            }
             if (path.length > 1) {
                 oXlsPath = path[1];
             }
             String finalSkuId = (skuId = message.get("skuId"));
             String listId;
 //            try {
-                listId = message.getOrDefault("listId", "");
+            listId = message.getOrDefault("listId", "");
 //            }catch (Exception e){
 //                listId = "";
 //            }
@@ -94,7 +98,7 @@ public abstract class AbstractXlsRedisReceiver implements StreamListener<String,
                 objs.add(new Object[]{skuId, xlsPath, type, 1, LocalDateTime.now()});
                 aBoolean = baseDao.batchSql(SQL_INSERT_GOODS_BUY_ROSTER_LOG, objs);
             } else if (finalType.equals(3) || finalType.equals(4)) {
-                if (oXlsPath != null&& !oXlsPath.equals("")) {//删除旧的黑白名单
+                if (oXlsPath != null && !oXlsPath.equals("")) {//删除旧的黑白名单
                     EasyExcel.read(new URL(oXlsPath).openStream(), new PageReadListener<HashMap<String, String>>(dataList -> {
                         for (HashMap<String, String> data : dataList) {
                             if (data.get(0) == null) {
@@ -102,10 +106,10 @@ public abstract class AbstractXlsRedisReceiver implements StreamListener<String,
                             }
                             if (finalType.equals(3)) {
                                 log.debug("删除 白名单 读取到一条数据{}", JSON.toJSONString(data));
-                                redisUtil.del(GoblinRedisConst.REDIS_WHITE.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)));
+                                redisUtil.del(GoblinRedisConst.REDIS_WHITE.concat(listId + ":").concat(finalSkuId + ":").concat(data.get(0)));
                             } else {
                                 log.debug("删除 黑名单 读取到一条数据{}", JSON.toJSONString(data));
-                                redisUtil.del(GoblinRedisConst.REDIS_BLACK.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)));
+                                redisUtil.del(GoblinRedisConst.REDIS_BLACK.concat(listId + ":").concat(finalSkuId + ":").concat(data.get(0)));
                             }
                         }
                     })).sheet().doRead();
@@ -118,10 +122,10 @@ public abstract class AbstractXlsRedisReceiver implements StreamListener<String,
                             }
                             if (finalType.equals(3)) {
                                 log.debug("添加 白名单 读取到一条数据{}", JSON.toJSONString(data));
-                                redisUtil.set(GoblinRedisConst.REDIS_WHITE.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)), 1);
+                                redisUtil.set(GoblinRedisConst.REDIS_WHITE.concat(listId + ":").concat(finalSkuId + ":").concat(data.get(0)), 1);
                             } else {
                                 log.debug("添加 黑名单 读取到一条数据{}", JSON.toJSONString(data));
-                                redisUtil.set(GoblinRedisConst.REDIS_BLACK.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)), 1);
+                                redisUtil.set(GoblinRedisConst.REDIS_BLACK.concat(listId + ":").concat(finalSkuId + ":").concat(data.get(0)), 1);
                             }
                         }
                     })).sheet().doRead();