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");