Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1dfd429a
authored
Nov 29, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:saas端RTM接口
parent
d1daa9d0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
View file @
1dfd429a
...
@@ -14,8 +14,11 @@ import com.makeit.entity.platform.device.PlatDevice;
...
@@ -14,8 +14,11 @@ import com.makeit.entity.platform.device.PlatDevice;
import
com.makeit.global.annotation.AuthIgnore
;
import
com.makeit.global.annotation.AuthIgnore
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.module.iot.vo.DeviceProperties
;
import
com.makeit.module.iot.vo.DeviceProperties
;
import
com.makeit.service.platform.alarm.PlatAlarmRecordService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.saas.SaasOperationLogService
;
import
com.makeit.service.saas.SaasOperationLogService
;
import
com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO
;
import
com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO
;
import
com.makeit.vo.platform.device.PlatDeviceListVO
;
import
com.makeit.vo.platform.device.PlatDeviceListVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -33,6 +36,8 @@ public class SaasDeviceController {
...
@@ -33,6 +36,8 @@ public class SaasDeviceController {
private
PlatDeviceService
platDeviceService
;
private
PlatDeviceService
platDeviceService
;
@Autowired
@Autowired
private
SaasOperationLogService
saasOperationLogService
;
private
SaasOperationLogService
saasOperationLogService
;
@Autowired
private
PlatAlarmRecordService
platAlarmRecordService
;
@ApiOperation
(
"列表"
)
@ApiOperation
(
"列表"
)
@PostMapping
(
"page"
)
@PostMapping
(
"page"
)
...
@@ -90,6 +95,13 @@ public class SaasDeviceController {
...
@@ -90,6 +95,13 @@ public class SaasDeviceController {
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
@ApiOperation
(
"呼叫设备rtm"
)
@PostMapping
(
"callingDeviceAuthRtm"
)
@TenantIdIgnore
public
ApiResponseEntity
<
PlatAlarmCallDeviceVO
>
callingDeviceAuthRtm
(
@RequestBody
PlatCallingDeviceDTO
dto
)
{
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
callingDeviceAuthIgnoreRtm
(
dto
));
}
@ApiOperation
(
"激活设备license"
)
@ApiOperation
(
"激活设备license"
)
@PostMapping
(
"active"
)
@PostMapping
(
"active"
)
@TenantIdIgnore
@TenantIdIgnore
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment