Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
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
项目统一框架
amos-boot-biz
Commits
bc4e45b9
Commit
bc4e45b9
authored
May 23, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix-bug:4474 物联设备 告警状态改为 0/1 不存在 null 前端修改为 1-报警 0-正常
parent
4d844354
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
EquipmentSpecificAlarm.java
...oin/equipmanage/common/entity/EquipmentSpecificAlarm.java
+1
-1
TopographyController.java
.../yeejoin/equipmanage/controller/TopographyController.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarm.java
View file @
bc4e45b9
...
...
@@ -65,7 +65,7 @@ public class EquipmentSpecificAlarm extends BaseEntity {
@TableField
(
"frequency"
)
private
int
frequency
;
@ApiModelProperty
(
value
=
"报警状态:1报警0恢复"
)
@ApiModelProperty
(
value
=
"报警状态:1报警0恢复
-> 1-报警 0-正常
"
)
@TableField
(
"status"
)
private
int
status
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @
bc4e45b9
...
...
@@ -525,7 +525,7 @@ public class TopographyController extends AbstractBaseController {
alarm
=
list
.
get
(
0
);
equipmentSpecific
.
setStatus
(
alarm
.
getStatus
());
}
else
{
equipmentSpecific
.
setStatus
(
null
);
equipmentSpecific
.
setStatus
(
0
);
}
equipmentSpecific
.
setFullqrCode
(
"01#"
+
equipmentSpecific
.
getQrCode
());
String
sysName
=
this
.
getSystemNameBySpeId
(
equipmentSpecific
);
...
...
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