2025.9.30 1. 新增走航任务统计功能

feiyu02

2025-09-30 94fee0b511279679b43e210878d3d36e5a14384b

 src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt

@@ -1,7 +1,7 @@
package com.flightfeather.uav.lightshare.service.impl

import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.dataprocess.ElectricDailyAnalysis
import com.flightfeather.uav.biz.dataprocess.ElectricDailyAnalysis
import com.flightfeather.uav.domain.entity.CompanyDevice
import com.flightfeather.uav.domain.entity.ElectricMinuteValue
import com.flightfeather.uav.domain.entity.toAirData
@@ -10,18 +10,14 @@
import com.flightfeather.uav.lightshare.bean.*
import com.flightfeather.uav.lightshare.eunm.ElectricityType
import com.flightfeather.uav.lightshare.service.ElectricityService
import com.flightfeather.uav.socket.bean.AirData
import com.github.pagehelper.PageHelper
import org.springframework.format.annotation.DateTimeFormat
import org.springframework.stereotype.Service
import tk.mybatis.mapper.entity.Example
import java.text.SimpleDateFormat
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.format.DateTimeFormatter
import java.time.format.DateTimeParseException
import kotlin.math.round

@Service
class ElectricityServiceImpl(
@@ -132,11 +128,13 @@
        if (startTime == null && endTime == null) {
            dataList1.reverse()
        }
        pageInfo = PageHelper.startPage<ElectricMinuteValue>(p, perP)
        if (dataList1.isEmpty()) return BaseResponse(true, data = result)

//        pageInfo = PageHelper.startPage<ElectricMinuteValue>(p, perP)
        val dataList2 = electricMinuteValueMapper.selectByExample(Example(ElectricMinuteValue::class.java).apply {
            createCriteria().andEqualTo("mvStatCode", d2?.cdDeviceCode)
                .apply {
                    sTime?.let { andGreaterThanOrEqualTo("mvDataTime", it) }
                    andGreaterThanOrEqualTo("mvDataTime", sTime ?: dataList1[0].mvDataTime)
                    eTime?.let { andLessThanOrEqualTo("mvDataTime", it) }
                }
            orderBy("mvDataTime").apply {
@@ -187,26 +185,20 @@

        // 根据两台设备的最长起始时间，计算其中每一分钟的对应均值
        while (!lsT.isAfter(leT)) {
            // 两台设备的数据根据时间合并为一个结构体
            val vo = ElectricVo(lsT.format(dateFormatter2))

            // FIXME: 2021/11/22 此处由于前端设备的采样时间不标准 ，采样周期并不是严格的1分钟，导致采样时间有时会缺少1分钟的数据
            // FIXME: 2021/11/22 因此，当某一分钟该设备数据轮空时，采用前一个数据作为填充
            if (dataList1.isNotEmpty()) {
                val d = dataList1[0]
                val t = LocalDateTime.ofInstant(d?.mvDataTime?.toInstant(), ZoneId.systemDefault()).withSecond(0)
                if (lsT.isEqual(t)) {
                    vo.apply {
                        d1eA = d?.mvElectricityA ?: .0
                        d1eB = d?.mvElectricityB ?: .0
                        d1eC = d?.mvElectricityC ?: .0
                        val s = ElectricDailyAnalysis.getStatus(d, d1)
                        d1Status = s.first
                        d1StatusName = s.second
                        d1Avg = s.third
                    }
                    dataList1.removeAt(0)
                } else {
            val data1 = if (dataList1.isNotEmpty()) dataList1[0] else null
            val t1 = data1?.let {  LocalDateTime.ofInstant(it.mvDataTime?.toInstant(), ZoneId.systemDefault()).withSecond(0) }
            val data2 = if (dataList2.isNotEmpty()) dataList2[0] else null
            val t2 = data2?.let { LocalDateTime.ofInstant(it.mvDataTime?.toInstant(), ZoneId.systemDefault()).withSecond(0) }
            if ((data1 == null || !lsT.isEqual(t1))
                && (data2 == null || !lsT.isEqual(t2))
            ) {

            } else {
                // 两台设备的数据根据时间合并为一个结构体
                val vo = ElectricVo(lsT.format(dateFormatter2))
                if (data1 == null || !lsT.isEqual(t1)) {
                    result.lastOrNull()?.let {
                        vo.apply {
                            d1eA = it.d1eA
@@ -217,34 +209,20 @@
                            d1Avg = it.d1Avg
                        }
                    }
                }
            } else {
                result.lastOrNull()?.let {
                    vo.apply {
                        d1eA = it.d1eA
                        d1eB = it.d1eB
                        d1eC = it.d1eC
                        d1Status = it.d1Status
                        d1StatusName = it.d1StatusName
                        d1Avg = it.d1Avg
                    }
                }
            }
            if (dataList2.isNotEmpty()) {
                val d = dataList2[0]
                val t = LocalDateTime.ofInstant(d?.mvDataTime?.toInstant(), ZoneId.systemDefault()).withSecond(0)
                if (lsT.isEqual(t)) {
                    vo.apply {
                        d2eA = d?.mvElectricityA ?: .0
                        d2eB = d?.mvElectricityB ?: .0
                        d2eC = d?.mvElectricityC ?: .0
                        val s = ElectricDailyAnalysis.getStatus(d, d2)
                        d2Status = s.first
                        d2StatusName = s.second
                        d2Avg = s.third
                    }
                    dataList2.removeAt(0)
                } else {
                    vo.apply {
                        d1eA = data1.mvElectricityA ?: .0
                        d1eB = data1.mvElectricityB ?: .0
                        d1eC = data1.mvElectricityC ?: .0
                        val s = ElectricDailyAnalysis.getStatus(data1, d1)
                        d1Status = s.first
                        d1StatusName = s.second
                        d1Avg = s.third
                    }
                    dataList1.removeAt(0)
                }

                if (data2 == null || !lsT.isEqual(t2)) {
                    result.lastOrNull()?.let {
                        vo.apply {
                            d2eA = it.d2eA
@@ -255,20 +233,97 @@
                            d2Avg = it.d2Avg
                        }
                    }
                }
            } else {
                result.lastOrNull()?.let {
                } else {
                    vo.apply {
                        d2eA = it.d2eA
                        d2eB = it.d2eB
                        d2eC = it.d2eC
                        d2Status = it.d2Status
                        d2StatusName = it.d2StatusName
                        d2Avg = it.d2Avg
                        d2eA = data2.mvElectricityA ?: .0
                        d2eB = data2.mvElectricityB ?: .0
                        d2eC = data2.mvElectricityC ?: .0
                        val s = ElectricDailyAnalysis.getStatus(data2, d2)
                        d2Status = s.first
                        d2StatusName = s.second
                        d2Avg = s.third
                    }
                    dataList2.removeAt(0)
                }

                result.add(vo)
            }
            result.add(vo)
//            if (dataList1.isNotEmpty()) {
//                val d = dataList1[0]
//                val t = LocalDateTime.ofInstant(d?.mvDataTime?.toInstant(), ZoneId.systemDefault()).withSecond(0)
//                if (lsT.isEqual(t)) {
//                    vo.apply {
//                        d1eA = d?.mvElectricityA ?: .0
//                        d1eB = d?.mvElectricityB ?: .0
//                        d1eC = d?.mvElectricityC ?: .0
//                        val s = ElectricDailyAnalysis.getStatus(d, d1)
//                        d1Status = s.first
//                        d1StatusName = s.second
//                        d1Avg = s.third
//                    }
//                    dataList1.removeAt(0)
//                } else {
//                    result.lastOrNull()?.let {
//                        vo.apply {
//                            d1eA = it.d1eA
//                            d1eB = it.d1eB
//                            d1eC = it.d1eC
//                            d1Status = it.d1Status
//                            d1StatusName = it.d1StatusName
//                            d1Avg = it.d1Avg
//                        }
//                    }
//                }
//            } else {
//                result.lastOrNull()?.let {
//                    vo.apply {
//                        d1eA = it.d1eA
//                        d1eB = it.d1eB
//                        d1eC = it.d1eC
//                        d1Status = it.d1Status
//                        d1StatusName = it.d1StatusName
//                        d1Avg = it.d1Avg
//                    }
//                }
//            }
//            if (dataList2.isNotEmpty()) {
//                val d = dataList2[0]
//                val t = LocalDateTime.ofInstant(d?.mvDataTime?.toInstant(), ZoneId.systemDefault()).withSecond(0)
//                if (lsT.isEqual(t)) {
//                    vo.apply {
//                        d2eA = d?.mvElectricityA ?: .0
//                        d2eB = d?.mvElectricityB ?: .0
//                        d2eC = d?.mvElectricityC ?: .0
//                        val s = ElectricDailyAnalysis.getStatus(d, d2)
//                        d2Status = s.first
//                        d2StatusName = s.second
//                        d2Avg = s.third
//                    }
//                    dataList2.removeAt(0)
//                } else {
//                    result.lastOrNull()?.let {
//                        vo.apply {
//                            d2eA = it.d2eA
//                            d2eB = it.d2eB
//                            d2eC = it.d2eC
//                            d2Status = it.d2Status
//                            d2StatusName = it.d2StatusName
//                            d2Avg = it.d2Avg
//                        }
//                    }
//                }
//            } else {
//                result.lastOrNull()?.let {
//                    vo.apply {
//                        d2eA = it.d2eA
//                        d2eB = it.d2eB
//                        d2eC = it.d2eC
//                        d2Status = it.d2Status
//                        d2StatusName = it.d2StatusName
//                        d2Avg = it.d2Avg
//                    }
//                }
//            }

            lsT = lsT.plusMinutes(1)
        }
@@ -299,10 +354,10 @@
        // 当有开始结束时间时，判断格式是否正确
        else {
            try {
                st = LocalDateTime.parse(startTime, dateFormatter3).withHour(0).withMinute(0).withSecond(0)
                et = LocalDateTime.parse(endTime, dateFormatter3).withHour(23).withMinute(59).withSecond(59)
                st = LocalDateTime.parse("$startTime 00:00:00", dateFormatter3)
                et = LocalDateTime.parse("$endTime 23:59:59", dateFormatter3)
            } catch (e: DateTimeParseException) {
                return BaseResponse(false, "时间格式错误，应为yyyy-MM-dd hh:mm:dd")
                return BaseResponse(false, "时间格式错误，应为yyyy-MM-dd")
            }
        }