From 47d6f53823c21d1382364f051eb4fd14607ba624 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 17:23:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 2d8aa66..6a3c7c9 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,21 @@
vo.setJarNo(basJar.getJarNo()); // RGV鍙�
list.add(vo);
- vo.setJarMode(basJar.getJarMode() == 1?"鑱旀満":"鑴辨満" ); // 妯″紡鐘舵��
- vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).desc); // 鐘舵��
+ vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc); // 鐘舵��
vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
vo.setRegion(basJar.getRegion());
vo.setJarCode(basJar.getJarCode());
- vo.setJarErr(basJar.getJarErr());
+ vo.setJarErr(basJar.getJarErr$());
+ vo.setJarTemperature(basJar.getJarTemperature());
+ vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
+ vo.setJarPressure(basJar.getJarPressure());
+ vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
+ vo.setJarCount(basJar.getJarCount());//鏈�澶у偍閲�
+ vo.setJarCount$(basJar.getJarCount().toString()+"鎵�");//鏈�澶у偍閲�
+ vo.setHoldingTime(DateUtils.convert(basJar.getHoldingTime()));//淇濇俯鏃堕棿
+ vo.setOpenTime(DateUtils.convert(basJar.getOpenTime()));//寮�闂ㄦ椂闂�
+ vo.setCloseTime(DateUtils.convert(basJar.getCloseTime()));//鍏抽棬鏃堕棿
}
return R.ok().add(list);
--
Gitblit v1.9.1