From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 17 一月 2025 16:15:43 +0800 Subject: [PATCH] 1. 修改融合数据逻辑中,融合数据id数组为先排序后转换为字符串,修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题; --- src/main/kotlin/com/flightfeather/uav/lightshare/service/ElectricityService.kt | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/ElectricityService.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/ElectricityService.kt index 4566dc8..67f30f2 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/ElectricityService.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/ElectricityService.kt @@ -2,8 +2,25 @@ import com.flightfeather.uav.domain.entity.ElectricMinuteValue import com.flightfeather.uav.lightshare.bean.BaseResponse +import com.flightfeather.uav.lightshare.bean.DataVo +import com.flightfeather.uav.lightshare.bean.ElectricDailyInfo +import com.flightfeather.uav.lightshare.bean.ElectricVo interface ElectricityService { fun getMinuteData(deviceCode: String, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<ElectricMinuteValue>> + + fun getMinuteData2(deviceCode: String, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<DataVo>> + + fun getByCompany(cId:String):BaseResponse<List<ElectricMinuteValue>> + + /** + * 鑾峰彇浼佷笟鐢ㄧ數閲忔暣鍚堟暟鎹� + */ + fun getElectricityInfo(cId: String, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<ElectricVo>> + + /** + * 浼佷笟鐢ㄧ數閲忔棩缁熻淇℃伅 + */ + fun dailyAnalysis(cId: String, startTime: String?, endTime: String?): BaseResponse<List<ElectricDailyInfo>> } \ No newline at end of file -- Gitblit v1.9.3