Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
entrance_api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
entrance_api
Commits
7ea7b17d
Commit
7ea7b17d
authored
Feb 27, 2023
by
gaoyingwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改摄像头数据查询
parent
a60ed4fc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
AepPushServiceImpl.java
...soft/integration/aep/service/impl/AepPushServiceImpl.java
+1
-1
DoorDeviceInfo.java
...org/rcisoft/sys/doordeviceinfo/entity/DoorDeviceInfo.java
+2
-0
No files found.
src/main/java/org/rcisoft/integration/aep/service/impl/AepPushServiceImpl.java
View file @
7ea7b17d
...
@@ -148,7 +148,7 @@ public class AepPushServiceImpl implements IAepPushService {
...
@@ -148,7 +148,7 @@ public class AepPushServiceImpl implements IAepPushService {
if
(
StringUtils
.
equals
(
"0100"
,
status
)){
if
(
StringUtils
.
equals
(
"0100"
,
status
)){
convertBean
.
setDataType
(
"OPEN"
);
//开门状态
convertBean
.
setDataType
(
"OPEN"
);
//开门状态
}
else
if
(
StringUtils
.
equals
(
"0000"
,
status
)){
}
else
if
(
StringUtils
.
equals
(
"0000"
,
status
)){
convertBean
.
setDataType
(
"
OPEN
"
);
//关门
convertBean
.
setDataType
(
"
CLOSE
"
);
//关门
}
else
{
}
else
{
resultCode
=
"0"
;
resultCode
=
"0"
;
log
.
info
(
"设备:【"
+
convertBean
.
getDeviceImei
()+
"】发送的指令:【"
+
hexStr
+
"】 无需入库"
);
log
.
info
(
"设备:【"
+
convertBean
.
getDeviceImei
()+
"】发送的指令:【"
+
hexStr
+
"】 无需入库"
);
...
...
src/main/java/org/rcisoft/sys/doordeviceinfo/entity/DoorDeviceInfo.java
View file @
7ea7b17d
...
@@ -129,6 +129,8 @@ public class DoorDeviceInfo extends CyIdIncreEntity<DoorDeviceInfo> {
...
@@ -129,6 +129,8 @@ public class DoorDeviceInfo extends CyIdIncreEntity<DoorDeviceInfo> {
/**
/**
* 抓拍图像
* 抓拍图像
*/
*/
@Transient
@TableField
(
exist
=
false
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
captureTime
;
private
Date
captureTime
;
...
...
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