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 | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 4102de3..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(){
@@ -44,6 +49,7 @@
return Result.success(map);
}
+
@GetMapping("/loadinout")
public Result selectinout(Integer types){
List<StorageCage> storageCageinout=homeMapper.selectinout(types);
@@ -65,4 +71,40 @@
}
return Result.success(map);
}
+
+ @GetMapping("/Addglassid")
+ public Result Addglassid(short glassid){
+ Map<String, Object> map = new HashMap<>();
+ short taskno=homeMapper.SelectOutTask();
+ if(taskno>0){
+ map.put("message2","500");
+ }else{
+ map.put("message2","200");
+ //璋冪敤浼嶄笂鐗囧嚱鏁�
+ spianService.selectAll(glassid);
+ }
+ return Result.success(map);
+ }
+
+ @GetMapping("/UpdateTask")
+ public Result UpdateTask(Integer types,Integer shelfrack){
+ Map<String, Object> map = new HashMap<>();
+ 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