Merge remote-tracking branch 'origin/dev-zs' into dev-zs

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);

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){

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>