From f9aa1d4f69f471636be4db48f95717158195d6fe Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 26 Sep 2024 15:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=B9=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/csdevice/service/impl/CsDevCapacityPOServiceImpl.java  | 2 +-
 .../java/com/njcn/csharmonic/handler/MqttMessageHandler.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevCapacityPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevCapacityPOServiceImpl.java
index 7a05dd9..4e6e47c 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevCapacityPOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevCapacityPOServiceImpl.java
@@ -61,6 +61,6 @@ public class CsDevCapacityPOServiceImpl extends ServiceImpl<CsDevCapacityPOMappe
         if(Objects.isNull(one)){
             return 0.0;
         }
-        return Double.valueOf(df.format(one.getCapacity()*0.1));
+        return Double.valueOf(df.format(one.getCapacity()));
     }
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
index 40f81b3..784d1e2 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
@@ -165,7 +165,7 @@ public class MqttMessageHandler {
                if (capacity<=0){
                    thdDataVO.setStatisticalData(3.1415926);
                }else {
-                   double v = temp.getStatisticalData() / capacity;
+                   double v = temp.getStatisticalData()*100 / capacity;
                    thdDataVO.setStatisticalData(Double.valueOf(df.format(v)));
                }
                result.add(thdDataVO);