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
74510edc
authored
Jan 25, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: null
parent
0b520e0e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
View file @
74510edc
...
@@ -101,7 +101,7 @@ public class FallAlarm implements IAlarm {
...
@@ -101,7 +101,7 @@ public class FallAlarm implements IAlarm {
// 跌倒了设备需要发送告警到第三方平台
// 跌倒了设备需要发送告警到第三方平台
PlatTenant
platTenant
=
platTenantService
.
getById
(
platDevice
.
getTenantId
());
PlatTenant
platTenant
=
platTenantService
.
getById
(
platDevice
.
getTenantId
());
if
(
platTenant
!=
null
)
{
if
(
platTenant
!=
null
&&
StringUtils
.
isNotBlank
(
platTenant
.
getCode
())
)
{
if
(
isSupportAlarm
(
platTenant
,
platDevice
))
{
if
(
isSupportAlarm
(
platTenant
,
platDevice
))
{
OpenApiBaseStrategy
strategyFactoryHandler
=
openApiBaseStrategyFactory
.
getHandler
(
platTenant
.
getCode
());
OpenApiBaseStrategy
strategyFactoryHandler
=
openApiBaseStrategyFactory
.
getHandler
(
platTenant
.
getCode
());
if
(
strategyFactoryHandler
!=
null
)
{
if
(
strategyFactoryHandler
!=
null
)
{
...
...
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
View file @
74510edc
...
@@ -323,7 +323,7 @@ public class PushCallback implements MqttCallbackExtended {
...
@@ -323,7 +323,7 @@ public class PushCallback implements MqttCallbackExtended {
redisTemplate
.
delete
(
OPEN_API_KEY_COUNT
+
deviceId
+
":"
+
iot_tenantId
);
redisTemplate
.
delete
(
OPEN_API_KEY_COUNT
+
deviceId
+
":"
+
iot_tenantId
);
PlatTenant
platTenant
=
platTenantService
.
getOne
(
new
QueryWrapper
<
PlatTenant
>()
PlatTenant
platTenant
=
platTenantService
.
getOne
(
new
QueryWrapper
<
PlatTenant
>()
.
lambda
().
eq
(
PlatTenant:
:
getIotOrgId
,
iot_tenantId
));
.
lambda
().
eq
(
PlatTenant:
:
getIotOrgId
,
iot_tenantId
));
if
(
platTenant
!=
null
)
{
if
(
platTenant
!=
null
&&
StringUtils
.
isNotBlank
(
platTenant
.
getCode
())
)
{
OpenApiBaseStrategy
strategyFactoryHandler
=
openApiBaseStrategyFactory
.
getHandler
(
platTenant
.
getCode
());
OpenApiBaseStrategy
strategyFactoryHandler
=
openApiBaseStrategyFactory
.
getHandler
(
platTenant
.
getCode
());
if
(
strategyFactoryHandler
!=
null
)
{
if
(
strategyFactoryHandler
!=
null
)
{
try
{
try
{
...
...
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