2025.10.16 1. 根据全局响应增强器GlobalResponseAdvice，将原先的BaseResPack接口包装函数统一去除； 2. 新...

feiyu02

2025-10-16 1a677d2b4a4bc615602f8c2a22bc07ec1356e5be

 src/main/kotlin/cn/flightfeather/supervision/lightshare/web/DeviceController.kt

@@ -20,21 +20,21 @@
    fun fetchDevice(
        @ApiParam("场景id") @RequestParam sceneId: String,
        @ApiParam("设备类型id") @RequestParam deviceTypeId: Byte,
    ) = resPack { deviceService.findDevices(sceneId, Constant.DeviceType.fromValue(deviceTypeId)) }
    ) = deviceService.findDevices(sceneId, Constant.DeviceType.fromValue(deviceTypeId))

    @ApiOperation("新增场景设备信息")
    @PutMapping("/upload")
    fun uploadDevice(
        @ApiParam("设备信息") @RequestBody deviceInfo: String,
        @ApiParam("设备类型id") @RequestParam deviceTypeId: Byte,
    ) = resPack { deviceService.insertDevice(deviceInfo, Constant.DeviceType.fromValue(deviceTypeId)) }
    ) = deviceService.insertDevice(deviceInfo, Constant.DeviceType.fromValue(deviceTypeId))

    @ApiOperation("更新场景设备信息")
    @PostMapping("/update")
    fun updateDevice(
        @ApiParam("设备信息") @RequestBody deviceInfo: String,
        @ApiParam("设备类型id") @RequestParam deviceTypeId: Byte,
    ) = resPack { deviceService.updateDevice(deviceInfo, Constant.DeviceType.fromValue(deviceTypeId)) }
    ) = deviceService.updateDevice(deviceInfo, Constant.DeviceType.fromValue(deviceTypeId))

    @ApiOperation("获取场景设备位置变更信息")
    @GetMapping("/status")
@@ -42,14 +42,14 @@
        @ApiParam("场景id") @RequestParam(required = false) sceneId: String?,
        @ApiParam("设备id") @RequestParam deviceId: Int,
        @ApiParam("设备类型id") @RequestParam deviceTypeId: Byte,
    ) = resPack { deviceService.findDeviceLocations(sceneId, deviceId, Constant.DeviceType.fromValue(deviceTypeId)) }
    ) = deviceService.findDeviceLocations(sceneId, deviceId, Constant.DeviceType.fromValue(deviceTypeId))

    @ApiOperation("新增场景设备位置变更信息")
    @PostMapping("/status/upload")
    fun uploadDeviceLocation(
        @ApiParam("设备位置信息json") @RequestParam("status") status: String,
        @ApiParam("设备图片") @RequestPart("images") images: Array<MultipartFile>,
    ) = resPack { deviceService.insertDeviceLocation(status, images) }
    ) = deviceService.insertDeviceLocation(status, images)

    @ApiOperation("更新场景设备位置变更信息")
    @PostMapping("/status/update")
@@ -57,7 +57,7 @@
        @ApiParam("设备位置信息json") @RequestParam("status") status: String,
        @ApiParam("删除的设备图片路径") @RequestParam("deleteImg") deleteImg: List<String>,
        @ApiParam("设备图片") @RequestPart("images") images: Array<MultipartFile>,
    ) = resPack { deviceService.updateDeviceLocation(status, deleteImg, images) }
    ) = deviceService.updateDeviceLocation(status, deleteImg, images)

    @ApiOperation("查询从外部获取的设备信息")
    @PostMapping("/external/search")
@@ -70,5 +70,5 @@
        page: Int?,
        @ApiParam("单页数据量", defaultValue = "30", required = false) @RequestParam("per_page", required = false)
        perPage: Int?,
    ) = resPack { deviceService.searchExternalDevice(areaVo, keyword, page, perPage) }
    ) = deviceService.searchExternalDevice(areaVo, keyword, page, perPage)
}