From 3b72967226a809b0740ae8926d92176c897c0815 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sat, 22 Feb 2025 10:15:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/imdroid/secapi/dto/GnssGroup.java    | 4 +++-
 .../imdroid/beidou/controller/GnssDeviceController.java    | 4 +++-
 sec-beidou/src/main/resources/db/schema.sql                | 1 +
 .../src/main/resources/templates/page/gnss_dev_cfg.html    | 1 +
 .../src/main/resources/templates/page/gnss_group_cfg.html  | 1 +
 .../resources/templates/page/table/gnss_add_group.html     | 7 +++++++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssGroup.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssGroup.java
index 75d87a28..12ac9235 100644
--- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssGroup.java
+++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssGroup.java
@@ -25,6 +25,7 @@ public class GnssGroup implements Serializable {
     Short rs_adv; // reference station only
     Short power_mode;
     Integer device_num;
+    Short gnss_sample_s;
 
     public String getConfigCmd(GnssDevice device){
         String cmd = "D3110009";
@@ -33,7 +34,8 @@ public class GnssGroup implements Serializable {
                 +HexUtil.Byte2HexString((byte) active_time.intValue())
                 +HexUtil.Byte2HexString((byte) active_offset.intValue())
                 +((device.getDevicetype() == GnssDevice.TYPE_ROVER)?"00":HexUtil.Byte2HexString((byte) rs_adv.shortValue()))
-                +HexUtil.Byte2HexString((byte) power_mode.shortValue());
+                +HexUtil.Byte2HexString((byte) power_mode.shortValue())
+                +HexUtil.Byte2HexString((byte) gnss_sample_s.shortValue());
         return cmd;
     }
 
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
index c457a80b..b6ad50e1 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
@@ -123,7 +123,9 @@ public class GnssDeviceController extends BasicController{
             //所属组织
             String tenantname = search.getString("tenantname");
             if (StringUtils.hasText(tenantname)) {
-                queryWrapper.like("tenantname", tenantname);
+                if(tenantname.startsWith("非SAAS"))
+                    queryWrapper.ne("tenantname",Tenant.SAAS_PROVIDER_NAME);
+                else queryWrapper.like("tenantname", tenantname);
             }
             //设备类型
             Integer devicetype = search.getInteger("devicetype");
diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql
index e5361e25..acc502e9 100644
--- a/sec-beidou/src/main/resources/db/schema.sql
+++ b/sec-beidou/src/main/resources/db/schema.sql
@@ -78,6 +78,7 @@ CREATE TABLE IF NOT EXISTS `gnssgroup` (
     `active_time` int DEFAULT 6,
     `active_offset` int DEFAULT 0,
     `rs_adv` smallint DEFAULT 0,
+    `gnss_sample_s` smallint DEFAULT 1,
     `power_mode` smallint DEFAULT 0,
     `device_num` int DEFAULT 0,
     PRIMARY KEY (`id`)
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html b/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
index 4998102a..cb248163 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html
@@ -41,6 +41,7 @@
 							<div class="layui-input-inline">
 								<select name="tenantname" id="tenantname" lay-search="">
 									<option value="">全部</option>
+									<option value="非SAAS服务商">非SAAS服务商</option>
 									<option th:each="item : ${tenant_list}" th:text="${item.name}" th:value="${item.name}"></option>
 								</select>
 							</div>
diff --git a/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html b/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html
index 0fc825fc..4d0158b3 100644
--- a/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html
+++ b/sec-beidou/src/main/resources/templates/page/gnss_group_cfg.html
@@ -54,6 +54,7 @@
 			{field: 'active_time', title: '激活时长(分钟)'},
 			{field: 'active_offset', title: '偏置(分钟)'},
 			{field: 'rs_adv', title: '基准站提前时间（分钟）'},
+			{field: 'gnss_sample_s', title: 'GNSS上报（秒）'},
 			{field: 'power_mode', title: '功耗模式',templet: "<div>{{d.power_mode==0?'低功耗':'普通'}}</div>"},
 			{field: 'device_num', title: '关联设备数'},
 			{title: '操作', toolbar: '#currentTableBar', align: "center"}
diff --git a/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html b/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html
index 74c36702..b0805d6e 100644
--- a/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html
+++ b/sec-beidou/src/main/resources/templates/page/table/gnss_add_group.html
@@ -47,6 +47,12 @@
                 <input type="number" name="active_offset" id="active_offset" placeholder="请输入配置" value="0" class="layui-input">
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">GNSS上报(秒)</label>
+            <div class="layui-input-block">
+                <input type="number" name="gnss_sample_s" id="gnss_sample_s" placeholder="请输入配置" value="0" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">基准站提前时间(分钟)</label>
             <div class="layui-input-block">
@@ -111,6 +117,7 @@
             $('#rs_adv').val(data.rs_adv);
             $('#power_mode').val(data.power_mode);
             $('#name').val(data.name);
+            $('#gnss_sample_s').val(data.gnss_sample_s);
             form.render();
         }
     </script>