From eb3dd00b0b7fcda477229d518d250f9c842b790b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 21 十月 2025 17:45:44 +0800
Subject: [PATCH] 2025.10.21 1. 走航季度报告相关数据计算逻辑调整
---
src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 292 insertions(+), 8 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt
index 0d933f4..39e9f5e 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/service/impl/ElectricityServiceImpl.kt
@@ -1,20 +1,23 @@
package com.flightfeather.uav.lightshare.service.impl
import com.flightfeather.uav.common.utils.DateUtil
+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
import com.flightfeather.uav.domain.mapper.CompanyDeviceMapper
import com.flightfeather.uav.domain.mapper.ElectricMinuteValueMapper
-import com.flightfeather.uav.lightshare.bean.BaseResponse
-import com.flightfeather.uav.lightshare.bean.DataHead
-import com.flightfeather.uav.lightshare.bean.DataVo
+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.stereotype.Service
import tk.mybatis.mapper.entity.Example
import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
@Service
class ElectricityServiceImpl(
@@ -22,11 +25,10 @@
) : ElectricityService {
private var dateFormatter = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+ private var dateFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+ private var dateFormatter3 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
- override fun getMinuteData(
- deviceCode: String, startTime: String?,
- endTime: String?, page: Int?, perPage: Int?
- ): BaseResponse<List<ElectricMinuteValue>> {
+ override fun getMinuteData(deviceCode: String, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<ElectricMinuteValue>> {
val perP = perPage ?: 60
val p = page ?: 1
val sTime = startTime?.let { dateFormatter.parse(it) }
@@ -86,4 +88,286 @@
return BaseResponse(true, data = result)
}
+
+ override fun getElectricityInfo(cId: String, startTime: String?, endTime: String?, page: Int?, perPage: Int?): BaseResponse<List<ElectricVo>> {
+ val perP = perPage ?: 60
+ val p = page ?: 1
+ val sTime = startTime?.let { dateFormatter.parse(it) }
+ val eTime = endTime?.let { dateFormatter.parse(it) }
+ val result = mutableListOf<ElectricVo>()
+ val deviceCodeList = companyDeviceMapper.selectByExample(Example(CompanyDevice::class.java).apply {
+ createCriteria().andEqualTo("cdCompanyId", cId)
+ })
+ //浜х嚎椋庢満
+ var d1: CompanyDevice? = null
+ //搴熸皵鍑�鍖栬缃�
+ var d2: CompanyDevice? = null
+
+ deviceCodeList.forEach {
+ if (it?.cdType == ElectricityType.ProductionLine.value) {
+ d1 = it
+ }else if (it?.cdType == ElectricityType.Purify.value) {
+ d2 = it
+ }
+ }
+
+ var pageInfo = PageHelper.startPage<ElectricMinuteValue>(p, perP)
+ val dataList1 = electricMinuteValueMapper.selectByExample(Example(ElectricMinuteValue::class.java).apply {
+ createCriteria().andEqualTo("mvStatCode", d1?.cdDeviceCode)
+ .apply {
+ sTime?.let { andGreaterThanOrEqualTo("mvDataTime", it) }
+ eTime?.let { andLessThanOrEqualTo("mvDataTime", it) }
+ }
+ orderBy("mvDataTime").apply {
+ // 褰撹姹傛帴鍙ｄ笉浼犻�掕捣濮嬫椂闂达紝榛樿鑾峰彇鏈�鏂扮殑鏁版嵁
+ if (startTime == null && endTime == null) {
+ desc()
+ }
+ }
+ })
+ if (startTime == null && endTime == null) {
+ dataList1.reverse()
+ }
+ 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 {
+ andGreaterThanOrEqualTo("mvDataTime", sTime ?: dataList1[0].mvDataTime)
+ eTime?.let { andLessThanOrEqualTo("mvDataTime", it) }
+ }
+ orderBy("mvDataTime").apply {
+ // 褰撹姹傛帴鍙ｄ笉浼犻�掕捣濮嬫椂闂达紝榛樿鑾峰彇鏈�鏂扮殑鏁版嵁
+ if (startTime == null && endTime == null) {
+ desc()
+ }
+ }
+ })
+ if (startTime == null && endTime == null) {
+ dataList2.reverse()
+ }
+
+ // FIXME: 2021/11/5 杩斿洖缁撴灉闇�瑕佹牴鎹袱鍙拌澶囩殑鏁版嵁濮嬫湯鏃堕棿锛岄�夊彇鏈�闀跨殑涓や釜濮嬫湯鏃堕棿
+ val sT = if (dataList1.isEmpty() && dataList2.isNotEmpty()) {
+ dataList2[0]?.mvDataTime
+ }else if (dataList1.isNotEmpty() && dataList2.isEmpty()) {
+ dataList1[0]?.mvDataTime
+ } else if (dataList1.isNotEmpty() && dataList2.isNotEmpty()) {
+ if (dataList1[0]?.mvDataTime?.after(dataList2[0]?.mvDataTime) == true) {
+ dataList2[0]?.mvDataTime
+ } else {
+ dataList1[0]?.mvDataTime
+ }
+ } else {
+ null
+ }
+ val eT = if (dataList1.isEmpty() && dataList2.isNotEmpty()) {
+ dataList2.last()?.mvDataTime
+ }else if (dataList1.isNotEmpty() && dataList2.isEmpty()) {
+ dataList1.last()?.mvDataTime
+ } else if (dataList1.isNotEmpty() && dataList2.isNotEmpty()) {
+ if (dataList1.last()?.mvDataTime?.after(dataList2.last()?.mvDataTime) == true) {
+ dataList1.last()?.mvDataTime
+ } else {
+ dataList2.last()?.mvDataTime
+ }
+ } else {
+ null
+ }
+
+ if (sT == null || eT == null) {
+ return BaseResponse(true, data = result)
+ }
+
+ var lsT = LocalDateTime.ofInstant(sT.toInstant(), ZoneId.systemDefault()).withSecond(0)
+ val leT = LocalDateTime.ofInstant(eT.toInstant(), ZoneId.systemDefault()).withSecond(0)
+
+ // 鏍规嵁涓ゅ彴璁惧鐨勬渶闀胯捣濮嬫椂闂达紝璁＄畻鍏朵腑姣忎竴鍒嗛挓鐨勫搴斿潎鍊�
+ while (!lsT.isAfter(leT)) {
+ // FIXME: 2021/11/22 姝ゅ鐢变簬鍓嶇璁惧鐨勯噰鏍锋椂闂翠笉鏍囧噯 锛岄噰鏍峰懆鏈熷苟涓嶆槸涓ユ牸鐨�1鍒嗛挓锛屽鑷撮噰鏍锋椂闂存湁鏃朵細缂哄皯1鍒嗛挓鐨勬暟鎹�
+ // FIXME: 2021/11/22 鍥犳锛屽綋鏌愪竴鍒嗛挓璇ヨ澶囨暟鎹疆绌烘椂锛岄噰鐢ㄥ墠涓�涓暟鎹綔涓哄～鍏�
+ 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
+ d1eB = it.d1eB
+ d1eC = it.d1eC
+ d1Status = it.d1Status
+ d1StatusName = it.d1StatusName
+ d1Avg = it.d1Avg
+ }
+ }
+ } 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
+ d2eB = it.d2eB
+ d2eC = it.d2eC
+ d2Status = it.d2Status
+ d2StatusName = it.d2StatusName
+ d2Avg = it.d2Avg
+ }
+ }
+ } else {
+ vo.apply {
+ 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)
+ }
+// 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)
+ }
+
+ return BaseResponse(true, head = DataHead(pageInfo.pageNum, pageInfo.pages), data = result)
+ }
+
+ override fun dailyAnalysis(cId: String, startTime: String?, endTime: String?): BaseResponse<List<ElectricDailyInfo>> {
+ // 鏍规嵁浼佷笟id鑾峰彇瀵瑰簲璁惧
+ val devices = companyDeviceMapper.selectByExample(Example(CompanyDevice::class.java).apply {
+ createCriteria().andEqualTo("cdCompanyId", cId)
+ })
+ val deviceCodeList = mutableListOf<String>()
+ devices.forEach { it?.let { deviceCodeList.add(it.cdDeviceCode) }}
+
+ val st:LocalDateTime
+ val et:LocalDateTime
+ // 褰撴病鏈夊紑濮嬫垨缁撴潫鏃堕棿鏃讹紝浣跨敤鏈�鏂颁竴鏉℃暟鎹椂闂寸殑褰撳ぉ浣滀负缁熻鏃堕棿
+ if (startTime == null || endTime == null) {
+ val em = electricMinuteValueMapper.selectOneByExample(Example(ElectricMinuteValue::class.java).apply {
+ createCriteria().andIn("mvStatCode", deviceCodeList)
+ orderBy("mvDataTime").desc()
+ })
+ val dataTime = LocalDateTime.ofInstant(em?.mvDataTime?.toInstant(), ZoneId.systemDefault())
+ st = dataTime.withHour(0).withMinute(0).withSecond(0)
+ et = dataTime.withHour(23).withMinute(59).withSecond(59)
+ }
+ // 褰撴湁寮�濮嬬粨鏉熸椂闂存椂锛屽垽鏂牸寮忔槸鍚︽纭�
+ else {
+ try {
+ st = LocalDateTime.parse("$startTime 00:00:00", dateFormatter3)
+ et = LocalDateTime.parse("$endTime 23:59:59", dateFormatter3)
+ } catch (e: DateTimeParseException) {
+ return BaseResponse(false, "鏃堕棿鏍煎紡閿欒锛屽簲涓簓yyy-MM-dd")
+ }
+ }
+
+ val dataList = electricMinuteValueMapper.selectByExample(Example(ElectricMinuteValue::class.java).apply {
+ createCriteria().andIn("mvStatCode", deviceCodeList)
+ .andBetween("mvDataTime", st, et)
+ orderBy("mvDataTime")
+ })
+ val result = ElectricDailyAnalysis.analysis(devices, dataList)
+
+ return BaseResponse(true, data = result)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3