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
daaa1594
authored
Feb 20, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
feat: 新增小程序RTC
parent
a849218e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletions
server-common/src/main/java/com/makeit/shengwang/agora/dto/PlatCallingDeviceDTO.java
server-module/src/main/java/com/makeit/module/controller/children/device/PlatDeviceChildrenController.java
server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
server-common/src/main/java/com/makeit/shengwang/agora/dto/PlatCallingDeviceDTO.java
View file @
daaa1594
...
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
...
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"呼叫设备
RTM"
,
description
=
"呼叫设备RTM
"
)
@ApiModel
(
value
=
"呼叫设备
"
,
description
=
"呼叫设备
"
)
public
class
PlatCallingDeviceDTO
{
public
class
PlatCallingDeviceDTO
{
private
String
id
;
private
String
id
;
...
...
server-module/src/main/java/com/makeit/module/controller/children/device/PlatDeviceChildrenController.java
View file @
daaa1594
...
@@ -8,7 +8,10 @@ import com.makeit.common.response.ApiResponseEntity;
...
@@ -8,7 +8,10 @@ import com.makeit.common.response.ApiResponseEntity;
import
com.makeit.common.response.ApiResponseUtils
;
import
com.makeit.common.response.ApiResponseUtils
;
import
com.makeit.dto.wechat.device.PlatChildDeviceDTO
;
import
com.makeit.dto.wechat.device.PlatChildDeviceDTO
;
import
com.makeit.dto.wechat.device.PlatDeviceSetupDTO
;
import
com.makeit.dto.wechat.device.PlatDeviceSetupDTO
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO
;
import
com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO
;
import
com.makeit.vo.platform.device.PlatChildDeviceListVO
;
import
com.makeit.vo.platform.device.PlatChildDeviceListVO
;
import
com.makeit.vo.platform.device.PlatDeviceViewVO
;
import
com.makeit.vo.platform.device.PlatDeviceViewVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -57,6 +60,12 @@ public class PlatDeviceChildrenController {
...
@@ -57,6 +60,12 @@ public class PlatDeviceChildrenController {
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
@ApiOperation
(
"设备呼叫设备RTC"
)
@PostMapping
(
"callingDevice"
)
@TenantIdIgnore
public
ApiResponseEntity
<
PlatAlarmCallDeviceVO
>
callingDevice
(
@RequestBody
PlatCallingDeviceDTO
dto
)
{
return
ApiResponseUtils
.
success
(
platDeviceService
.
callingDevice
(
dto
));
}
}
}
server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
View file @
daaa1594
...
@@ -18,10 +18,13 @@ import com.makeit.entity.platform.auth.PlatRole;
...
@@ -18,10 +18,13 @@ import com.makeit.entity.platform.auth.PlatRole;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.enums.HeaderConst
;
import
com.makeit.enums.HeaderConst
;
import
com.makeit.global.annotation.AuthIgnore
;
import
com.makeit.global.annotation.AuthIgnore
;
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.auth.PlatOrgService
;
import
com.makeit.service.platform.auth.PlatOrgService
;
import
com.makeit.service.platform.auth.PlatRoleService
;
import
com.makeit.service.platform.auth.PlatRoleService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO
;
import
com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO
;
import
com.makeit.utils.data.validate.CollectionUtils
;
import
com.makeit.utils.data.validate.CollectionUtils
;
import
com.makeit.utils.old.StringUtils
;
import
com.makeit.utils.old.StringUtils
;
import
com.makeit.utils.request.RequestUtil
;
import
com.makeit.utils.request.RequestUtil
;
...
@@ -122,5 +125,13 @@ public class PlatDeviceWechatController {
...
@@ -122,5 +125,13 @@ public class PlatDeviceWechatController {
platDeviceService
.
editDeviceNetInfo
(
dto
);
platDeviceService
.
editDeviceNetInfo
(
dto
);
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
@ApiOperation
(
"设备呼叫设备"
)
@PostMapping
(
"callingDevice"
)
@TenantIdIgnore
public
ApiResponseEntity
<
PlatAlarmCallDeviceVO
>
callingDevice
(
@RequestBody
PlatCallingDeviceDTO
dto
)
{
return
ApiResponseUtils
.
success
(
platDeviceService
.
callingDevice
(
dto
));
}
}
}
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