Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、接续数据增加接其他编号设备数据的功能，输入：id,datetime，如果不输入id，就是接本机数据

Browse Source 
2、恢复周跳停止推送功能
This commit is contained in:
weidong 2025-07-11 10:08:27 +08:00
parent d250bfc671
commit db9d27b3a0
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
View File

@ -317,7 +317,7 @@ public class WarningServiceImpl implements WarningService {
!unFwdGroupName.equals(device.getFwd_group_id())){ !unFwdGroupName.equals(device.getFwd_group_id())){
device.setFwd_group_id(unFwdGroupName); device.setFwd_group_id(unFwdGroupName);
device.setFwd_group_id2(unFwdGroupName); device.setFwd_group_id2(unFwdGroupName);
//deviceMapper.updateById(device); deviceMapper.updateById(device);
// 产生告警 // 产生告警
WarningMsg warningMsg = new WarningMsg(); WarningMsg warningMsg = new WarningMsg();
warningMsg.setDeviceid(device.getDeviceid()); warningMsg.setDeviceid(device.getDeviceid());

14
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
View File

@ -347,8 +347,18 @@ public class GnssDeviceController extends BasicController{
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
//old data //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<GnssCalcData> queryWrapper = new QueryWrapper<>(); QueryWrapper<GnssCalcData> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("deviceid",deviceid); queryWrapper.eq("deviceid",oldDeviceId);
queryWrapper.eq("enabled",1); queryWrapper.eq("enabled",1);
queryWrapper.eq("createtime",createtime); queryWrapper.eq("createtime",createtime);
queryWrapper.last("limit 1"); queryWrapper.last("limit 1");
@ -376,7 +386,7 @@ public class GnssDeviceController extends BasicController{
// 原来的初始值 // 原来的初始值
QueryWrapper<GnssDevice> deviceQueryWrapper = new QueryWrapper<>(); QueryWrapper<GnssDevice> deviceQueryWrapper = new QueryWrapper<>();
deviceQueryWrapper.eq("deviceid",deviceid); deviceQueryWrapper.eq("deviceid",oldDeviceId);
deviceQueryWrapper.last("limit 1"); deviceQueryWrapper.last("limit 1");
GnssDevice device = gnssDeviceMapper.selectOne(deviceQueryWrapper); GnssDevice device = gnssDeviceMapper.selectOne(deviceQueryWrapper);
if(device.getIpose()==null) device.setIpose(0.0); if(device.getIpose()==null) device.setIpose(0.0);

2
sec-beidou/src/main/resources/templates/page/table/gnss_add_dev.html
View File

@ -290,7 +290,7 @@
form.on('submit(contBtn)', function (data) { form.on('submit(contBtn)', function (data) {
// 弹出输入框 // 弹出输入框
layer.prompt({ layer.prompt({
title: '请输入接续记录日期', // 弹窗标题 title: '请输入接续的设备编号和日期时间，用逗号隔开', // 弹窗标题
formType: 0, // 0-文本输入框 formType: 0, // 0-文本输入框
maxlength: 50, // 最大输入长度 maxlength: 50, // 最大输入长度
value: '', // 初始值 value: '', // 初始值