From 8e5aac7e9d73d698897e153d96965cf474e14794 Mon Sep 17 00:00:00 2001
From: yj <913944315@qq.com>
Date: Mon, 1 Jul 2024 14:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iec61850clent/common/util/ValueFormatUtil.java  |  2 +-
 .../models/iec61850run/Iec61850Scheduled.java       |  4 ++--
 pom.xml                                             | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/device_iec61850clent/src/main/java/com/xr/iec61850clent/common/util/ValueFormatUtil.java b/device_iec61850clent/src/main/java/com/xr/iec61850clent/common/util/ValueFormatUtil.java
index b2b8416..d00b594 100644
--- a/device_iec61850clent/src/main/java/com/xr/iec61850clent/common/util/ValueFormatUtil.java
+++ b/device_iec61850clent/src/main/java/com/xr/iec61850clent/common/util/ValueFormatUtil.java
@@ -14,8 +14,8 @@ public class ValueFormatUtil {
     * */
     public static String getNumBerJx(float getVal,MeterConfig config, MeterConfigService meterConfigService){
         int s = (int) getVal;
-        Integer jz = Integer.valueOf(config.getJzVal())+1;
         if(StringUtils.isNotEmpty(config.getJzVal())){
+            Integer jz = Integer.valueOf(config.getJzVal())+1;
             if(s==jz){
                 config.setJzVal(jz+"");
                 meterConfigService.updateById(config);
diff --git a/device_iec61850clent/src/main/java/com/xr/iec61850clent/models/iec61850run/Iec61850Scheduled.java b/device_iec61850clent/src/main/java/com/xr/iec61850clent/models/iec61850run/Iec61850Scheduled.java
index 55bfae1..fcbc417 100644
--- a/device_iec61850clent/src/main/java/com/xr/iec61850clent/models/iec61850run/Iec61850Scheduled.java
+++ b/device_iec61850clent/src/main/java/com/xr/iec61850clent/models/iec61850run/Iec61850Scheduled.java
@@ -192,7 +192,7 @@ public class Iec61850Scheduled {
                                                 value = t-2+"";
                                             }
                                         }else {
-                                            value=s+"";
+                                            value = config.getJzVal();;
                                         }
                                     }
                                     if(config.getTypeId() == 10){//放电计数器
@@ -200,7 +200,7 @@ public class Iec61850Scheduled {
                                         if(s>=10){
                                             value = 0+"";
                                         }else {
-                                            value = s+"";
+                                            value = String.format("%.0f", f);;
                                         }
                                     }
                                     if(config.getIsJz() == 1){
diff --git a/pom.xml b/pom.xml
index de6c445..5bb6a0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,18 @@
         <module>device_udpclent</module>
         <module>device_udpserver</module>
     </modules>
-
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
     <properties>
         <spring-boot.version>2.0.8.RELEASE</spring-boot.version>
         <spring-cloud.version>Finchley.SR4</spring-cloud.version>