From 9c7e5bc10f242b71f3d94e2c700cb7de79feda17 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 25 二月 2025 08:45:14 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/BasJarController.java |   79 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 75 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 b608c15..33b26f3 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -6,7 +6,9 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
 import com.zy.asrs.entity.BasJar;
+import com.zy.asrs.entity.BasJarMast;
 import com.zy.asrs.entity.vo.JarStateTableVo;
+import com.zy.asrs.service.BasJarMastService;
 import com.zy.asrs.service.BasJarService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
@@ -24,6 +26,8 @@
 
     @Autowired
     private BasJarService basJarService;
+    @Autowired
+    private BasJarMastService basJarMastService;
 
     @RequestMapping(value = "/basJar/{id}/auth")
     @ManagerAuth
@@ -77,6 +81,25 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/basJar/update/uodate/jar/count/auth")
+    @ManagerAuth(memo = "鏇存柊纭寲缃愭渶澶у偍閲�")
+    public R updateJarCount(Integer jarCount,Integer jarNo){
+        if (jarCount > 0 && jarCount < 8 && jarNo == 0){
+            return R.error("淇敼鏁伴噺涓嶅悎娉�");
+        }
+        List<BasJarMast> basJarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", jarNo));
+        if (basJarMasts.size()>jarCount){
+            return R.error("纭寲缃愬綋鍓嶅瓨鍦ㄥ偍閲忓ぇ浜庝慨鏀圭洰鏍囧偍閲忥紝涓嶅厑璁镐慨鏀癸紒锛侊紒");
+        }
+        BasJar basJar = basJarService.selectById(jarNo);
+        if (basJar.getJarStatus() == 2 || basJar.getJarStatus()>3){
+            return R.error("纭寲缃愬浜庡綋鍓嶇姸鎬佹椂锛屼笉鍏佽淇敼锛侊紒锛�");
+        }
+        basJar.setJarCount(jarCount);
+        basJarService.updateById(basJar);
+        return R.ok();
+    }
+
     @RequestMapping(value = "/basJar/delete/auth")
     @ManagerAuth(memo = "鍒犻櫎纭寲缃�")
     public R delete(@RequestParam(value="ids[]") Long[] ids){
@@ -126,22 +149,70 @@
 
 
     @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"));
         for (BasJar basJar : jars) {
+            if (basJar.getJarCode()>2) continue;
             // 琛ㄦ牸琛�
             JarStateTableVo vo = new JarStateTableVo();
             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()));//鍏抽棬鏃堕棿
+
+            vo.setLeftDoorOpen(basJar.getLeftDoorOpen());
+            vo.setLeftDoorClose(basJar.getLeftDoorClose());
+            vo.setRightDoorOpen(basJar.getRightDoorOpen());
+            vo.setRightDoorClose(basJar.getRightDoorClose());
+
+            /**
+             * 宸﹂棬(checkBox)
+             */
+            vo.setLeftDoor(basJar.getLeftDoor().equals("N")? "鍏抽棴":"鎵撳紑");
+
+            /**
+             * 鍙抽棬(checkBox)
+             */
+            vo.setRightDoor(basJar.getRightDoor().equals("N")? "鍏抽棴":"鎵撳紑");
+
+            /**
+             * 宸﹂棬鍙紑(checkBox)
+             */
+            vo.setLeftInEnable(basJar.getLeftInEnable());
+
+            /**
+             * 宸﹂棬鍙叧(checkBox)
+             */
+            vo.setLeftOutEnable(basJar.getLeftOutEnable());
+
+
+            /**
+             * 鍙抽棬鍙紑(checkBox)
+             */
+            vo.setRightInEnable(basJar.getRightInEnable());
+
+            /**
+             * 鍙抽棬鍙叧(checkBox)
+             */
+            vo.setRightOutEnable(basJar.getRightOutEnable());
 
         }
         return R.ok().add(list);

--
Gitblit v1.9.1