From 440044c0ab0bf1faa0421e9d4e3bef14ac994461 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Mon, 29 Sep 2025 11:40:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=80=BE=E8=A7=92?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E5=92=8C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java  | 3 ++-
 .../executor/D350SurfaceInclineMessageExecutor.java         | 6 +-----
 sec-beidou/src/main/resources/db/schema.sql                 | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java
index 3e842534..aeeb55e8 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java
@@ -67,7 +67,7 @@ public class GZYMQTTForwarder extends Forwarder {
         logger.debug("gzy mqtt forwardGnss");
         if(mqttClient.isConnected()) {
             forwardCurrentGnss();
-            //forwardAngleData();
+            forwardAngleData();
         }
         else{
             try{
@@ -130,6 +130,7 @@ public class GZYMQTTForwarder extends Forwarder {
 
             GZYMQTTAngle tranData = new GZYMQTTAngle();
             tranData.setDeviceSn(msg.getDeviceid());
+            tranData.setDeviceType(8);
             tranData.setCollectTime(msg.getCreatetime().format(formatter));
             float x = msg.getRoll()==null?0:msg.getRoll();
             float y = msg.getPitch()==null?0:msg.getPitch();
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350SurfaceInclineMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350SurfaceInclineMessageExecutor.java
index 802f3ab0..38a46481 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350SurfaceInclineMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350SurfaceInclineMessageExecutor.java
@@ -3,7 +3,6 @@ package com.imdroid.sideslope.executor;
 import com.imdroid.common.util.ThreadManager;
 import com.imdroid.secapi.dto.*;
 import com.imdroid.sideslope.message.D350SurfaceInclineMessage;
-import com.imdroid.sideslope.service.DataPersistService;
 import com.imdroid.sideslope.service.Device;
 import com.imdroid.sideslope.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +19,6 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class D350SurfaceInclineMessageExecutor implements Executor<D350SurfaceInclineMessage, Void> {
-
-    @Autowired
-    private DataPersistService dataPersistService;
     @Autowired
     SurfaceInclineDataMapper dataMapper;
     @Autowired
@@ -32,7 +28,7 @@ public class D350SurfaceInclineMessageExecutor implements Executor<D350SurfaceIn
         Device device = deviceService.findByDeviceId(message.getId());
         if(device == null) return null;
         // 补齐tenantId
-        message.setTenantId(device.getTenantId());
+        message.getInclineData().setTenantid(device.getTenantId());
 
         ThreadManager.getFixedThreadPool().submit(() -> {
 
diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql
index 6362dcd5..1e8ecea0 100644
--- a/sec-beidou/src/main/resources/db/schema.sql
+++ b/sec-beidou/src/main/resources/db/schema.sql
@@ -411,7 +411,6 @@ CREATE TABLE IF NOT EXISTS `surface_incline_data` (
     `id` bigint AUTO_INCREMENT,
     `tenantid` int NOT NULL,
     `createtime` datetime DEFAULT NULL,
-    `devicetime` time DEFAULT NULL,
     `deviceid` varchar(20) NOT NULL,
     `sensorid` smallint DEFAULT NULL,
     `anglex` float DEFAULT NULL,
@@ -427,4 +426,4 @@ CREATE TABLE IF NOT EXISTS `surface_incline_data` (
     `minaccy` float DEFAULT NULL,
     `minaccz` float DEFAULT NULL,
     PRIMARY KEY (`id`)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;