From db9d27b3a00f709e40fa4f59bfc30db6f63ef55e Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 11 Jul 2025 10:08:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A5=E7=BB=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=85=B6=E4=BB=96=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=EF=BC=9Aid,datetime=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E8=BE=93=E5=85=A5id=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E6=98=AF=E6=8E=A5=E6=9C=AC=E6=9C=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=202=E3=80=81=E6=81=A2=E5=A4=8D=E5=91=A8=E8=B7=B3=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E6=8E=A8=E9=80=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sideslope/service/WarningServiceImpl.java | 2 +- .../beidou/controller/GnssDeviceController.java | 14 ++++++++++++-- .../templates/page/table/gnss_add_dev.html | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java index 90c0f610..44c0acd4 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java @@ -317,7 +317,7 @@ public class WarningServiceImpl implements WarningService { !unFwdGroupName.equals(device.getFwd_group_id())){ device.setFwd_group_id(unFwdGroupName); device.setFwd_group_id2(unFwdGroupName); - //deviceMapper.updateById(device); + deviceMapper.updateById(device); // 产生告警 WarningMsg warningMsg = new WarningMsg(); warningMsg.setDeviceid(device.getDeviceid()); 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 e6f71dd6..be303118 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 @@ -347,8 +347,18 @@ public class GnssDeviceController extends BasicController{ JSONObject jsonObject = new JSONObject(); //old data + String[] paras = createtime.split(","); + String oldDeviceId; + if(paras.length==2){ + oldDeviceId = paras[0]; + createtime = paras[1]; + } + else { + oldDeviceId = deviceid; + createtime = paras[0]; + } QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("deviceid",deviceid); + queryWrapper.eq("deviceid",oldDeviceId); queryWrapper.eq("enabled",1); queryWrapper.eq("createtime",createtime); queryWrapper.last("limit 1"); @@ -376,7 +386,7 @@ public class GnssDeviceController extends BasicController{ // 原来的初始值 QueryWrapper deviceQueryWrapper = new QueryWrapper<>(); - deviceQueryWrapper.eq("deviceid",deviceid); + deviceQueryWrapper.eq("deviceid",oldDeviceId); deviceQueryWrapper.last("limit 1"); GnssDevice device = gnssDeviceMapper.selectOne(deviceQueryWrapper); if(device.getIpose()==null) device.setIpose(0.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 678a23ef..dbcb45fe 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 @@ -290,7 +290,7 @@ form.on('submit(contBtn)', function (data) { // 弹出输入框 layer.prompt({ - title: '请输入接续记录日期', // 弹窗标题 + title: '请输入接续的设备编号和日期时间，用逗号隔开', // 弹窗标题 formType: 0, // 0-文本输入框 maxlength: 50, // 最大输入长度 value: '', // 初始值