From d8156c25a0af7841a91a6fe6ea5d114680672245 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 11 九月 2023 09:51:13 +0800
Subject: [PATCH] 修改遗漏错误
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 f21eb5f..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,8 +8,10 @@
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;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,9 @@
@Autowired
HomeService storageRackService;
+
+ @Autowired
+ SpianService spianService;
@GetMapping("/load")
public Result selectAll(){
@@ -68,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){
@@ -76,17 +81,30 @@
}else{
map.put("message2","200");
//璋冪敤浼嶄笂鐗囧嚱鏁�
+ spianService.selectAll(glassid);
}
return Result.success(map);
}
@GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types,Integer shelf_rack){
+ public Result UpdateTask(Integer types,Integer shelfrack){
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types,shelf_rack);
- map.put("message2","200");
+ homeMapper.UpdateTask(types,shelfrack);
+ if(types==0){
+ homeMapper.UpdateCageTask1(shelfrack);
+ }else{
+ homeMapper.UpdateCageTask2(shelfrack);
+ }
+ map.put("message3","200");
return Result.success(map);
}
+ @GetMapping("/SelectAlarmmgInfo")
+ public Result SelectAlarmmgInfo(){
+ List<alarmmg> alarmmg=homeMapper.SelectAlarmmgInfo();
+ Map<String, Object> map = new HashMap<>();
+ map.put("alarmmg",alarmmg);
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0