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/UserMapServiceImpl.kt | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserMapServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserMapServiceImpl.kt
index 764f171..234838d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserMapServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/UserMapServiceImpl.kt
@@ -48,12 +48,13 @@
return userMapRep.findFromSupervision(tzUserId)
}
- override fun autoCreateMap() {
+ override fun autoCreateMap(userList: List<Userinfo?>) {
// 閫夋嫨闇�瑕佸鐞嗙殑璐︽埛
- val userList = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply {
- createCriteria().andEqualTo("remark", "寰愭眹鍖�")
- })
+// val userList = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply {
+// createCriteria().andEqualTo("remark", "寰愭眹鍖�")
+// })
userList.forEach {
+ it ?: return@forEach
// 鏌ユ壘鏄惁宸茬粡鏈夎处鎴峰尮閰嶈褰�
val records = userMapMapper.selectByExample(Example(UserMap::class.java).apply {
createCriteria().andEqualTo("svUserId", it.guid)
@@ -72,6 +73,7 @@
tzUserName = tzU.realname
svUserId = it.guid
svUserName = it.realname
+ umCreateTime = Date()
})
}
}
@@ -94,7 +96,7 @@
}
}
- override fun fetchDeviceMap(areaVo: AreaVo): List<DeviceMapVo?> {
+ override fun fetchDeviceMap(page: Int?, perPage: Int?, areaVo: AreaVo): List<DeviceMapVo?> {
// 1.閫氳繃鍖哄煙鏉′欢鑾峰彇涓讳綋鐢ㄦ埛
val userIdList = when (areaVo.sourceType) {
//浠ラ缇界幆澧冪郴缁熶腑鐨勭敤鎴蜂负涓讳綋
@@ -105,7 +107,7 @@
//浠ラ缇界洃绠＄郴缁熶腑鐨勭敤鎴蜂负涓讳綋
2 -> {
val task = taskRep.findOneTask(areaVo) ?: throw BizException("褰撳墠鏌ヨ鏉′欢涓嬫湭鎵惧埌瀵瑰簲椤跺眰浠诲姟")
- val scenes = sceneRep.findScene(task.tguid!!, areaVo.scensetypeid?.toInt(), areaVo.towncode)
+ val scenes = sceneRep.findSceneList(task.tguid!!, areaVo.scensetypeid?.toInt(), areaVo.towncode)
.map { it?.guid }
userInfoSVRep.findUser(scenes).map { it?.guid }
}
--
Gitblit v1.9.3