From 0864ca38c94bbca8a49110bc08cb6b6c62ed60ee Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sun, 1 Jun 2025 10:42:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=8F=82=E6=95=B0=E5=90=88=E6=B3=95=E6=80=A7?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imdroid/beidou/controller/GnssGroupController.java | 10 +++++++---
 .../resources/templates/page/table/gnss_add_group.html |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java
index d6a702a0..84b36ab8 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java
@@ -63,9 +63,13 @@ public class GnssGroupController extends BasicController {
 
     @PostMapping("/gnss/group/update")
     @ResponseBody
-    public String update(HttpSession session, @RequestBody JSONObject object) throws Exception {
+    public HttpResult update(HttpSession session, @RequestBody JSONObject object) throws Exception {
         int num = 0;
         GnssGroup group = JSONObject.toJavaObject(object,GnssGroup.class);
+        if(group.getActive_time()+ group.getActive_offset()>= group.getWork_cycle()){
+            return HttpResult.fail("参数组合错误！");
+        }
+
         GnssGroup oldGroup = gnssGroupMapper.selectById(group.getId());
 
         // no changed
@@ -90,12 +94,12 @@ public class GnssGroupController extends BasicController {
                     group.getName());
         }
         if (num == 0) {
-            return HttpResult.failed();
+            return HttpResult.fail("更新数据失败");
         } else{
             // 更新所有的device同步标志
             deviceMapper.setSynFlagByGroupId(group.getId());
             rtcmClient.groupParamChanged();
-            return HttpResult.ok();
+            return HttpResult.success("更新成功");
         }
     }
 
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 b0805d6e..c241219e 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
@@ -91,8 +91,12 @@
                     contentType: "application/json;charset=UTF-8",
                     data: JSON.stringify(data.field),
                     success: function (result) {
-                        parent.onBaseParaUpdated();
-                        parent.layer.close(iframeIndex);
+                        if(result.code == 0) {
+                            parent.onBaseParaUpdated();
+                            parent.layer.close(iframeIndex);
+                        }
+                        else layer.alert(result.msg);
+
                     },
                     error: function () {
                         console.log("ajax error");