fix:mq.ex;

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/impl/BaseDao.java

@@ -45,7 +45,7 @@ public class BaseDao implements IBaseDao {
             TransactionTemplate tt = new TransactionTemplate(transactionManager);
             return tt.execute(callback);
         } catch (Exception ex) {
-            log.error("###SQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
             return false;
         }
     }
@@ -66,7 +66,7 @@ public class BaseDao implements IBaseDao {
 
                         for (int c : ints) {
                             if (c <= 0) {
-                                throw new LiquidnetServiceException();
+                                throw new LiquidnetServiceException("NON.SQL", sql.get(i));
                             }
                         }
                     }
@@ -111,7 +111,7 @@ public class BaseDao implements IBaseDao {
                 }
             }, keyHolder);
         } catch (Exception e) {
-            log.error("###SQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
         }
         return keyHolder.getKey().intValue();
 

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -59,30 +59,6 @@ public class ConsumerProcessor {
         }
     }
 
-    @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
-    public void consumerSql2(Message msg, Channel channel) {
-        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
-        log.debug("consumer sql2 ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
-        log.debug("consumer sql2 ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
-
-        try {
-            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
-            log.debug("consumer sql2 result of execution:{}", rstBatchSqls);
-            if (rstBatchSqls) {
-                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
-            } else {
-                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
-            }
-        } catch (Exception e) {
-            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
-            try {
-                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
-            } catch (IOException ioException) {
-                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
-            }
-        }
-    }
-
     // 订单创建
     @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_CREATE)
     public void consumerOrderCreate(Message msg, Channel channel) {