From d86e5474700034c674debf21b354ef96f4416a9e Mon Sep 17 00:00:00 2001
From: fengyarnom <fengyarnom@gmail.com>
Date: Tue, 29 Oct 2024 18:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20loggingmode=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BA=8E=20gnssdevice=20=E4=B8=AD=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 前端 gnss_add_dev 页面增加日志控制的选项
- 数据表 GnssDevice 类 和 缓存 Device 类增加 loggingmode 字段属性，用于控制设备的日志是否保存于文件之中
- 数据库更改 gnssdevices 表，添加一个 SMALLINT 的 loggingmode 字段
---
 .../main/java/com/imdroid/secapi/dto/GnssDevice.java  |  6 ++++++
 .../imdroid/sideslope/sal/DbDeviceServiceImpl.java    |  1 +
 .../main/java/com/imdroid/sideslope/sal/Device.java   |  3 +++
 .../resources/templates/page/table/gnss_add_dev.html  | 11 +++++++++++
 4 files changed, 21 insertions(+)

diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDevice.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDevice.java
index 3ecb7ed2..664c3ebb 100644
--- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDevice.java
+++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDevice.java
@@ -25,6 +25,9 @@ public class GnssDevice {
     public static final short MODEL_G505 = 0; //F9P
     public static final short MODEL_G510 = 1; //博通
 
+    public static final short LOGGIN_MODE_SIMPLE = 0; // 精简模式（ 仅D3F0和D3F2 ）
+    public static final short LOGGIN_MODE_FULL = 1;   // 完整模式
+
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Integer tenantid;
@@ -60,4 +63,7 @@ public class GnssDevice {
     private String imei;
     private Short model;
 
+    // 日志记录控制
+    private Short loggingmode;
+
 }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java
index 1708ac3f..7af9eaea 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java
@@ -42,6 +42,7 @@ public class DbDeviceServiceImpl implements DeviceService {
         device.setEcefx(gnssDevice.getEcefx());
         device.setEcefy(gnssDevice.getEcefy());
         device.setEcefz(gnssDevice.getEcefz());
+        device.setLoggingmode(gnssDevice.getLoggingmode());
         return device;
     }
 
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 9e4258d1..b17f6c9f 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
@@ -65,6 +65,9 @@ public class Device {
     LocalDateTime lastD3f0f2Time;
     short noFixedAndFloatResult=0;
 
+    // 日志记录控制
+    Short loggingmode;
+
     int lastRxHead = 0;
 
     int fixedNum = 0;
diff --git a/sec-beidou/src/main/resources/templates/page/table/gnss_add_dev.html b/sec-beidou/src/main/resources/templates/page/table/gnss_add_dev.html
index e59c96c7..a1b37c1e 100644
--- a/sec-beidou/src/main/resources/templates/page/table/gnss_add_dev.html
+++ b/sec-beidou/src/main/resources/templates/page/table/gnss_add_dev.html
@@ -34,6 +34,16 @@
                     </select>
                 </div>
             </div>
+
+            <div class="layui-inline">
+                <label class="layui-form-label required">日志记录</label>
+                <div class="layui-input-inline">
+                    <select name="loggingmode" id="loggingmode" lay-verify="required" lay-search="">
+                        <option value="0">不记录(除了自检和停止消息)</option>
+                        <option value="1">记录</option>
+                    </select>
+                </div>
+            </div>
         </div>
         <div class="layui-form-item">
             <div class="layui-inline">
@@ -292,6 +302,7 @@
             $('#fwd_group_id').val(data.fwd_group_id);
             $('#fwd_group_id2').val(data.fwd_group_id2);
             $('#opmode').val(data.opmode);
+            $('#loggingmode').val(data.loggingmode);
             $('#fwddeviceid').val(data.fwddeviceid);
             $('#ipose').val(data.ipose);
             $('#iposn').val(data.iposn);