Commit bc4e45b9 authored by zhangsen's avatar zhangsen

fix-bug:4474 物联设备 告警状态改为 0/1 不存在 null 前端修改为 1-报警 0-正常

parent 4d844354
...@@ -65,7 +65,7 @@ public class EquipmentSpecificAlarm extends BaseEntity { ...@@ -65,7 +65,7 @@ public class EquipmentSpecificAlarm extends BaseEntity {
@TableField("frequency") @TableField("frequency")
private int frequency; private int frequency;
@ApiModelProperty(value = "报警状态:1报警0恢复") @ApiModelProperty(value = "报警状态:1报警0恢复 -> 1-报警 0-正常")
@TableField("status") @TableField("status")
private int status; private int status;
......
...@@ -525,7 +525,7 @@ public class TopographyController extends AbstractBaseController { ...@@ -525,7 +525,7 @@ public class TopographyController extends AbstractBaseController {
alarm = list.get(0); alarm = list.get(0);
equipmentSpecific.setStatus(alarm.getStatus()); equipmentSpecific.setStatus(alarm.getStatus());
} else { } else {
equipmentSpecific.setStatus(null); equipmentSpecific.setStatus(0);
} }
equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode()); equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
String sysName = this.getSystemNameBySpeId(equipmentSpecific); String sysName = this.getSystemNameBySpeId(equipmentSpecific);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment