From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java
index ce2ba66..6d4213f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java
@@ -13,15 +13,16 @@
private static String openValveDt ;
private static String closeValveDt ;
+ public static Integer instantAmount = 10123;//鐬椂娴侀噺10.000
public static Integer totalAmount = 1234567;//瀹炰负12345.67
public static Integer remainMoney = 56789;//瀹炰负567.89
- public static Integer thisAmount = 1000;//瀹炰负10.00
- public static Integer thisMoney = 1000;//瀹炰负10.00
+ public static Integer thisAmount = 0;//
+ public static Integer thisMoney = 0;//
public static Integer thisTime = 10;//瀹炰负10
public static Integer thisPrice = 100;//瀹炰负1.00
- public static Integer perAmount = thisAmount;
- public static Integer perMoney = thisMoney;
+ public static Integer perAmount = 10;
+ public static Integer perMoney = 0;
public static void clearOpenValveDt(){
@@ -40,7 +41,11 @@
return closeValveDt ;
}
- public static void closeValve(){
+ public static void addValve(){
+ perMoney = perAmount / (thisPrice / 100) ;
+ thisAmount += perAmount ;
+ thisMoney += perMoney ;
+
totalAmount = totalAmount + perAmount ;
remainMoney = remainMoney - perMoney ;
}
--
Gitblit v1.8.0