From 8aa982b81bd9a4692f538955016779f469337184 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Wed, 22 Oct 2025 16:06:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=80=BE=E8=A7=92?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../D350SurfaceInclineMessageExecutor.java    | 67 ++++++++++---------
 .../service/InclineDataForwarder.java         |  4 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
index 05b1adad..4dcd1f0c 100644
--- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
+++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
@@ -54,43 +54,13 @@ public class D350SurfaceInclineMessageExecutor implements Executor<D350SurfaceIn
             logger.debug("{} not existed", deviceId);
             return null;
         }
-        // 补齐tenantId
         SurfaceInclineData data = message.getInclineData();
         data.setTenantid(device.device.getTenantid());
-        SurfaceInclineData data1 = device.data1;
-
-        // 推送数据
-        if(data1 == null){
-            device.data1 = data;
-            device.sensorNum = 1;
-        }
-        else {
-            //只有1个传感器的设备立刻发数据
-            if(device.sensorNum == 1){
-                if (!data.getSensorid().equals(data1.getSensorid())){
-                    device.sensorNum = 2;
-                }
-                else {
-                    dataForwarder.send(device.device, data);
-                    device.data1 = data;
-                }
-            }
-            //有两个的等收到第2个才发
-            if (device.sensorNum == 2) {
-                if (data.getSensorid()==1) device.data1 = data;
-                else {
-                    data.setAnglex(data1.getAnglex());
-                    data.setAccx(data1.getAccx());
-                    dataForwarder.send(device.device, data);
-                }
-            }
-        }
-
-        device.updateTime = LocalDateTime.now();
+        forwardData(device, data);
 
         ThreadManager.getFixedThreadPool().submit(() -> {
-            //保存状态信息，判断是否有低电压等告警，清除离线告警
-            dataMapper.insert(message.getInclineData());
+            dataMapper.insert(data);
+
         });
         return null;
     }
@@ -130,4 +100,35 @@ public class D350SurfaceInclineMessageExecutor implements Executor<D350SurfaceIn
             }
         }
     }
+
+    void forwardData(DeviceInfo device, SurfaceInclineData data){
+        SurfaceInclineData data1 = device.data1;
+        if(data1 == null){
+            device.data1 = data;
+            device.sensorNum = 1;
+        }
+        else {
+            //只有1个传感器的设备立刻发数据
+            if(device.sensorNum == 1){
+                if (!data.getSensorid().equals(data1.getSensorid())){
+                    device.sensorNum = 2;
+                }
+                else {
+                    dataForwarder.send(device.device, data);
+                    device.data1 = data;
+                }
+            }
+            //有两个的等收到第2个才发
+            if (device.sensorNum == 2) {
+                if (data.getSensorid()==1) device.data1 = data;
+                else {
+                    data1.setAngley(data.getAnglex());
+                    data1.setAccy(data.getAccx());
+                    dataForwarder.send(device.device, data1);
+                }
+            }
+        }
+
+        device.updateTime = LocalDateTime.now();
+    }
 }
diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
index 3c12694e..63414006 100644
--- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
+++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
@@ -117,8 +117,8 @@ public class InclineDataForwarder{
         float z = surfaceInclineData.getAnglez();
         // 振幅
         float Zx = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccx();
-        float Zy = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccy();
-        float Zz = surfaceInclineData.getMaxaccx()-surfaceInclineData.getMinaccz();
+        float Zy = surfaceInclineData.getMaxaccy()-surfaceInclineData.getMinaccy();
+        float Zz = surfaceInclineData.getMaxaccz()-surfaceInclineData.getMinaccz();
 
         data.setX(NumberUtils.scale((double) x, 3));
         data.setY(NumberUtils.scale((double) y, 3));