From c39cbcb00cbff39d50756a58e0e1c64dde160fc1 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:43:37 +0800
Subject: [PATCH] 更新
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 443 ++++++++++++++++++++++++++++--------------------------
1 files changed, 228 insertions(+), 215 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 0024641..04444d3 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
@@ -22,232 +22,245 @@
@RestController
@RequestMapping("/home")
public class HomeController {
- @Autowired
- HomeMapper homeMapper;
+ @Autowired
+ HomeMapper homeMapper;
- @Autowired
- HomeService storageRackService;
+ @Autowired
+ HomeService storageRackService;
- @Autowired
- SpianService spianService;
+ @Autowired
+ SpianService spianService;
- @Autowired
- SpianMapper spianMapper;
-
- //鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
- @GetMapping("/load")
- public Result selectAll() {
- List<StorageCage> storageCagelist = homeMapper.selectAll();
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCagelist);
- return Result.success(map);
- }
- //鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
- @GetMapping("/loads")
- public Result selectRack() {
- List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
- List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
- List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
- List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
- Map<String, Object> map = new HashMap<>();
- map.put("list1", storageCagelist1);
- map.put("list2", storageCagelist2);
- map.put("list3", storageCagelist3);
- map.put("list4", storageCagelist4);
- return Result.success(map);
- }
- //鏌ヨ杩�/鍑虹墖浠诲姟
- @GetMapping("/loadinout")
- public Result selectinout(Integer types) {
- List<StorageCage> storageCageinout = homeMapper.selectinout(types);
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCageinout);
- return Result.success(map);
- }
- //鎸夎鍗曞嚭鐗�
- @GetMapping("/InsertOrder")
- public Result InsertOrder(String orderid) {
- short result = homeMapper.SelectOrder(orderid);
- Map<String, Object> map = new HashMap<>();
- if (result > 0) {
- homeMapper.updateOrder();
- homeMapper.InsertOrder(orderid);
- map.put("message", "200");
- } else {
- map.put("message", "500");
- }
- return Result.success(map);
- }
- //鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
- @GetMapping("/Addglassid")
- public Result Addglassid(String glassid) {
- Map<String, Object> map = new HashMap<>();
- short taskno = homeMapper.SelectInTask();
- if (taskno > 0) {
- map.put("message2", "500");
- } else {
- // 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results = spianService.selectAll(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("/UpdateTask")
- public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
- Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types);
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
- if (types == 0) {
- // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
- homeMapper.UpdateCageTask1(glassid);
- S7control.getinstance().WriteWord("DB105.14", (short) 0);
- } else {
+ @Autowired
+ SpianMapper spianMapper;
- spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
- homeMapper.UpdateCageTask2(glassid);
- S7control.getinstance().WriteWord("DB105.12", (short) 0);
- }
- 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);
- }
- //鏌ヨ鐞嗙墖绗艰鎯�
- @GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) {
- List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
- Map<String, Object> map = new HashMap<>();
- map.put("cageinfo", cageinfo);
- return Result.success(map);
- }
- //鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
- @GetMapping("/DeleteByGlassID")
- public Result DeleteByGlassID(String glassid) {
- StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
- spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
- homeMapper.DeleteByGlassID(glassid);
- Map<String, Object> map = new HashMap<>();
- map.put("message3", "200");
- return Result.success(map);
- }
- //鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
- @GetMapping("/OutByGlassID")
- public Result OutByGlassID(String glassid) {
- Map<String, Object> map = new HashMap<>();
- // 璋冪敤浼嶄笂鐗囧嚱鏁�
- short result = homeMapper.SelectStorageByGlassId(glassid);
- if (result > 0) {
- Short results = spianService.selectout2(glassid);
- if (results == 200) {
- map.put("message2", "200");
- } else if (results == 300) {
- map.put("message2", "300");
- }
- }else{
- map.put("message2", "500");
- }
+ // 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
+ @GetMapping("/load")
+ public Result selectAll() {
+ List<StorageCage> storageCagelist = homeMapper.selectAll();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", storageCagelist);
+ return Result.success(map);
+ }
- return Result.success(map);
+ // 鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
+ @GetMapping("/loads")
+ public Result selectRack() {
+ List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
+ List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
+ List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
+ List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list1", storageCagelist1);
+ map.put("list2", storageCagelist2);
+ map.put("list3", storageCagelist3);
+ map.put("list4", storageCagelist4);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ杩�/鍑虹墖浠诲姟
+ @GetMapping("/loadinout")
+ public Result selectinout(Integer types) {
+ List<StorageCage> storageCageinout = homeMapper.selectinout(types);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", storageCageinout);
+ return Result.success(map);
+ }
+
+ // 鎸夎鍗曞嚭鐗�
+ @GetMapping("/InsertOrder")
+ public Result InsertOrder(String orderid) {
+ short result = homeMapper.SelectOrder(orderid);
+ Map<String, Object> map = new HashMap<>();
+ if (result > 0) {
+ homeMapper.updateOrder();
+ homeMapper.InsertOrder(orderid);
+ map.put("message", "200");
+ } else {
+ map.put("message", "500");
}
- //鍔犺浇灏忚溅浣嶇疆
- @GetMapping("/Loadcarlist")
- public Result Loadcarlist() {
- List<CarPosition> carlist = homeMapper.Loadcarlist();
- Map<String, Object> map = new HashMap<>();
- map.put("carlist", carlist);
- return Result.success(map);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
+ @GetMapping("/Addglassid")
+ public Result Addglassid(String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ short taskno = homeMapper.SelectInTask();
+ if (taskno > 0) {
+ map.put("message2", "500");
+ } else {
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
}
- //鏌ヨ纭瀵嗙爜
- @GetMapping("/SelectPassword")
- public Result SelectPassword() {
- String pwdct = homeMapper.SelectPassword();
- Map<String, Object> map = new HashMap<>();
- map.put("password", pwdct);
- return Result.success(map);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
+ @GetMapping("/UpdateTask")
+ public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ homeMapper.UpdateTask(types);
+ StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+ if (types == 0) {
+ // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+ homeMapper.UpdateCageTask1(glassid);
+ S7control.getinstance().WriteWord("DB105.14", (short) 0);
+ } else {
+
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
}
- //鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
- @GetMapping("/SelectGlassByGlassID")
- public Result SelectGlassByGlassID(String glassid) {
- Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
- Map<String, Object> map = new HashMap<>();
- map.put("form", Glass);
- return Result.success(map);
- }
- //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
- @GetMapping("/Disabled")
- public Result Disabled(short cage, short cell, short disabled) {
- homeMapper.Disabled(cage, cell, disabled);
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
- }
- //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
- @PostMapping("/Inglassid")
- public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
- Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
- if (result > 0) {
- map.put("message", "300");
- } else {
- homeMapper.Inglassid(glass, cage, cell, tier);
- spianMapper.UpdataAddCage1(glass.getGlassWidth(), cage, cell);
- }
- return Result.success(map);
+ 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);
+ }
+
+ // 鏌ヨ鐞嗙墖绗艰鎯�
+ @GetMapping("/SelectCageInfo")
+ public Result SelectCageInfo(short cage) {
+ List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
+ Map<String, Object> map = new HashMap<>();
+ map.put("cageinfo", cageinfo);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
+ @GetMapping("/DeleteByGlassID")
+ public Result DeleteByGlassID(String glassid) {
+ StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+ spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+ homeMapper.DeleteByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message3", "200");
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
+ @GetMapping("/OutByGlassID")
+ public Result OutByGlassID(String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ }
+ } else {
+ map.put("message2", "500");
}
- //鏌ヨ鐜荤拑淇℃伅
- @PostMapping("/SelectGlass")
- public Result SelectGlass(String orderid) {
- Map<String, Object> map = new HashMap<>();
- List<Glass> glass=homeMapper.SelectGlass(orderid);
- map.put("glass", glass);
- return Result.success(map);
- }
+ return Result.success(map);
+ }
- //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
- @PostMapping("/InsertQueueGlassId")
- public Result InsertQueueGlassId(String glassid,Short id) {
- Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glassid);
- if (result > 0) {
- map.put("message", "300");
- }else{
- homeMapper.InsertQueueGlassId(glassid,id);
- map.put("message", "200");
- }
- return Result.success(map);
- }
-
- //纭鎵爜浣嶇幓鐠冧俊鎭�
- @PostMapping("/UpdateQueueState")
- public Result UpdateQueueState() {
- homeMapper.UpdateQueueState();
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- 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);
+ }
- //娓呴櫎涓婄墖闃熷垪鐜荤拑
- @PostMapping("/DeleteQueueGlass")
- public Result DeleteQueueGlass(String id) {
- homeMapper.DeleteQueueGlass(id);
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- 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);
+ }
+
+ // 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
+ @GetMapping("/SelectGlassByGlassID")
+ public Result SelectGlassByGlassID(String glassid) {
+ Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("form", Glass);
+ return Result.success(map);
+ }
+
+ // 鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+ @GetMapping("/Disabled")
+ public Result Disabled(short cage, short cell, short disabled) {
+ homeMapper.Disabled(cage, cell, disabled);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
+ @PostMapping("/Inglassid")
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.Inglassid(glass, cage, cell, tier);
+ spianMapper.UpdataAddCage1(glass.getwidth(), cage, cell);
}
-
-
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鐜荤拑淇℃伅
+ @PostMapping("/SelectGlass")
+ public Result SelectGlass(String orderid) {
+ Map<String, Object> map = new HashMap<>();
+ List<Glass> glass = homeMapper.SelectGlass(orderid);
+ map.put("glass", glass);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @PostMapping("/InsertQueueGlassId")
+ public Result InsertQueueGlassId(String glassid, Short id) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.InsertQueueGlassId(glassid, id);
+ map.put("message", "200");
+ }
+ return Result.success(map);
+ }
+
+ // 纭鎵爜浣嶇幓鐠冧俊鎭�
+ @PostMapping("/UpdateQueueState")
+ public Result UpdateQueueState() {
+ homeMapper.UpdateQueueState();
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 娓呴櫎涓婄墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteQueueGlass")
+ public Result DeleteQueueGlass(String id) {
+ homeMapper.DeleteQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0