From 211cea3a17e48722bfbfd53ea7a74cc720fcf61a Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sat, 30 Dec 2023 08:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0d331=E5=92=8Cb562=E5=AD=97?=
 =?UTF-8?q?=E8=8A=82=E6=95=B0=E7=BB=9F=E8=AE=A1=EF=BC=9B=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/imdroid/secapi/dto/GnssTrxMsg.java     | 18 ++++++++----------
 .../executor/D331RtcmMessageExecutor.java      |  1 +
 .../executor/D341LocationMessageExecutor.java  |  1 +
 .../D3F2StopIndicationMessageExecutor.java     |  5 +++++
 .../message/D3F2StopIndicationMessage.java     | 12 ++++++------
 .../java/com/imdroid/sideslope/sal/Device.java | 16 ++++++++++++++++
 .../sideslope/server/DeviceChannel.java        | 11 -----------
 .../service/DataPersistServiceImpl.java        |  6 +++---
 .../controller/GnssStatusController.java       |  2 +-
 sec-beidou/src/main/resources/db/schema.sql    |  2 --
 .../resources/templates/page/gnss_msg_trx.html |  2 --
 11 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssTrxMsg.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssTrxMsg.java
index 252e0d6e..41f96884 100644
--- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssTrxMsg.java
+++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssTrxMsg.java
@@ -22,15 +22,13 @@ public class GnssTrxMsg {
     LocalDateTime createtime;
     LocalTime devicetime;
     String deviceid;
-    Long uart1txbytes;
-    Long uart1rxbytes;
-    Long uart1unknown;
-    Long uart2txbytes;
-    Long uart2rxbytes;
-    Long uart2unknown;
+    Integer uart1txbytes;
+    Integer uart1rxbytes;
+    Integer uart1unknown;
+    Integer uart2txbytes;
+    Integer uart2rxbytes;
+    Integer uart2unknown;
     // 这里的收发都是服务端统计的，终端收发详细统计在msg_trx表里
-    Long servertxbytes;
-    Long serverrxbytes;
-    Long b562bytes;
-    Long d3xxbytes;
+    Integer b562bytes;
+    Integer d3xxbytes;
 }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
index 03a604d4..1c201174 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
@@ -34,6 +34,7 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
         Device device1 = deviceService.findByDeviceId(message.getId());
         if(device1 == null) return null;
         message.setTenantId(device1.getTenantId());
+        device1.updateD331Bytes(message.getLen());
 
         String id = message.getId();
         byte[] forwardBytes = message.getSrcData();
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
index 8270075c..bdd99376 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
@@ -38,6 +38,7 @@ public class D341LocationMessageExecutor implements Executor<D341LocationMessage
         Device device = deviceService.findByDeviceId(message.getId());
         if(device == null) return null;
         message.setTenantId(device.getTenantId());
+        device.updateD341Bytes(message.getLen());
 
         ThreadManager.getFixedThreadPool().submit(() -> {
             gnssCalcService.calcSingle(message,true);
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
index 1151a682..68abe8cf 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
@@ -1,6 +1,7 @@
 package com.imdroid.sideslope.executor;
 
 import com.imdroid.secapi.client.BeidouClient;
+import com.imdroid.secapi.dto.GnssTrxMsg;
 import com.imdroid.sideslope.calc.MultiLineGNSSCalcService;
 import com.imdroid.sideslope.message.D3F2StopIndicationMessage;
 import com.imdroid.sideslope.sal.Device;
@@ -38,6 +39,10 @@ public class D3F2StopIndicationMessageExecutor implements Executor<D3F2StopIndic
         Device device = deviceService.findByDeviceId(deviceId);
         if(device == null) return null;
         message.setTenantId(device.getTenantId());
+        GnssTrxMsg gnssTrxMsg = message.getTrxMsg();
+        gnssTrxMsg.setD3xxbytes(device.getD3xxbytes());
+        gnssTrxMsg.setB562bytes(device.getB562bytes());
+        device.clearStat();
 
         LocalDateTime uploadTime = multiLineGNSSCalcService.getUploadTime(device.getDeviceId());
 
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D3F2StopIndicationMessage.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D3F2StopIndicationMessage.java
index 637fb4ef..8e0c2e95 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D3F2StopIndicationMessage.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D3F2StopIndicationMessage.java
@@ -28,17 +28,17 @@ public class D3F2StopIndicationMessage extends BaseMessage {
             int key = src.readUnsignedByte();
             long value = src.readUnsignedInt();
             if (key == 0) {
-                trxMsg.setUart1txbytes(value);
+                trxMsg.setUart1txbytes((int) value);
             } else if (key == 1) {
-                trxMsg.setUart1rxbytes(value);
+                trxMsg.setUart1rxbytes((int) value);
             } else if (key == 2) {
-                trxMsg.setUart1unknown(value);
+                trxMsg.setUart1unknown((int) value);
             } else if (key == 3) {
-                trxMsg.setUart2txbytes(value);
+                trxMsg.setUart2txbytes((int) value);
             } else if (key == 4) {
-                trxMsg.setUart2rxbytes(value);
+                trxMsg.setUart2rxbytes((int) value);
             } else if (key == 5) {
-                trxMsg.setUart2unknown(value);
+                trxMsg.setUart2unknown((int) value);
             }
         }
     }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java
index c1d486ed..c14f0f70 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java
@@ -33,4 +33,20 @@ public class Device {
 
     private Integer calcGroupId;
 
+    int d3xxbytes = 0;
+    int b562bytes = 0;
+
+    public void updateD331Bytes(int bytes){
+        d3xxbytes += bytes;
+    }
+
+    public void updateD341Bytes(int bytes){
+        b562bytes += bytes;
+    }
+
+    public void clearStat(){
+        d3xxbytes = 0;
+        b562bytes = 0;
+    }
+
 }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/DeviceChannel.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/DeviceChannel.java
index 6c0709da..a89c66c0 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/DeviceChannel.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/DeviceChannel.java
@@ -23,10 +23,6 @@ public class DeviceChannel {
     private long lastTime;
 
     private boolean tcp;
-    int txbytes = 0;
-    int rxbytes = 0;
-    int d3xxbytes = 0;
-    int b562bytes = 0;
 
     public DeviceChannel(String deviceId, Channel channel, InetSocketAddress address) {
         this.deviceId = deviceId;
@@ -45,17 +41,10 @@ public class DeviceChannel {
     }
 
     public void writeAndFlush(ByteBuf buf) {
-        txbytes += buf.readableBytes();
         if (tcp) {
             channel.writeAndFlush(buf);
         } else {
             channel.writeAndFlush(new DatagramPacket(buf, address));
         }
     }
-
-    public void updateRxBytes(int bytes, int header){
-        rxbytes += bytes;
-        if(header ==  0xd331) d3xxbytes += bytes;
-        else if(header == 0xd341) b562bytes += bytes;
-    }
 }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java
index 4a4d1f37..5c9e8a53 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java
@@ -97,9 +97,9 @@ public class DataPersistServiceImpl implements DataPersistService {
             if(null != deviceState) {
                 // 记录服务端收发统计
                 /*deviceState.setTxbytes(txbytes);
-                deviceState.setRxbytes(rxbytes);
-                deviceState.setD3xxbytes(d3xxbytes);
-                deviceState.setB562bytes(b562bytes);*/
+                deviceState.setRxbytes(rxbytes);*/
+                deviceState.setD3xxbytes(trxMsg.getD3xxbytes());
+                deviceState.setB562bytes(trxMsg.getB562bytes());
                 deviceState.setState(isUploading?GnssStatus.STATE_UPLOADING:GnssStatus.STATE_IDLE);
                 deviceStateRepository.updateById(deviceState);
             }
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
index 63949da3..00c98fcb 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
@@ -49,7 +49,7 @@ public class GnssStatusController extends BasicController{
             //设备号
             String deviceid = search.getString("deviceid");
             if (!StringUtils.isEmpty(deviceid)) {
-                queryWrapper.like("deviceid", deviceid);
+                queryWrapper.like("d.deviceid", deviceid);
             }
             //状态
             Integer state = search.getInteger("state");
diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql
index 06837295..9fca9417 100644
--- a/sec-beidou/src/main/resources/db/schema.sql
+++ b/sec-beidou/src/main/resources/db/schema.sql
@@ -205,8 +205,6 @@ CREATE TABLE IF NOT EXISTS `gnsstrxmsg` (
     `uart2txbytes` int DEFAULT NULL,
     `uart2rxbytes` int DEFAULT NULL,
     `uart2unknown` int DEFAULT NULL,
-    `servertxbytes` int DEFAULT NULL,
-    `serverrxbytes` int DEFAULT NULL,
     `b562bytes` int DEFAULT NULL,
     `d3xxbytes` int DEFAULT NULL,
     PRIMARY KEY (`id`)
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html b/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
index 7814c6fb..a5274b4a 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_msg_trx.html
@@ -61,8 +61,6 @@
                 {field: 'devicetime', title: '设备时间'},
                 {field: 'd3xxbytes', title: 'D3XX'},
                 {field: 'b562bytes', title: 'B562'},
-                {field: 'servertxbytes', title: '服务端发'},
-                {field: 'serverrxbytes', title: '服务端收'},
                 {field: 'uart1txbytes', title: '串口1发'},
                 {field: 'uart1rxbytes', title: '串口1收'},
                 {field: 'uart1unknown', title: '串口1未知'},