From e3cb89c67346298a01faf460a27cbcb63a2bfee9 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Wed, 15 Jan 2025 14:09:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=8C=89=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beidou/controller/GnssDeviceController.java        | 10 ++++++++++
 .../main/resources/templates/page/gnss_dev_cfg.html    | 10 ++++++++++
 2 files changed, 20 insertions(+)

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 fc86b8e9..0bf45895 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
@@ -140,6 +140,16 @@ public class GnssDeviceController extends BasicController{
             if (opmode != null && opmode != QUERY_ALL) {
                 queryWrapper.eq("opmode", opmode);
             }
+            //推送状
+            Integer fwd = search.getInteger("fwd_group_id");
+            if (fwd != null && fwd != QUERY_ALL) {
+                if(fwd == 0) {
+                    queryWrapper.ne("fwd_group_id", "不推送");
+                }
+                else{//不推送
+                    queryWrapper.eq("fwd_group_id", "不推送");
+                }
+            }
         }
 
         IPage<GnssDevice> cs = gnssDeviceMapper.selectPage(pageable, queryWrapper);
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 75a5563e..e6dd4004 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
@@ -73,6 +73,16 @@
 							</div>
 						</div>
 						<div class="layui-inline">
+							<label class="layui-form-label">推送状态</label>
+							<div class="layui-input-inline">
+								<select name="fwd_group_id" id="fwd_group_id" lay-verify="required" lay-search="">
+									<option value="-1">全部</option>
+									<option value="0">推送</option>
+									<option value="1">不推送</option>
+								</select>
+							</div>
+						</div>
+						<div class="layui-inline">
                             <button type="submit" class="layui-btn layui-btn-primary"  lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
                         </div>
                     </div>