From 0412a0125f484282c28d76905ca1f6397014b982 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期一, 30 十二月 2024 14:32:48 +0800 Subject: [PATCH] 1. 测试部分新增数据后期调整代码(一次性) 2. 优化走航路径自动归集路段功能 --- src/main/kotlin/com/flightfeather/uav/model/epw/EPWModel.kt | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/model/epw/EPWModel.kt b/src/main/kotlin/com/flightfeather/uav/model/epw/EPWModel.kt index b12dd82..b832b60 100644 --- a/src/main/kotlin/com/flightfeather/uav/model/epw/EPWModel.kt +++ b/src/main/kotlin/com/flightfeather/uav/model/epw/EPWModel.kt @@ -11,19 +11,25 @@ * 鏍规嵁璧拌埅鐩戞祴鏁版嵁锛岀粨鍚堥閫熴�侀鍚戙�佺洃娴嬬偣涓庝紒涓氱殑鐩稿浣嶇疆绛夊洜绱狅紝璁$畻浼佷笟瀵圭洃娴嬪尯鍩熺殑褰卞搷绋嬪害 * @author riku */ -class EPWModel : BaseModel<DataVo, CompanySOP>() { +class EPWModel : BaseModel<DataVo>() { - override var dataPrep: BaseDataPrep<DataVo, CompanySOP> = EPWDataPrep() + // 榛樿鐩戞祴鐐圭粡绾害 + var defaultLocation: Pair<Double, Double>? = null + set(value) { + weights = listOf(WindDirWeight(value), WindDisWeight(value)) + } + + override var dataPrep: BaseDataPrep<DataVo, BaseSOP> = EPWDataPrep() override var factorTypes: List<FactorType> = WeightType.weightType - override var weights: List<BaseWeight<DataVo, CompanySOP>> = listOf(WindDirWeight(), WindDisWeight()) + override var weights: List<BaseWeight<DataVo, BaseSOP>> = listOf(WindDirWeight(defaultLocation), WindDisWeight(defaultLocation)) - override var sections: List<BaseSection<DataVo, CompanySOP>> = listOf(TimeSection()) + override var sections: List<BaseSection<DataVo, BaseSOP>> = listOf(TimeSection()) override fun mDataCheck(m: DataVo): Boolean = !(m.lng == null || m.lng == 0.0 || m.lat == null || m.lat == 0.0) - override fun sopCheck(s: CompanySOP): Boolean = + override fun sopCheck(s: BaseSOP): Boolean = !(s.ciLongitude == null || s.ciLongitude == BigDecimal(0) || s.ciLatitude == null || s.ciLatitude == BigDecimal(0)) } \ No newline at end of file -- Gitblit v1.9.3