From ab5ade946040dc4796deaa82c903b52d81f7dabf Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 21 六月 2024 14:55:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | 2
src/main/java/com/zy/asrs/controller/BasJarController.java | 6 +-
src/main/java/com/zy/common/model/enums/JarStatusType.java | 12 ++++--
src/main/java/com/zy/asrs/entity/BasJar.java | 67 +++++++++++++++++++++++++++++++++
4 files changed, 79 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index b608c15..5641c7d 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -126,7 +126,7 @@
@PostMapping("/table/jar/state")
-// @ManagerAuth(memo = "RGV淇℃伅琛�")
+// @ManagerAuth(memo = "JAR淇℃伅琛�")
public R rgvStateTable(){
List<JarStateTableVo> list = new ArrayList<>();
List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
@@ -136,12 +136,12 @@
vo.setJarNo(basJar.getJarNo()); // RGV鍙�
list.add(vo);
- vo.setJarMode(basJar.getJarMode() == 1?"鑱旀満":"鑴辨満" ); // 妯″紡鐘舵��
+ vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵��
vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).desc); // 鐘舵��
vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
vo.setRegion(basJar.getRegion());
vo.setJarCode(basJar.getJarCode());
- vo.setJarErr(basJar.getJarErr());
+ vo.setJarErr(basJar.getJarErr$());
}
return R.ok().add(list);
diff --git a/src/main/java/com/zy/asrs/entity/BasJar.java b/src/main/java/com/zy/asrs/entity/BasJar.java
index f4e48b3..e154dc4 100644
--- a/src/main/java/com/zy/asrs/entity/BasJar.java
+++ b/src/main/java/com/zy/asrs/entity/BasJar.java
@@ -157,5 +157,72 @@
// null // 鍙抽棬鍙叧(checkBox)
// );
+ public String getJarMode$(){
+ if (null == this.jarMode){ return null; }
+ switch (this.jarMode){
+ case 0:
+ return "绂荤嚎";
+ case 1:
+ return "鎵嬪姩";
+ case 2:
+ return "鑷姩";
+ case 3:
+ return "鍏朵粬";
+ default:
+ return String.valueOf(this.jarMode);
+ }
+ }
+
+ public String getJarErr$(){
+ if (null == this.jarErr){ return null; }
+ switch (this.jarErr){
+ case 0:
+ return "鏃犲紓甯�";
+ case 1:
+ return "杩愯鏃跺乏闂ㄦ湭鍏冲ソ";
+ case 2:
+ return "杩愯鏃跺彸闂ㄦ湭鍏冲ソ";
+ case 3:
+ return "杩愯鏃舵湭閫夋嫨宸ヨ壓";
+ case 4:
+ return "璁惧杩愯涓秴楂樻俯";
+ case 5:
+ return "璁惧杩愯涓秴楂樺帇";
+ case 6:
+ return "鎬ュ仠琚寜涓�";
+ case 7:
+ return "宸﹂棬鍏抽棬瓒呮椂";
+ case 8:
+ return "鍙抽棬鍏抽棬瓒呮椂";
+ default:
+ return String.valueOf(this.jarErr);
+ }
+ }
+
+ public String getJarStatus$(){
+ if (null == this.jarStatus){ return null; }
+ switch (this.jarStatus){
+ case 0:
+ return "绌洪棽";
+ case 1:
+ return "鍏ユ枡涓�";
+ case 2:
+ return "纭寲涓�";
+ case 3:
+ return "鍑烘枡涓�";
+ case 4:
+ return "鍋滄";
+ case 5:
+ return "宸﹂棬鎵撳紑涓�";
+ case 6:
+ return "鍙抽棬鎵撳紑涓�";
+ case 7:
+ return "宸﹂棬鍏抽棴涓�";
+ case 8:
+ return "鍙抽棬鍏抽棴涓�";
+ default:
+ return String.valueOf(this.jarStatus);
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
index a28bd93..1a36541 100644
--- a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
+++ b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
@@ -26,5 +26,5 @@
private String alarm = "-";
//寮傚父浠ｇ爜
- private Integer jarErr = 0;
+ private String jarErr = "-";
}
diff --git a/src/main/java/com/zy/common/model/enums/JarStatusType.java b/src/main/java/com/zy/common/model/enums/JarStatusType.java
index 9d22417..4ecf4fe 100644
--- a/src/main/java/com/zy/common/model/enums/JarStatusType.java
+++ b/src/main/java/com/zy/common/model/enums/JarStatusType.java
@@ -3,10 +3,14 @@
public enum JarStatusType {
IDLE(0, "绌洪棽"),
- MOVING(1, "浣滀笟涓�"),
- SOS(2, "鎶ヨ"),
- WAITING(10, "绛夊緟纭"),
- OFF_LINE(-1, "鏈煡"),
+ MOVING(1, "鍏ユ枡涓�"),
+ SOS(2, "纭寲涓�"),
+ WAITING1(3, "鍑烘枡涓�"),
+ WAITING2(4, "鍋滄"),
+ WAITING3(5, "宸﹂棬鎵撳紑涓�"),
+ WAITING4(6, "鍙抽棬鎵撳紑涓�"),
+ WAITING5(7, "宸﹂棬鍏抽棴涓�"),
+ OFF_LINE(8, "鍙抽棬鍏抽棴涓�"),
OTHER(100, "鍏跺畠"),
;
--
Gitblit v1.9.1