From 74fd6eb7fb0322078f7946f51073f20e90231df1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 01 四月 2025 11:54:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 1a956d9..33b26f3 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -1,21 +1,21 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasJar;
-import com.zy.asrs.entity.BasRgv;
+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;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +26,8 @@
@Autowired
private BasJarService basJarService;
+ @Autowired
+ private BasJarMastService basJarMastService;
@RequestMapping(value = "/basJar/{id}/auth")
@ManagerAuth
@@ -63,14 +65,14 @@
}
@RequestMapping(value = "/basJar/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板纭寲缃�")
public R add(BasJar basJar) {
basJarService.insert(basJar);
return R.ok();
}
@RequestMapping(value = "/basJar/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼纭寲缃�")
public R update(BasJar basJar){
if (Cools.isEmpty(basJar) || null==basJar.getJarNo()){
return R.error();
@@ -79,8 +81,27 @@
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
+ @ManagerAuth(memo = "鍒犻櫎纭寲缃�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basJarService.deleteById(id);
@@ -89,7 +110,7 @@
}
@RequestMapping(value = "/basJar/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀵煎嚭纭寲缃愬熀纭�淇℃伅")
public R export(@RequestBody JSONObject param){
EntityWrapper<BasJar> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@@ -125,18 +146,77 @@
return R.ok();
}
+
+
@PostMapping("/table/jar/state")
// @ManagerAuth(memo = "JAR淇℃伅琛�")
- public R jarStateTable(){
+ 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$()); // 妯″紡鐘舵��
+ 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.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(jars);
+ return R.ok().add(list);
}
+
}
--
Gitblit v1.9.1