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

2、恢复周跳停止推送功能

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

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<GnssCalcData> 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<GnssDevice> 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);

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: '',                 // 初始值