rainbow954 7 rokov pred
rodič
commit
e0e224f296

+ 2 - 2
src/main/java/com/tidecloud/dataacceptance/codec/MsgDecoder.java

@@ -415,10 +415,10 @@ public class MsgDecoder {
                 ret.setOil(this.parseIntFromBytes(additionalInfo, 2, length));
                 additionalInfo = Arrays.copyOfRange(additionalInfo, length + 2, additionalInfo.length);
             } else if (Constants.LocationPackage.TYPE_OF_SPEED.equals(type)) {
-                ret.setSpeed(this.parseIntFromBytes(additionalInfo, 2, length));
+                //ret.setSpeed(this.parseIntFromBytes(additionalInfo, 2, length));
                 additionalInfo = Arrays.copyOfRange(additionalInfo, length + 2, additionalInfo.length);
             } else if (Constants.LocationPackage.TYPE_OF_WARN_ID.equals(type)) {
-                ret.setSpeed(this.parseIntFromBytes(additionalInfo, 2, length));
+                //ret.setSpeed(this.parseIntFromBytes(additionalInfo, 2, length));
                 additionalInfo = Arrays.copyOfRange(additionalInfo, length + 2, additionalInfo.length);
             } else if (Constants.LocationPackage.TYPE_OF_RUN_WARN.equals(type)) {
                 additionalInfo = Arrays.copyOfRange(additionalInfo, length + 2, additionalInfo.length);

+ 87 - 0
src/main/resources/application.yml

@@ -0,0 +1,87 @@
+spring:
+  application:
+    name: device-acceptance
+  kafka:
+    bootstrap-servers: 192.168.0.119:9092
+  redis:
+    host: 192.168.0.119
+    password: tidecloudredis
+    timeout: 10000
+    port: 6379
+    max: 100
+    maxIdle: 10
+    minIdle: 3
+    maxWaitMills: 10000
+eureka:
+  client:
+    service-url:
+      defaultZone: http://192.168.0.118:12000/eureka
+  instance:
+    prefer-ip-address: true
+  port: 16666
+  localaddress: 10.27.118.76
+server:
+  port: ${random.int(16000,19999)}
+acceptance:
+ device:
+  deviceList:
+   -
+    name: watch
+    topic: device-watch
+    ip: 10.27.118.76
+    port: 7009
+    dataFileDir: /home/service/collector_watch/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.WatchServerHandler
+    enable: false
+    
+   -
+    name: bingshui
+    topic: device-bingshui
+    ip: 10.27.118.76
+    port: 7510
+    dataFileDir: /home/service/collector_7510/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.BingShuiGpsServerHandler
+    enable: false
+    
+   -
+    name: bsj
+    topic: device-bsj
+    ip: 10.25.19.87
+    port: 6707
+    dataFileDir: /home/service/collector_6707/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.BSJGpsServerHandler
+    enable: true
+    
+   -
+    name: yitong
+    topic: device-yitong
+    ip: 10.27.118.76
+    port: 7011
+    dataFileDir: /home/service/collector_yitong/rawdata-car/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.YiTongGpsServerHandler
+    enable: false    
+   -
+    name: yuguang
+    topic: device-yuguang
+    ip: 10.27.118.76
+    port: 7510
+    dataFileDir: /home/service/collector_7510/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.YuGuangGpsServerHandler
+    enable: false       
+
+   -
+    name: vorgea
+    topic: device-vorgea
+    ip: 10.27.118.76
+    port: 7511
+    dataFileDir: /home/service/collector_vorgea/rawdata/
+    handlerClass: com.tidecloud.dataacceptance.service.impl.VorgeaUR0401ServerHandler
+    enable: false         
+      
+logging:
+  config:
+    classpath: logback.xml
+
+
+
+

+ 1 - 1
src/test/java/com/tidecloud/dataacceptance/HelloClient.java

@@ -55,7 +55,7 @@ public class HelloClient {
         	singleThreadPool.execute(()->{
         		 
                 try {
-        				client.connect("localhost", 7009);
+        				client.connect("localhost", 6707);
         				Thread.sleep(5000);
         			} catch (Exception e) {
         				// TODO Auto-generated catch block

+ 6 - 6
src/test/java/com/tidecloud/dataacceptance/HelloClientIntHandler.java

@@ -62,14 +62,14 @@ public class HelloClientIntHandler extends ChannelInboundHandlerAdapter {
    // msg=  DatatypeConverter.parseHexBinary(a);
 //      String msg = "n,2,860854021358527,2018-03-21,12:00:20,31.888678,117.480155,0.025002,9942.554893,111.110001,z00575.675,s00107.600,f00000.000,t00000.000,x0062,e0,g0,m0,v0,N0,p0000,k0000000000";
 //       msg=msg+"\n";
-        String msg1 = "7e02000071010000000001000D00000000000C00130244F55F06D18611005C0000000018040917290301040003019603020000E80100FC3A01020000020C002BDA7D0100176BB000146ECD030C00930AC10083E360000F2761040800000000000004B0050200000604001DB8B30704000000142B044C3F004330011C310115497e";
+        String msg1 = "7e02000072010000000001096100000000000C00130243997606D237CD003F02E400821804170233320104000347120202045903020000FC3A01020000020C002EA10B0019248800157C83030C009DB76C008DFBC4000FBBA8040800006C9400004F38050200020604001FE0F50704000000142B044C79008730011B310112207e";
         
-        message = "[3G*3925160532*00CB*UD,100418,065535,V,30.632577,N,120.6878867,E,0.00,0.0,0.0,0,100,98,0,0,00000010,7,255,460,0,6234,57713,148,6234,57714,129,6234,57683,124,6234,57698,123,6234,57697,122,6234,57457,119,6234,57729,118,0,16.6]";
-      // msg= DatatypeConverter.parseHexBinary(msg1);
+      //  message = "[3G*3925160532*00CB*UD,100418,065535,V,30.632577,N,120.6878867,E,0.00,0.0,0.0,0,100,98,0,0,00000010,7,255,460,0,6234,57713,148,6234,57714,129,6234,57683,124,6234,57698,123,6234,57697,122,6234,57457,119,6234,57729,118,0,16.6]";
+       msg= DatatypeConverter.parseHexBinary(msg1);
         
-       // String printHexBinary = DatatypeConverter.printHexBinary(msg);
-      //  System.out.println(printHexBinary);
-        msg=message.getBytes();
+        String printHexBinary = DatatypeConverter.printHexBinary(msg);
+        System.out.println(printHexBinary);
+      
         ByteBuf encoded = ctx.alloc().buffer(4 * msg.length);  
        encoded.writeBytes(msg);  
         ctx.write(encoded);