From 7d74f3fd087d4a8192ed556a6c2e3a2ea3c81cff Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 三月 2025 17:43:48 +0800
Subject: [PATCH] 1. 新增扬尘监测数据上传功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt
index 48c72fe..77b2a75 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/MonitorobjectversionServiceImpl.kt
@@ -1,5 +1,6 @@
package cn.flightfeather.supervision.lightshare.service.impl
+import cn.flightfeather.supervision.common.utils.UUIDGenerator
import cn.flightfeather.supervision.domain.ds1.entity.Monitorobjectversion
import cn.flightfeather.supervision.domain.ds1.entity.Scense
import cn.flightfeather.supervision.domain.ds1.mapper.MonitorobjectversionMapper
@@ -38,7 +39,8 @@
val monitorobjectversionlist = monitorobjectversionMapper.select(monitorobjectversion)
return monitorobjectversionlist.filter {
- val usedCount = it.extension1 ?: "0";it.monitornum.toString().toInt() - usedCount.toInt() > 0
+ val usedCount = it.extension1 ?: "0"
+ it.monitornum.toString().toInt() - usedCount.toInt() > 0
}.sortedBy { it.displayid }
}
@@ -46,6 +48,7 @@
@Transactional
override fun saveList(monitorobjectversionlist: List<Monitorobjectversion>): Int {
monitorobjectversionlist.forEach {
+ if (it.movid == null) it.movid = UUIDGenerator.generate16ShortUUID()
monitorobjectversionMapper.insert(it)
}
return monitorobjectversionlist.size
@@ -73,6 +76,7 @@
if (vo.sguid == scene.guid) {
vo.sceneTypeId = scene.typeid?.toInt() ?: 0
vo.sceneType = scene.type
+ vo.scene = scene
return@f
}
}
--
Gitblit v1.9.3