From 477b4071ccf45b6d15280d37a4a002307aa2271c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 九月 2023 17:11:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 19 ++++++++++++++++---
1 files changed, 16 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 f21eb5f..4216a59 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.common.Result;
import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.alarmmg;
import org.springframework.web.bind.annotation.*;
@@ -81,12 +82,24 @@
}
@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