From c197ffe1a7b5ed3c94c95a95d86ce2ec201c8556 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期六, 07 五月 2022 10:49:57 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
index d1793e3..eae71ac 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
@@ -13,7 +13,7 @@
*/
public class stringTest {
public static void main(String[] args) {
- String command = "16050032359000";
+ String command = "000005003001000430050";
// String command = "00000500605000";
char[] chars = command.toCharArray();
@@ -37,10 +37,25 @@
// int i1 = v2.getHour() - v1.getHour();
// int i2 = (v2.getMin()- v1.getMin());
- BigDecimal hour = BigDecimal.valueOf((v2.getHour()- v1.getHour()));
- BigDecimal min = BigDecimal.valueOf((v2.getMin()- v1.getMin())/60);
+ BigDecimal hour;
+ if (v2.getHour() > v1.getHour()) {
+ hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+ } else if (v2.getHour() < v1.getHour()) {
+ hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
+ } else {
+ hour = BigDecimal.valueOf(0);
+ }
+// BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
+ BigDecimal min;
+ if (v2.getMin() > v1.getMin()) {
+ min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
+ } else if (v2.getMin() < v1.getMin()) {
+ min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
+ } else {
+ min = BigDecimal.valueOf(0);
+ }
- BigDecimal totalTime=(hour.add(min));
+ BigDecimal totalTime = (hour.add(min));
// int total=(i1*3600+i2*60);
// BigDecimal energySaving = BigDecimal.valueOf(((100-v1.getBrightness())/100)*totalTime/24);
// BigDecimal energySaving =BigDecimal.valueOf((100-v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
--
Gitblit v1.9.3