From 49832a5bba94c816e83e7e74095106643f0a433e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 16 十二月 2021 13:24:28 +0800
Subject: [PATCH] 1. 用电量日分析 2. 网格权重污染分析
---
src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt
index 91977a5..cf868ae 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt
@@ -30,13 +30,13 @@
private var pfRunTime: Int = 0
private var pfRunPeriod = mutableListOf<Int>()
- private var rTimeDiff:Int = 0 //姝ｅ紡杩愯鏃堕棿宸�
- private var sResult:Boolean = false //璁惧寮�鍚槸鍚﹀悎瑙�
- private var eTimeDiff: Int = 0 //鍏抽棴鏃堕棿宸�
- private var eResult: Boolean = false //璁惧鍏抽棴鏄惁鍚堣
- private var runningTimeDiff = 0 //杩愯鏃堕暱宸�
- private var rResult:Boolean = false //杩愯杩囩▼鏄惁鍚堣
- private var dailyResult: String = ""// 褰撴棩鍒嗘瀽缁撴灉鎻忚堪
+ var rTimeDiff:Int = 0 //姝ｅ紡杩愯鏃堕棿宸�
+ var sResult:Boolean = false //璁惧寮�鍚槸鍚﹀悎瑙�
+ var eTimeDiff: Int = 0 //鍏抽棴鏃堕棿宸�
+ var eResult: Boolean = false //璁惧鍏抽棴鏄惁鍚堣
+ var runningTimeDiff = 0 //杩愯鏃堕暱宸�
+ var rResult:Boolean = false //杩愯杩囩▼鏄惁鍚堣
+ var dailyResult: String = ""// 褰撴棩鍒嗘瀽缁撴灉鎻忚堪
// 褰撳墠璁惧绫诲瀷锛岀敤浜庢彃鍏ユ暟鎹椂鍐冲畾璧嬪�煎瓧娈�
private var deviceType: ElectricityType = ElectricityType.ProductionLine
@@ -125,15 +125,16 @@
// TODO: 2021/12/1 1. 璁惧姝ｅ紡杩愯鏃堕棿宸� =銆嬪紑鍚槸鍚﹀悎瑙�
if (pfRTime != null && plRTime != null) {
rTimeDiff = ((pfRTime!!.time - plRTime!!.time) / 1000 / 60).toInt()
- sResult = rTimeDiff > 0
+ sResult = rTimeDiff < 0
}
// TODO: 2021/12/1 2锛岃澶囧叧闂椂闂村樊 =銆嬪叧闂槸鍚﹀悎瑙�
if (pfETime != null && plETime != null) {
eTimeDiff = ((pfETime!!.time - plETime!!.time) / 1000 / 60).toInt()
+ eResult = eTimeDiff > 0
}
// TODO: 2021/12/1 3. 杩愯鏃堕暱宸� =銆嬭繍琛岃繃绋嬫槸鍚﹀悎瑙�
runningTimeDiff = pfRunTime - plRunTime
- // TODO: 2021/12/1 4. 缁煎悎鍒ゆ柇缁撴灉
+ rResult = runningTimeDiff > 0
// TODO: 2021/12/1 5. 澶氭棩鎽樿缁熻锛岃繍琛屽ぉ鏁般�佸悎瑙勫ぉ鏁扮瓑
}
--
Gitblit v1.9.3