From bd98e9fe7866af872035c9f198786cbbff123275 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 15:19:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 3af53de..9e8d044 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
@@ -73,6 +77,25 @@
if (Cools.isEmpty(basJar) || null==basJar.getJarNo()){
return R.error();
}
+ basJarService.updateById(basJar);
+ 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();
}
@@ -145,9 +168,12 @@
vo.setJarTemperature(basJar.getJarTemperature());
vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
vo.setJarPressure(basJar.getJarPressure());
- vo.setJarPressure$(basJar.getJarPressure().toString()+"Pa");
+ 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