From 9cb8d7e0f4ffca386b14a15f8a0aca4d1db23252 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 30 十月 2025 15:58:45 +0800
Subject: [PATCH] 2025.10.30 新增单场景纵向统计接口
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserMapController.kt | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserMapController.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserMapController.kt
index 31e8f9d..7f8dfdd 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserMapController.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/web/UserMapController.kt
@@ -1,7 +1,9 @@
package cn.flightfeather.supervision.lightshare.web
+import cn.flightfeather.supervision.config.IgnoreResponseAdvice
import cn.flightfeather.supervision.lightshare.service.UserMapService
import cn.flightfeather.supervision.lightshare.vo.AreaVo
+import cn.flightfeather.supervision.lightshare.vo.DeviceMapVo
import io.swagger.annotations.Api
import io.swagger.annotations.ApiOperation
import io.swagger.annotations.ApiParam
@@ -12,10 +14,12 @@
@RequestMapping("/usermap")
class UserMapController(val userMapService: UserMapService) {
+ @IgnoreResponseAdvice
@ApiOperation(value = "鏍规嵁椋炵窘鐩戠绯荤粺涓殑鍦烘櫙id锛岃幏鍙栦笌椋炵窘鐜绯荤粺涓殑鍏宠仈鐢ㄦ埛")
@GetMapping
fun getTZId(@RequestParam sceneId: String) = userMapService.getTZIdBySceneId(sceneId)
+ @IgnoreResponseAdvice
@ApiOperation(value = "鏍规嵁椋炵窘鐜绯荤粺涓殑鐢ㄦ埛id锛岃幏鍙栦笌椋炵窘鐩戠绯荤粺涓殑鍏宠仈鐢ㄦ埛")
@GetMapping("/scene")
fun getSceneByTzId(@RequestParam tzUserId: String) = userMapService.getSceneByTZId(tzUserId)
@@ -29,5 +33,25 @@
perPage: Int?,
@ApiParam("鍖哄煙鏉′欢淇℃伅") @RequestBody
areaVo: AreaVo
- ) = resPack { userMapService.fetchDeviceMap(page, perPage, areaVo) }
+ ) = userMapService.fetchDeviceMap(page, perPage, areaVo)
+
+ @ApiOperation(value = "鏂板鎴栨洿鏂扮敤鎴风洃娴嬭澶囨槧灏勫叧绯�")
+ @PostMapping("/insertOrUpdate")
+ fun insertOrUpdate(
+ @ApiParam("鐢ㄦ埛鐩戞祴璁惧鏄犲皠鍏崇郴") @RequestBody
+ param: Pair<AreaVo, DeviceMapVo>,
+ ) = userMapService.insertOrUpdate(param)
+
+ @ApiOperation(value = "鎼滅储绗笁鏂硅澶�")
+ @PostMapping("/searchThirdPartyDevice")
+ fun searchThirdPartyDevice(
+ @ApiParam("鍖哄煙鏉′欢淇℃伅") @RequestBody
+ areaVo: AreaVo,
+ @ApiParam("鎼滅储鍏抽敭瀛楋紝鍖归厤璁惧鍚�") @RequestParam
+ keyword: String,
+ @ApiParam("鏌ヨ椤电爜", defaultValue = "1", required = false) @RequestParam("page", required = false)
+ page: Int?,
+ @ApiParam("鍗曢〉鏁版嵁閲�", defaultValue = "30", required = false) @RequestParam("per_page", required = false)
+ perPage: Int?,
+ ) = userMapService.searchThirdPartyDevice(areaVo, keyword, page, perPage)
}
\ No newline at end of file
--
Gitblit v1.9.3