From b1f4ad159901328dc57242f9e0a6cea0c39c1133 Mon Sep 17 00:00:00 2001 From: weidong Date: Sat, 30 Dec 2023 09:49:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=8D=E4=BF=9D=E5=AD=98b562?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E8=A7=A3=E6=9E=90=E7=BB=93=E6=9E=9C=E5=88=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BA=86=EF=BC=8C=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=B5=84=E6=BA=90=E5=8D=A0=E7=94=A8?= =?UTF-8?q?=202=E3=80=81=E7=8A=B6=E6=80=81=E8=A1=A8=E5=92=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E7=9A=84=E8=AE=BE=E5=A4=87ID?= =?UTF-8?q?=E5=8F=AF=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calc/MultiLineGNSSCalcService.java | 4 -- .../executor/D341LocationMessageExecutor.java | 4 -- .../sideslope/sal/DbDeviceServiceImpl.java | 3 -- .../GNSSDeviceLocationRecordService.java | 12 ------ .../GNSSDeviceLocationRecordServiceImpl.java | 40 ------------------- .../templates/page/gnss_dev_cfg.html | 2 +- .../resources/templates/page/gnss_status.html | 2 +- 7 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordService.java delete mode 100644 sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java index fd16913d..54038ff5 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/MultiLineGNSSCalcService.java +++ b/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); } // 记录最新补传数据的时间 diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java index bdd99376..ed339498 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java +++ b/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 { gnssCalcService.calcSingle(message,true); - dataPersistService.saveRawData(message); }); return null; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java index 8e1ff87c..39082c28 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/DbDeviceServiceImpl.java +++ b/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; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordService.java deleted file mode 100644 index bd52c378..00000000 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordService.java +++ /dev/null @@ -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); -} diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java deleted file mode 100644 index 22e9404f..00000000 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java +++ /dev/null @@ -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); - } -} diff --git a/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html b/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html index c19ffc1c..aadb15d5 100644 --- a/sec-beidou/src/main/resources/templates/page/gnss_dev_cfg.html +++ b/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: '父设备号'}, diff --git a/sec-beidou/src/main/resources/templates/page/gnss_status.html b/sec-beidou/src/main/resources/templates/page/gnss_status.html index 06f29a6e..0bacba2f 100644 --- a/sec-beidou/src/main/resources/templates/page/gnss_status.html +++ b/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: "
{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}
"}, {field: 'devicetime', title: '设备时间'},