From cb885a6f3bd1b04ebc94811c142a5639188d8d8a Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Mon, 8 Apr 2024 16:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspur/industrial/domain/BottomCylData.java | 13 +++++++++++++
 .../com/inspur/industrial/domain/ScollerData.java   |  6 ++++++
 .../industrial/service/impl/DataQueryService.java   |  5 +++++
 3 files changed, 24 insertions(+)

diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/BottomCylData.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/BottomCylData.java
index 5caf86e..3de0240 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/BottomCylData.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/BottomCylData.java
@@ -10,6 +10,19 @@ import lombok.Data;
  */
 @Data
 public class BottomCylData extends IpcData{
+
+    @Excel(name = "操作侧比例伺服阀压力")
+    /**
+     * 操作侧比例伺服阀压力
+     */
+    private double opServoPress;
+
+    @Excel(name = "传动侧比例伺服阀压力")
+    /**
+     * 操作侧比例伺服阀压力
+     */
+    private double tranServoPress;
+
     @Excel(name = "操作侧软辊流量")
     /**
      * 操作侧软辊流量
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/ScollerData.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/ScollerData.java
index 4067d70..bb558c4 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/ScollerData.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/ScollerData.java
@@ -11,6 +11,12 @@ import lombok.Data;
 @Data
 public class ScollerData extends IpcData{
 
+    @Excel(name = "车速")
+    /**
+     * 车速
+     */
+    private double speed;
+
     @Excel(name = "一区压力")
     /**
      * 一区压力
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
index b01c2e7..780442b 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
@@ -255,6 +255,9 @@ public class DataQueryService implements IDataQueryService {
             ipcData.setGran14(data.get("gran14") == null ? 0 : (double) data.get("gran14"));
             ipcData.setGran21(data.get("gran21") == null ? 0 : (double) data.get("gran21"));
 
+            ipcData.setOpServoPress(data.get("opr_servo") == null ? 0 : (double) data.get("opr_servo"));
+            ipcData.setTranServoPress(data.get("driven_servo") == null ? 0 : (double) data.get("driven_servo"));
+
             ipcData.setOpSoftFlow(data.get("opr_soft_flw") == null ? 0 : (double) data.get("opr_soft_flw"));
             ipcData.setOpHotFlow(data.get("opr_hot_flw") == null ? 0 : (double) data.get("opr_hot_flw"));
 
@@ -521,6 +524,8 @@ public class DataQueryService implements IDataQueryService {
             ipcData.setGran14(data.get("gran14") == null ? 0 : (double) data.get("gran14"));
             ipcData.setGran21(data.get("gran21") == null ? 0 : (double) data.get("gran21"));
 
+            ipcData.setSpeed(data.get("line_speed") == null ? 0 : (double) data.get("line_speed"));
+
             ipcData.setPress1(data.get("press1") == null ? 0 : (double) data.get("press1"));
             ipcData.setPress2(data.get("press2") == null ? 0 : (double) data.get("press2"));
             ipcData.setPress3(data.get("press3") == null ? 0 : (double) data.get("press3"));