From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index ebdfc28..84ee302 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -1,4 +1,4 @@
-/*
+
 package com.moral.api.exception.consumer;
 
 import com.moral.api.utils.AdjustDataUtils;
@@ -26,14 +26,17 @@
 import com.moral.api.websocket.CruiserWebSocketServer;
 import com.moral.constant.KafkaConstants;
 
-*/
 /*
  * ������������������������
- * *//*
+ **/
+
+
+
+
 
 @Component
 @Slf4j
-public class CruiserDataConsumer implements ConsumerSeekAware {
+public class CruiserDataConsumer  implements ConsumerSeekAware {
 
     @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, containerFactory = "cruiserDataListenerFactory")
     public void listenSecondSpecial(ConsumerRecord<String, String> record) throws Exception {
@@ -67,9 +70,9 @@
                     continue;
                 }
                 Double sourceDataD = Double.valueOf(String.valueOf(data.get(code)));
-                */
-/*BigDecimal bg = new BigDecimal(sourceDataD);
-                bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);*//*
+
+                 BigDecimal bg = new BigDecimal(sourceDataD);
+                bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);
 
                 String sourceData = String.valueOf(sourceDataD);
                 //������������
@@ -117,4 +120,4 @@
 
     }
 }
-*/
+

--
Gitblit v1.8.0