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
cac7f300
authored
Nov 17, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:生网api
parent
f84148b3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
1 deletions
server-module/src/main/java/com/makeit/module/controller/alarm/PlatAlarmRecordController.java
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-module/src/main/java/com/makeit/module/controller/alarm/PlatAlarmRecordController.java
View file @
cac7f300
...
@@ -77,6 +77,20 @@ public class PlatAlarmRecordController {
...
@@ -77,6 +77,20 @@ public class PlatAlarmRecordController {
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
callingDevice
());
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
callingDevice
());
}
}
@ApiOperation
(
"呼叫设备rtm"
)
@PostMapping
(
"callingDeviceAuthRtm"
)
@AuthIgnore
public
ApiResponseEntity
<
PlatAlarmCallDeviceVO
>
callingDeviceAuthRtm
(
@RequestBody
BaseIdDTO
baseIdDTO
)
{
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
callingDeviceAuthIgnoreRtm
(
baseIdDTO
.
getId
()));
}
@ApiOperation
(
"呼叫设备rtm"
)
@PostMapping
(
"callingDeviceAuthIgnoreRtm"
)
@AuthIgnore
public
ApiResponseEntity
<
PlatAlarmCallDeviceVO
>
callingDeviceAuthIgnoreRtm
(
@RequestBody
BaseIdDTO
baseIdDTO
)
{
return
ApiResponseUtils
.
success
(
platAlarmRecordService
.
callingDeviceAuthIgnoreRtm
(
baseIdDTO
.
getId
()));
}
// @Autowired
// @Autowired
// private MailMsgSender mailMsgSender;
// private MailMsgSender mailMsgSender;
// @Autowired
// @Autowired
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
View file @
cac7f300
...
@@ -70,4 +70,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
...
@@ -70,4 +70,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
void
misinformation
(
String
id
);
void
misinformation
(
String
id
);
PlatAlarmCallDeviceVO
callingDevice
();
PlatAlarmCallDeviceVO
callingDevice
();
PlatAlarmCallDeviceVO
callingDeviceAuthIgnoreRtm
(
String
id
);
}
}
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
cac7f300
...
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Maps
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.entity.BaseBusEntity
;
import
com.makeit.common.entity.BaseBusEntity
;
import
com.makeit.common.entity.BaseEntity
;
import
com.makeit.common.entity.BaseEntity
;
...
@@ -43,6 +42,7 @@ import com.makeit.service.platform.space.PlatRoomBedDeviceService;
...
@@ -43,6 +42,7 @@ import com.makeit.service.platform.space.PlatRoomBedDeviceService;
import
com.makeit.service.platform.space.PlatRoomService
;
import
com.makeit.service.platform.space.PlatRoomService
;
import
com.makeit.service.saas.PlatTenantService
;
import
com.makeit.service.saas.PlatTenantService
;
import
com.makeit.shengwang.agora.media.RtcTokenBuilder2
;
import
com.makeit.shengwang.agora.media.RtcTokenBuilder2
;
import
com.makeit.shengwang.agora.rtm.RtmTokenBuilder2
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.PageUtil
;
import
com.makeit.utils.data.convert.PageUtil
;
import
com.makeit.utils.data.convert.StreamUtil
;
import
com.makeit.utils.data.convert.StreamUtil
;
...
@@ -587,4 +587,18 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -587,4 +587,18 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
platAlarmCallDeviceVO
.
setChannelName
(
format
);
platAlarmCallDeviceVO
.
setChannelName
(
format
);
return
platAlarmCallDeviceVO
;
return
platAlarmCallDeviceVO
;
}
}
@Override
public
PlatAlarmCallDeviceVO
callingDeviceAuthIgnoreRtm
(
String
id
)
{
RtmTokenBuilder2
token
=
new
RtmTokenBuilder2
();
String
result
=
token
.
buildToken
(
shengwangProperties
.
getAppId
(),
shengwangProperties
.
getAppCertificate
(),
id
,
shengwangProperties
.
getTokenExpirationInSeconds
());
PlatAlarmCallDeviceVO
platAlarmCallDeviceVO
=
new
PlatAlarmCallDeviceVO
();
platAlarmCallDeviceVO
.
setAccessToken
(
result
);
LocalDateTime
now
=
LocalDateTime
.
now
();
DateTimeFormatter
dateTimeFormatter
=
DateTimeFormatter
.
ofPattern
(
"yyyyMMddHHmmss"
);
String
format
=
now
.
format
(
dateTimeFormatter
);
platAlarmCallDeviceVO
.
setAccessToken
(
result
);
platAlarmCallDeviceVO
.
setChannelName
(
format
);
return
platAlarmCallDeviceVO
;
}
}
}
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