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
9898ffc0
authored
Nov 21, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
mqtt协议包,新增雷达参数以及雷达拓展参数
parent
b2c80565
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
4 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/entity/RadarAiParam.java
src/main/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodec.java
View file @
9898ffc0
...
@@ -128,11 +128,20 @@ public class JetLinksMqttDeviceMessageCodec implements DeviceMessageCodec {
...
@@ -128,11 +128,20 @@ 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
();
Object
result
=
properties
.
get
(
"usrServerInfo"
);
if
(
properties
.
get
(
"usrServerInfo"
)
!=
null
)
{
if
(
result
!=
null
)
{
Map
<
String
,
Object
>
res
=
Maps
.
newConcurrentMap
();
Map
<
String
,
Object
>
res
=
Maps
.
newConcurrentMap
();
UserServerInfo
userServerInfo
=
JSON
.
parseObject
(
result
.
toString
(),
UserServerInfo
.
class
);
UserServerInfo
userServerInfo
=
JSON
.
parseObject
(
properties
.
get
(
"usrServerInfo"
).
toString
(),
UserServerInfo
.
class
);
res
.
put
(
"usrServerInfo"
,
userServerInfo
);
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
);
payLoad
.
setProperties
(
res
);
}
else
{
}
else
{
payLoad
.
setProperties
(
properties
);
payLoad
.
setProperties
(
properties
);
...
...
src/main/java/org/jetlinks/protocol/official/entity/RadarAiExtent.java
0 → 100644
View file @
9898ffc0
package
org
.
jetlinks
.
protocol
.
official
.
entity
;
import
lombok.Data
;
@Data
public
class
RadarAiExtent
{
private
Integer
BorderRightX
;
private
Integer
BorderRightY
;
private
Integer
overallLeftX
;
private
Integer
overallLeftY
;
private
Integer
BorderLeftX
;
private
Integer
BorderLeftY
;
private
Integer
overallRightY
;
}
src/main/java/org/jetlinks/protocol/official/entity/RadarAiParam.java
0 → 100644
View file @
9898ffc0
package
org
.
jetlinks
.
protocol
.
official
.
entity
;
import
lombok.Data
;
@Data
public
class
RadarAiParam
{
private
Integer
groundDeviceOccupancy
;
private
Integer
suspectedDuration
;
private
Integer
middleHeight
;
private
Integer
skeyDeviceOccupancy
;
private
Integer
edgeHeight
;
private
Integer
middleThreshold
;
private
Integer
edgeThreshold
;
}
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