From d8b9437e7322f9d0351e38cc3a3b5a7bb3e7bb35 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 02 十二月 2021 09:18:51 +0800
Subject: [PATCH] 1. 用电量日分析
---
src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt | 13 ++++++++++++-
src/main/resources/application.yml | 12 ++++++------
2 files changed, 18 insertions(+), 7 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 cde575e..bd11107 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt
@@ -15,16 +15,21 @@
/***********浜х嚎璁惧ProductionLine, pl************/
private var plDCode: String? = null // 璁惧缂栧彿
private var plSTime: Date? = null // 寮�鍚椂闂�
+ private var plRTime: Date? = null // 姝ｅ紡杩愯鏃堕棿
private var plETime: Date? = null // 鍏抽棴鏃堕棿
+ // FIXME: 2021/12/1 锛堢姸鎬佷负杩愯銆侀珮璐熻嵎鐨勬椂闀匡級
private var plRunTime: Int = 0 // 杩愯鏃堕暱锛堝垎閽燂級
private var plRunPeriod = mutableListOf<Int>()// 杩愯鏃舵锛堝皬鏃讹級
/***********鍑�鍖栬澶嘝urify, pf********************/
private var pfDCode: String? = null
private var pfSTime: Date? = null
+ private var pfRTime: Date? = null
private var pfETime: Date? = null
private var pfRunTime: Int = 0
private var pfRunPeriod = mutableListOf<Int>()
+ // TODO: 2021/12/1 姝ｅ紡杩愯鏃堕棿宸�
+ // TODO: 2021/12/1 鍏抽棴鏃堕棿宸�
private var dailyResult: String = ""// 褰撴棩鍒嗘瀽缁撴灉鎻忚堪
// 褰撳墠璁惧绫诲瀷锛岀敤浜庢彃鍏ユ暟鎹椂鍐冲畾璧嬪�煎瓧娈�
@@ -87,6 +92,12 @@
*/
fun getResult() {
// 1. 璁惧寮�鍚叧闂槸鍚﹀悎瑙�
-// val timeDiff =
+
+ // TODO: 2021/12/1 1. 璁惧姝ｅ紡杩愯鏃堕棿宸� =銆嬪紑鍚槸鍚﹀悎瑙�
+ // TODO: 2021/12/1 2锛岃澶囧叧闂椂闂村樊 =銆嬪叧闂槸鍚﹀悎瑙�
+ // TODO: 2021/12/1 3. 杩愯鏃堕暱宸� =銆嬭繍琛岃繃绋嬫槸鍚﹀悎瑙�
+ // TODO: 2021/12/1 4. 缁煎悎鍒ゆ柇缁撴灉
+
+ // TODO: 2021/12/1 5. 澶氭棩鎽樿缁熻锛岃繍琛屽ぉ鏁般�佸悎瑙勫ぉ鏁扮瓑
}
}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1087cd6..e03ad45 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,9 @@
# password: cn.FLIGHTFEATHER
# 绾夸笂鏈嶅姟鍣�
-# url: jdbc:mysql://localhost:3306/dronemonitor?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
-# username: dronemonitor
-# password: dronemonitor_hackxrnomxm
+ url: jdbc:mysql://localhost:3306/dronemonitor?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+ username: dronemonitor
+ password: dronemonitor_hackxrnomxm
# 寮�鍙戞湰鍦版湇鍔″櫒
# url: jdbc:mysql://localhost:3306/dronemonitor?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
@@ -17,9 +17,9 @@
# password: 123456
# 寮�鍙戣繙绋嬫湇鍔″櫒
- url: jdbc:mysql://47.100.191.150:3306/dronemonitor?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
- username: remoteU1
- password: eSoF8DnzfGTlhAjE
+# url: jdbc:mysql://47.100.191.150:3306/dronemonitor?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+# username: remoteU1
+# password: eSoF8DnzfGTlhAjE
hikari:
maximum-pool-size: 500
minimum-idle: 20
--
Gitblit v1.9.3