1、不保存b562原始解析结果到数据库了，减少服务器资源占用

2、状态表和设备列表的设备ID可排序

sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java

@@ -8,7 +8,6 @@ import com.imdroid.sideslope.message.BaseMessage;
 import com.imdroid.sideslope.message.D341LocationMessage;
 import com.imdroid.sideslope.message.D342LocationMessage;
 import com.imdroid.sideslope.service.DataPersistService;
-import com.imdroid.sideslope.service.GNSSDeviceLocationRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +26,6 @@ public class MultiLineGNSSCalcService {
     @Autowired
     SingleLineGNSSCalcService calcService;
     @Autowired
-    private GNSSDeviceLocationRecordService locationPersistService;
-    @Autowired
     GNSSCalcFilterService gnssCalcFilterService;
     @Autowired
     private FwdRecordMapper fwdRecordMapper;
@@ -83,7 +80,6 @@ public class MultiLineGNSSCalcService {
         for(BaseMessage message: d342Message.getMessageList()){
             D341LocationMessage d341Message = (D341LocationMessage)message;
             calcService.calcSingle(d341Message, false);
-            locationPersistService.saveRawData(d341Message);
         }
 
         // 记录最新补传数据的时间

sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java

@@ -4,7 +4,6 @@ import com.imdroid.sideslope.calc.GNSSDataCalcService;
 import com.imdroid.sideslope.message.D341LocationMessage;
 import com.imdroid.sideslope.sal.Device;
 import com.imdroid.sideslope.sal.DeviceService;
-import com.imdroid.sideslope.service.GNSSDeviceLocationRecordService;
 import com.imdroid.common.util.ThreadManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,8 +23,6 @@ public class D341LocationMessageExecutor implements Executor<D341LocationMessage
 
     @Autowired
     private GNSSDataCalcService gnssCalcService;
-    @Autowired
-    private GNSSDeviceLocationRecordService dataPersistService;
     @Resource(name = "local")
     private DeviceService deviceService;
 
@@ -42,7 +39,6 @@ public class D341LocationMessageExecutor implements Executor<D341LocationMessage
 
         ThreadManager.getFixedThreadPool().submit(() -> {
             gnssCalcService.calcSingle(message,true);
-            dataPersistService.saveRawData(message);
         });
 
         return null;

sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java

@@ -3,9 +3,6 @@ package com.imdroid.sideslope.sal;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.imdroid.secapi.dto.GnssDevice;
 import com.imdroid.secapi.dto.GnssDeviceMapper;
-import com.imdroid.sideslope.service.GNSSDeviceLocationRecordService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordService.java

@@ -1,12 +0,0 @@
-package com.imdroid.sideslope.service;
-
-import com.imdroid.sideslope.message.D341LocationMessage;
-
-
-/**
- * @author Layton
- * @date 2023/2/4 20:18
- */
-public interface GNSSDeviceLocationRecordService {
-    void saveRawData(D341LocationMessage message);
-}

sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java

@@ -1,40 +0,0 @@
-package com.imdroid.sideslope.service;
-
-import com.imdroid.secapi.dto.*;
-import com.imdroid.sideslope.bd.Tilt;
-import com.imdroid.sideslope.bd.UBXUtil;
-import com.imdroid.sideslope.message.D341LocationMessage;
-import com.imdroid.common.util.NumberUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Layton
- * @date 2023/2/15 21:05
- */
-@Service
-public class GNSSDeviceLocationRecordServiceImpl implements GNSSDeviceLocationRecordService{
-
-    @Autowired
-    private GnssRawDataMapper gnssRawDataMapper;
-
-    @Override
-    public void saveRawData(D341LocationMessage message){
-        GnssRawData data = new GnssRawData();
-        data.setTenantid(message.getTenantId());
-        data.setDeviceid(message.getId());
-        data.setCreatetime(message.getCreateTime());
-        Tilt tilt = message.getTilt();
-        data.setRoll(tilt.getRoll());
-        data.setPitch(tilt.getPitch());
-        data.setYaw(tilt.getYaw());
-        data.setShock(tilt.getShock());
-        double[] b562_loc = message.getB562_loc();
-        if((int)b562_loc[3] == UBXUtil.FIX_RESULT) {
-            data.setB562e(b562_loc[0]);
-            data.setB562n(b562_loc[1]);
-            data.setB562d(b562_loc[2]);
-        }
-        gnssRawDataMapper.insert(data);
-    }
-}

sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html

@@ -78,7 +78,7 @@
             url: '/gnss/device/list',
             toolbar: '#toolbarTop',
             cols: [[
-                {field: 'deviceid', title: '设备号'},
+                {field: 'deviceid', title: '设备号', sort: true},
                 {field: 'name', title: '设备名称'},
 				{field: 'devicetype', title: '类型',templet: '#typeTrans'},
 				{field: 'parentid', title: '父设备号'},

sec-beidou/src/main/resources/templates/page/gnss_status.html

@@ -78,7 +78,7 @@
                 icon: 'layui-icon-tips'
             }],
             cols: [[
-                {field: 'deviceid', title: '设备号'},
+                {field: 'deviceid', title: '设备号', sort: true},
                 {field: 'devicetype', title: '设备类型',templet: '#typeTrans'},
                 {field: 'updatetime', title: '更新时间', templet: "<div>{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}</div>"},
                 {field: 'devicetime', title: '设备时间'},