修改redis消费队列方式

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/AbstractRedisReceiver.java

@@ -37,16 +37,18 @@ public abstract class AbstractRedisReceiver implements StreamListener<String, Ma
         log.info("body " + message.getValue());
         boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
 
-        // 消费成功确认，消息删除和消息确认是一个事务
-        log.info("consumer success delete message messageId:{} ",message.getId());
-        try {
+        if(result){
+            // 消费成功确认，消息删除和消息确认是一个事务
+            log.info("consumer success delete message messageId:{} ",message.getId());
+            try {
 //                stringRedisTemplate.multi();
-            stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
 //                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
 //                stringRedisTemplate.exec();
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
+            }
         }
     }
 
@@ -59,8 +61,6 @@ public abstract class AbstractRedisReceiver implements StreamListener<String, Ma
             log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
                 return true;
-            }else{
-                sendMySqlRedis(msg);
             }
         } catch (Exception e) {
             e.printStackTrace();

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java

@@ -27,23 +27,25 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
     @Override
     public void onMessage(MapRecord<String, String, String> message) {
         log.info("接受到来自redis REFUND 的消息");
-        System.out.println("message id " + message.getId());
-        System.out.println("stream " + message.getStream());
-        System.out.println("body " + message.getValue());
-        consumerSqlDaoHandler(message.getValue().get("message"));
-        log.error("consumer success delete message messageId:{} ",message.getId());
-        try {
+        log.info("message id " + message.getId());
+        log.info("stream " + message.getStream());
+        log.info("body " + message.getValue());
+        boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
+        if(result){
+            log.error("consumer success delete message messageId:{} ",message.getId());
+            try {
 //                stringRedisTemplate.multi();
-            stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
+                stringRedisTemplate.opsForStream().delete(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), message.getId());
 //                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
 //                stringRedisTemplate.exec();
-        } catch (Exception e) {
-            log.error("delete redis queue message Exception error: {} ",e);
-            log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
+            } catch (Exception e) {
+                log.error("delete redis queue message Exception error: {} ",e);
+                log.error("delete redis queue message error messageId:{} errMsg:{}",message.getId(),e.getMessage());
+            }
         }
     }
 
-    private void consumerSqlDaoHandler(String msg) {
+    private boolean consumerSqlDaoHandler(String msg) {
         try {
             SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
             log.debug("CONSUMER SQL ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
@@ -51,13 +53,13 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
             log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
-                //应答
-            } else {
-                sendMySqlRedis(msg);
+                return true;
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.error("CONSUMER SQL Exception error:{}", e);
         }
+        return false;
     }
 
     /**