From 0ee358176fc31fdb03f968f4baf1df9bb2e1815f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 04 九月 2023 17:06:24 +0800
Subject: [PATCH] # 显示屏
---
src/main/java/com/zy/asrs/entity/LocMast.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 2a220ef..0d4f47a 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -186,14 +186,17 @@
*/
@ApiModelProperty(value= "娑堥槻鐘舵�亄0:姝ｅ父,1:鎶ヨ}")
@TableField("fire_status")
- private Integer fireStatus;
+ private Integer fireStatus=0;
/**
- * 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}
+ * 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
*/
- @ApiModelProperty(value= "浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}")
+ @ApiModelProperty(value= "浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}")
@TableField("pack_status")
private Integer packStatus;
+
+ @ApiModelProperty(value= "閫氶亾")
+ private Integer channel;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -314,9 +317,15 @@
case 3:
return "娴嬭瘯瀹屾垚";
case 4:
- return "闈欑疆涓�";
+ return "娴嬭瘯NG";
case 5:
+ return "闈欑疆涓�";
+ case 6:
return "闈欑疆瀹屾垚";
+ case 7:
+ return "鏆傚仠娴嬭瘯";
+ case 8:
+ return "绱ф�ュ嚭搴�";
default:
return String.valueOf(this.packStatus);
}
--
Gitblit v1.9.1