From 5d726c33c3da931a7c5c43bba3f37a4e8c11ca93 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 18 九月 2023 21:11:21 +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 | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 01b46fd..cae88ae 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
@@ -10,6 +10,7 @@
import com.example.springboot.service.HomeService;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
+import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -79,12 +80,12 @@
map.put("message2", "500");
} else {
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results= spianService.selectAll(glassid);
- if(results==200){
+ short results = spianService.selectAll(Short.toString(glassid));
+ if (results == 200) {
map.put("message2", "200");
- }else if(results==300){
+ } else if (results == 300) {
map.put("message2", "300");
- }else if(results==400){
+ } else if (results == 400) {
map.put("message2", "400");
}
}
@@ -96,9 +97,9 @@
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, shelfrack);
if (types == 0) {
- homeMapper.UpdateCageTask1(shelfrack,glassid);
+ homeMapper.UpdateCageTask1(shelfrack, glassid);
} else {
- homeMapper.UpdateCageTask2(shelfrack,glassid);
+ homeMapper.UpdateCageTask2(shelfrack, glassid);
}
map.put("message3", "200");
return Result.success(map);
@@ -130,11 +131,34 @@
@GetMapping("/OutByGlassID")
public Result OutByGlassID(String glassid) {
- spianService.selectout2(glassid);
-
Map<String, Object> map = new HashMap<>();
- map.put("message3", "200");
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
return Result.success(map);
}
+ @GetMapping("/Loadcarlist")
+ public Result Loadcarlist() {
+ List<CarPosition> carlist = homeMapper.Loadcarlist();
+ Map<String, Object> map = new HashMap<>();
+ map.put("carlist", carlist);
+ return Result.success(map);
+ }
+
+ @GetMapping("/SelectPassword")
+ public Result SelectPassword() {
+ String pwdct = homeMapper.SelectPassword();
+ Map<String, Object> map = new HashMap<>();
+ map.put("password", pwdct);
+ return Result.success(map);
+ }
+
+
}
--
Gitblit v1.8.0