From a6c2d584612643669e1248b93d8e4e689c8d6607 Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 13 Dec 2023 09:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8=E8=B7=9D?= =?UTF-8?q?=E7=A6=BB=E8=B6=85=E8=BF=87=E6=9F=90=E4=B8=80=E9=97=A8=E9=99=90?= =?UTF-8?q?=E5=90=8E=E8=A7=A6=E5=8F=91=E5=8F=98=E5=91=A8=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/GNSSDeviceLocationRecordService.java | 1 + .../GNSSDeviceLocationRecordServiceImpl.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) 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 index ff6c3fde..71daf7ac 100644 --- 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 @@ -2,6 +2,7 @@ package com.imdroid.sideslope.service; import com.imdroid.secapi.dto.GnssCalcData; import com.imdroid.sideslope.message.D341LocationMessage; +import com.imdroid.sideslope.sal.Device; import java.time.LocalDateTime; 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 index 86fa45a1..40c869db 100644 --- 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 @@ -33,8 +33,8 @@ public class GNSSDeviceLocationRecordServiceImpl implements GNSSDeviceLocationRe @Autowired private GnssRawDataMapper gnssRawDataMapper; - @Resource(name = "local") - private DeviceService gnssDeviceRepository; + @Autowired + private GnssDeviceMapper gnssDeviceRepository; @Autowired private GnssGroupCalcMapper groupCalcMapper; @@ -59,15 +59,15 @@ public class GNSSDeviceLocationRecordServiceImpl implements GNSSDeviceLocationRe @Override public void save(GnssCalcData locationRecord, boolean isExceed) { String deviceId = locationRecord.getDeviceid(); - Device gnssDevice = gnssDeviceRepository.findByDeviceId(deviceId); + GnssDevice gnssDevice = gnssDeviceRepository.queryByDeviceId(deviceId); if(gnssDevice == null) return; //补充解算记录的设备信息 - locationRecord.setTenantid(gnssDevice.getTenantId()); + locationRecord.setTenantid(gnssDevice.getTenantid()); locationRecord.setEnabled(true); // 获取平滑参数 - GnssGroupCalc groupCalc = getCalcParams(gnssDevice.getCalcGroupId()); + GnssGroupCalc groupCalc = getCalcParams(gnssDevice.getCalc_group_id()); // 计算平滑周期 int filterCycle = groupCalc.getFilter_hour(); @@ -259,9 +259,9 @@ public class GNSSDeviceLocationRecordServiceImpl implements GNSSDeviceLocationRe @Override public LocalDateTime updateRb562(String deviceId, LocalDateTime afterTime){ // 获取平滑参数 - Device gnssDevice = gnssDeviceRepository.findByDeviceId(deviceId); + GnssDevice gnssDevice = gnssDeviceRepository.queryByDeviceId(deviceId); if(gnssDevice == null) return afterTime; - GnssGroupCalc groupCalc = getCalcParams(gnssDevice.getCalcGroupId()); + GnssGroupCalc groupCalc = getCalcParams(gnssDevice.getCalc_group_id()); // 平滑处理 LocalDateTime beforTime = afterTime.plusHours(groupCalc.getFilter_hour());