From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 5f6f1f4..0024641 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -203,7 +203,7 @@
map.put("message", "300");
} else {
homeMapper.Inglassid(glass, cage, cell, tier);
- spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
+ spianMapper.UpdataAddCage1(glass.getGlassWidth(), cage, cell);
}
return Result.success(map);
}
@@ -219,11 +219,35 @@
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@PostMapping("/InsertQueueGlassId")
- public Result InsertQueueGlassId(String glassid) {
- homeMapper.InsertQueueGlassId(glassid);
+ public Result InsertQueueGlassId(String glassid,Short id) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ map.put("message", "300");
+ }else{
+ homeMapper.InsertQueueGlassId(glassid,id);
+ map.put("message", "200");
+ }
+ return Result.success(map);
+ }
+
+ //纭鎵爜浣嶇幓鐠冧俊鎭�
+ @PostMapping("/UpdateQueueState")
+ public Result UpdateQueueState() {
+ homeMapper.UpdateQueueState();
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
}
+
+ //娓呴櫎涓婄墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteQueueGlass")
+ public Result DeleteQueueGlass(String id) {
+ homeMapper.DeleteQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0