From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- 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