From 9ecebaac7d35c05ba87823101229d2bd5535972c Mon Sep 17 00:00:00 2001
From: weitang <pechji9114@163.com>
Date: Tue, 20 May 2025 11:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AlgorithmDeviceServiceImpl.java      |  2 +-
 .../controller/DeviceWorkDataController.java  |  2 +-
 .../com/yfd/platform/utils/TestFileDir.java   |  9 ++++----
 .../auxcontrol/DeviceWorkDataMapper.xml       | 22 +++++++++++--------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
index 55007ad..4179fc3 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
@@ -153,7 +153,7 @@ public class AlgorithmDeviceServiceImpl extends ServiceImpl<AlgorithmDeviceMappe
         for (LocalDateTime slot : minuteSlots) {
             xAxisData.add(slot.format(formatter));
             String value = minuteDataMap.getOrDefault(slot, "0");
-            if (!NumberUtil.isDouble(value)) {
+            if (!NumberUtil.isNumber(value)) {
                 value = "0";
             }
             seriesData.add(NumberUtil.parseDouble(value));
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
index 56c4d56..314457d 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
@@ -83,7 +83,7 @@ public class DeviceWorkDataController {
         for (LocalDateTime slot : minuteSlots) {
             xAxisData.add(slot.format(formatter));
             String value = minuteDataMap.getOrDefault(slot, "0");
-            if (!NumberUtil.isDouble(value)) {
+            if (!NumberUtil.isNumber(value)) {
                 value="0";
             }
             seriesData.add(NumberUtil.parseDouble(value));
diff --git a/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java b/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java
index ab62eea..efe4525 100644
--- a/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java
+++ b/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java
@@ -1,11 +1,12 @@
 package com.yfd.platform.utils;
 
+import cn.hutool.core.util.NumberUtil;
+
 public class TestFileDir {
     public static void main(String[] args) throws Exception {
-        double resultvalue = 50;
-        double baseValue = 100;
-        double abs = Math.abs((resultvalue - baseValue) / baseValue * 100);
-        System.out.println(abs);
+        if (NumberUtil.isNumber("23")) {
+            System.out.println("是数字");
+        }
 
     }
 }
diff --git a/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml b/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
index 847fea0..49059ab 100644
--- a/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
+++ b/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
@@ -44,17 +44,21 @@
     </select>
     <select id="getDeviceWorkData" resultType="java.util.Map">
         SELECT
-            ds.signal_id,
-            ds.signal_code itemcode,
-            ds.signal_name dictname,
-            COALESCE ( ds.yc_value, '无' ) AS value,
-            ds.signal_unit unit
+        ds.signal_id,
+        ds.signal_code itemcode,
+        ds.signal_name dictname,
+        COALESCE ( ds.yc_value, '无' ) AS value,
+        ds.signal_unit unit
         FROM
-            fk_device_signal ds
-            INNER JOIN iis_substation_component sc ON ds.main_component_id = sc.component_id
+        fk_device_signal ds
+        INNER JOIN iis_substation_component sc ON ds.main_component_id = sc.component_id
+        INNER JOIN iis_substation ss ON ss.station_code = sc.station_code
         WHERE
-            sc.component_name = '微气象设备部件'
-            ORDER BY orderno
+        sc.component_name = '微气象设备部件'
+        <if test="stationId != null and stationId != ''">
+            AND ss.station_id=#{stationId}
+        </if>
+        ORDER BY orderno
     </select>
     <select id="getHistoricalCurveList" resultType="com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData">
         SELECT