From b134ac3690e6d31d40ee6def5c65fb778050a556 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 11 九月 2023 17:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 b7332cb..aea9709 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
@@ -8,6 +8,7 @@
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.service.HomeService;
+import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -22,6 +23,9 @@
@Autowired
HomeService storageRackService;
+
+ @Autowired
+ SpianService spianService;
@GetMapping("/load")
public Result selectAll(){
@@ -69,7 +73,7 @@
}
@GetMapping("/Addglassid")
- public Result Addglassid(Integer glassid){
+ public Result Addglassid(short glassid){
Map<String, Object> map = new HashMap<>();
short taskno=homeMapper.SelectOutTask();
if(taskno>0){
@@ -77,7 +81,7 @@
}else{
map.put("message2","200");
//璋冪敤浼嶄笂鐗囧嚱鏁�
-
+ spianService.selectAll(glassid);
}
return Result.success(map);
}
--
Gitblit v1.8.0