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/bean/ElectricDailyInfo.kt | 3 +-- 1 files changed, 1 insertions(+), 2 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 665551a..9bef607 100644 --- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt +++ b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricDailyInfo.kt @@ -1,7 +1,6 @@ package com.flightfeather.uav.lightshare.bean import com.flightfeather.uav.common.utils.DateUtil -import com.flightfeather.uav.dataprocess.ElectricDailyAnalysis import com.flightfeather.uav.domain.entity.CompanyDevice import com.flightfeather.uav.domain.entity.ElectricMinuteValue import com.flightfeather.uav.lightshare.eunm.ElectricityStatus @@ -200,8 +199,8 @@ fun getResult() { // 鐢ㄧ數閲� plPower = round(plPower * 100) / 100 - pfPower = round(pfPower * 100) / 100 + pfPower = round(pfPower * 100) / 100 // 寮�鍏虫椂闂存牸寮忓寲 plRTimeStr = DateUtil.instance.dateToString(plRTime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS) plETimeStr = DateUtil.instance.dateToString(plETime, DateUtil.DateStyle.YYYY_MM_DD_HH_MM_SS) -- Gitblit v1.9.3