songwenbin 5 anni fa
parent
commit
bf16a893d6

+ 1 - 1
golden-realtime-kafka/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     compile("$bootGroup:spring-boot-starter-log4j2")
 
     compile 'com.alibaba:fastjson:1.2.17'
-    compile 'org.springframework.kafka:spring-kafka:2.2.7.RELEASE'
+    compile 'org.springframework.kafka:spring-kafka'
 
     compile 'com.opencsv:opencsv:4.5'
 

+ 31 - 15
golden-realtime-kafka/src/main/java/com/gyee/wisdom/CalculateServer.java

@@ -183,19 +183,18 @@ public class CalculateServer {
             byte[] groupData = bitMapGroup.getData();
 
             //按照数据类型写入data
+//            INT32
+//            FLOAT
+//            UINT32
+//            UINT
+//            CHAR
+//            FLOAT64
+//            FLOAT32
+//            INT16
+//            UINT16
+//            INT
             String dataType = tpd.getTagPoint().getDataType();
             switch (dataType) {
-                case "FLOAT32":
-                    //golden数据类型标记为FLOAT32,实际取值确实Double
-//                    Float valuef = (Float)tpd.getRtdbData().getValue();
-//                    System.arraycopy(BytesUtil.float2byte(valuef),0, groupData, dataOffset, 4);
-//                    dataOffset += 4;
-//                    break;
-                case "FLOAT64":
-                    Double valued = (Double)tpd.getRtdbData().getValue();
-                    System.arraycopy(BytesUtil.double2Byte(valued),  0, groupData, dataOffset, 8);
-                    dataOffset += 8;
-                    break;
                 case "BOOL":
                     Object valueo = tpd.getRtdbData().getValue();
                     if (valueo instanceof Double) {
@@ -214,17 +213,34 @@ public class CalculateServer {
 
                     dataOffset += 1;
                     break;
+                case "UINT16":
+                case "INT16":
+                case "CHAR":
+                    break;
                 case "INT":
                 case "INT32":
+                case "UINT32":
+                case "UINT":
                     //golden取值只有Long和Double两种类型,无32位整数型
-//                    Integer valuei = (Integer)tpd.getRtdbData().getValue();
-//                    System.arraycopy(BytesUtil.int2Bytes(valuei),0, groupData, dataOffset, 4);
+                    Long valuell = (Long)tpd.getRtdbData().getValue();
+                    System.arraycopy(BytesUtil.long2Bytes(valuell),0, groupData, dataOffset, 8);
+                    dataOffset += 8;
+                    break;
+                case "FLOAT32":
+                    //golden数据类型标记为FLOAT32,实际取值确实Double
+//                    Float valuef = (Float)tpd.getRtdbData().getValue();
+//                    System.arraycopy(BytesUtil.float2byte(valuef),0, groupData, dataOffset, 4);
 //                    dataOffset += 4;
 //                    break;
+                case "FLOAT64":
+//                    Double valued = (Double)tpd.getRtdbData().getValue();
+//                    System.arraycopy(BytesUtil.double2Byte(valued),  0, groupData, dataOffset, 8);
+//                    dataOffset += 8;
+//                    break;
                 default:
-                    Long valuell = (Long)tpd.getRtdbData().getValue();
+                    Double valueld = (Double) tpd.getRtdbData().getValue();
                     //todo: 时间是否需要代入
-                    System.arraycopy(BytesUtil.long2Bytes(valuell),0, groupData, dataOffset, 8);
+                    System.arraycopy(BytesUtil.double2Byte(valueld),0, groupData, dataOffset, 8);
                     dataOffset += 8;
             }
         }

+ 6 - 4
golden-realtime-kafka/src/main/resources/application.yaml

@@ -4,6 +4,12 @@
 spring:
   application:
     name: ygys-golden-latest
+  kafka:
+    bootstrap-servers: 172.168.5.61:9092
+    kafka.topic-name: myTopic
+    kafka.consumer.group.id: test-consumer-group
+    producer:
+      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
 
 golden:
   #server_ip: 10.155.32.1
@@ -16,8 +22,4 @@ golden:
   #单次查询历史原始数据的数量上限
   query_history_limit: 100000
 
-kafka:
-  bootstrap-server: 172.168.5.61:9092
-  kafka.topic-name: myTopic
-  kafka.consumer.group.id: test-consumer-group