Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-mqtt-protocol
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
13f928ae
authored
Nov 21, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
mqtt协议包,json参数改用object
parent
9898ffc0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
src/main/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodec.java
src/main/java/org/jetlinks/protocol/official/entity/RadarAiExtent.java
src/main/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodec.java
View file @
13f928ae
...
@@ -128,24 +128,7 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
...
@@ -128,24 +128,7 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
payLoad
.
setDeviceId
(
deviceMessage
.
getDeviceId
());
payLoad
.
setDeviceId
(
deviceMessage
.
getDeviceId
());
Map
<
String
,
Object
>
properties
=
((
WritePropertyMessage
)
deviceMessage
).
getProperties
();
Map
<
String
,
Object
>
properties
=
((
WritePropertyMessage
)
deviceMessage
).
getProperties
();
if
(
properties
.
get
(
"usrServerInfo"
)
!=
null
)
{
payLoad
.
setProperties
(
properties
);
Map
<
String
,
Object
>
res
=
Maps
.
newConcurrentMap
();
UserServerInfo
userServerInfo
=
JSON
.
parseObject
(
properties
.
get
(
"usrServerInfo"
).
toString
(),
UserServerInfo
.
class
);
res
.
put
(
"usrServerInfo"
,
userServerInfo
);
payLoad
.
setProperties
(
res
);
}
else
if
(
properties
.
get
(
"radarAiParam"
)
!=
null
)
{
Map
<
String
,
Object
>
res
=
Maps
.
newConcurrentMap
();
RadarAiParam
radarAiParam
=
JSON
.
parseObject
(
properties
.
get
(
"radarAiParam"
)
.
toString
(),
RadarAiParam
.
class
);
res
.
put
(
"radarAiParam"
,
radarAiParam
);
payLoad
.
setProperties
(
res
);
}
else
if
(
properties
.
get
(
"radarAiExtent"
)
!=
null
)
{
Map
<
String
,
Object
>
res
=
Maps
.
newConcurrentMap
();
RadarAiExtent
radarAiExtent
=
JSON
.
parseObject
(
properties
.
get
(
"radarAiExtent"
).
toString
(),
RadarAiExtent
.
class
);
res
.
put
(
"radarAiExtent"
,
radarAiExtent
);
payLoad
.
setProperties
(
res
);
}
else
{
payLoad
.
setProperties
(
properties
);
}
customSendMessage
.
setPayload
(
payLoad
);
customSendMessage
.
setPayload
(
payLoad
);
customSendMessage
.
setTimestamp
(
deviceMessage
.
getTimestamp
());
customSendMessage
.
setTimestamp
(
deviceMessage
.
getTimestamp
());
...
...
src/main/java/org/jetlinks/protocol/official/entity/RadarAiExtent.java
View file @
13f928ae
...
@@ -12,5 +12,6 @@ public class RadarAiExtent {
...
@@ -12,5 +12,6 @@ public class RadarAiExtent {
private
Integer
BorderLeftX
;
private
Integer
BorderLeftX
;
private
Integer
BorderLeftY
;
private
Integer
BorderLeftY
;
private
Integer
overallRightY
;
private
Integer
overallRightY
;
private
Integer
overallRightX
;
}
}
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