From 98d774555f6207ac07dbfb9c542b1b489839b827 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 10 十二月 2021 16:01:48 +0800
Subject: [PATCH] 1. 自动评分调整
---
src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt | 2 +-
src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_2.kt | 8 ++++----
src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt | 18 +++++++-----------
src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt | 2 +-
src/main/resources/application.yml | 12 ++++++------
5 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt b/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt
index c77e4fc..c339a5a 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/SupervisionApplication.kt
@@ -21,7 +21,7 @@
@Bean
fun runner() = ApplicationRunner {
webSocketServer.start()
- taskController.run()
+// taskController.run()
}
}
diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt b/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt
index d100e3a..e8a889e 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt
@@ -280,21 +280,17 @@
}
} ?: 0
// 鍐欏叆鏁版嵁搴�
-// if (r > 0) {
-// evaluationList.forEach { el -> evaluationMapper.insert(el) }
-// itemevaluationList.forEach { il -> itemevaluationMapper.insert(il) }
- for (e in evaluationList) {
- if (e.ertype?.toInt()?.equals(0) == true) {
- finalScore(e, year, eMonth, period)
- break
- }
- }
+// for (e in evaluationList) {
+// if (e.ertype?.toInt()?.equals(0) == true) {
+// finalScore(e, year, eMonth, period)
+// break
+// }
// }
}
// 鍐欏叆鏂囨。
-// ExcelUtil.write2(emptyList(), contents, workbook)
-// workbook.write(out)
+ ExcelUtil.write2(emptyList(), contents, workbook)
+ workbook.write(out)
workbook.close()
out.flush()
out.close()
diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_2.kt b/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_2.kt
index 63ad276..bd717b1 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_2.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/score/item/ScoreItem_2.kt
@@ -68,11 +68,11 @@
// }
// }
// }
-// return true
+ return true
// FIXME: 2021/4/26 瀛ｅ害鍐呭彴璐︿笉寰楀垎鐨勶紝鍙瀹氫负缂烘瑙勭幆璇勫鎵规枃浠讹紝鎵�10鍒�
- val r3 = scoreItem3.execute(info)
- val r4 = scoreItem4.execute(info)
- return !(r3.second == 0 && r4.second == 0)
+// val r3 = scoreItem3.execute(info)
+// val r4 = scoreItem4.execute(info)
+// return !(r3.second == 0 && r4.second == 0)
}
}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4b453e7..34d07b4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,14 +12,14 @@
# password: 123456
#-TestEnd-
- url: jdbc:mysql://localhost:3306/ledger?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
- username: ledger
- password: ledger_fxxchackxr
+# url: jdbc:mysql://localhost:3306/ledger?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+# username: ledger
+# password: ledger_fxxchackxr
# 寮�鍙戣繙绋嬫湇鍔″櫒
-# url: jdbc:mysql://47.100.191.150:3306/ledger?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/ledger?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+ username: remoteU1
+ password: eSoF8DnzfGTlhAjE
initialSize: 5
minIdle: 5
diff --git a/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt b/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt
index cec2428..b4531af 100644
--- a/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt
+++ b/src/test/kotlin/cn/flightfeather/supervision/common/score/AutoScoreTest.kt
@@ -20,6 +20,6 @@
@Test
fun go() {
- autoScore.go(2021, 4)
+ autoScore.go(2021, 7)
}
}
\ No newline at end of file
--
Gitblit v1.9.3