From da431c25dfe5122e4ed70372da36ede3e4eaec4a Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 31 五月 2024 17:43:41 +0800
Subject: [PATCH] 1. 新增自动报告生成功能
---
src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt b/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
index 42a5b09..0f5ea52 100644
--- a/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
+++ b/src/main/kotlin/com/flightfeather/uav/model/BaseModel.kt
@@ -14,7 +14,7 @@
* 姹℃煋婧愬奖鍝嶇▼搴︽潈閲嶅垎鏋愭ā鍨�
* 鍩虹被
*/
-abstract class BaseModel<M : BaseMData, S : BaseSOP> {
+abstract class BaseModel<M : BaseMData> {
data class ResultCell(
var total: Double = 0.0,
@@ -27,26 +27,26 @@
}
}
- abstract var dataPrep: BaseDataPrep<M, S>
+ abstract var dataPrep: BaseDataPrep<M, BaseSOP>
// 鏉冮噸鍥犲瓙锛屽湪杩涜璁＄畻鍒嗘瀽鏃朵娇鐢ㄧ殑鐩戞祴鍥犲瓙
abstract var factorTypes: List<FactorType>
// 鏉冮噸鍊硷紝澶氱鏉冮噸杩涜涔樼Н璁＄畻
- abstract var weights: List<BaseWeight<M, S>>
+ abstract var weights: List<BaseWeight<M, BaseSOP>>
// 璁＄畻缁撴灉
private val rMap = mutableMapOf<String, MutableMap<String, MutableMap<String, ResultCell>>>()
// 缁撴灉绛涢�夋柟寮�
- abstract var sections: List<BaseSection<M, S>>
+ abstract var sections: List<BaseSection<M, BaseSOP>>
/**
* 姹℃煋婧愬奖鍝嶇▼搴﹁绠�
* @param mDataList 鐩戞祴鏁版嵁闆嗗悎
* @param sopList 姹℃煋婧愰泦鍚�
*/
- fun execute(mDataList: List<M>, sopList: List<S>, hasNext: Boolean = false) {
+ fun execute(mDataList: List<M>, sopList: List<BaseSOP>, hasNext: Boolean = false) {
if (!hasNext) rMap.clear()
//1. 鏁版嵁棰勫鐞�
@@ -68,7 +68,7 @@
* @param mData 鐩戞祴鏁版嵁
* @param sop 姹℃煋婧�
*/
- private fun weightCompute(mData: M, sop: S) {
+ private fun weightCompute(mData: M, sop: BaseSOP) {
val effect = BaseEffect(sop.sourceId, sop.sourceName, sop.index)
// 灏嗗師鐩戞祴鏁版嵁鎸夌収鏉冮噸璁＄畻鍑虹粨鏋滃��
@@ -234,5 +234,5 @@
/**
* 姹℃煋婧愭暟鎹悎娉曟�ф鏌�
*/
- abstract fun sopCheck(s: S): Boolean
+ abstract fun sopCheck(s: BaseSOP): Boolean
}
\ No newline at end of file
--
Gitblit v1.9.3