From 8ceb6b26a49962448c51ca8c92b6ffcf9ed5ae33 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期一, 18 九月 2023 20:33:59 +0800
Subject: [PATCH] 增加 连接客户ERP数据连接是否正常的判断

---
 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java |   13 +++++++++----
 1 files changed, 9 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 62bc975..1145641 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.service.SpianService;
 import com.example.springboot.common.Result;
+import com.example.springboot.entity.CarPosition;
 import com.example.springboot.entity.StorageCage;
 import com.example.springboot.entity.alarmmg;
 
@@ -79,7 +80,7 @@
             map.put("message2", "500");
         } else {
             // 璋冪敤浼嶄笂鐗囧嚱鏁�
-            short results = spianService.selectAll(glassid);
+            short results = spianService.selectAll(Short.toString(glassid));
             if (results == 200) {
                 map.put("message2", "200");
             } else if (results == 300) {
@@ -130,8 +131,6 @@
 
     @GetMapping("/OutByGlassID")
     public Result OutByGlassID(String glassid) {
-        spianService.selectout2(glassid);
-
         Map<String, Object> map = new HashMap<>();
         // 璋冪敤浼嶄笂鐗囧嚱鏁�
         Short results = spianService.selectout2(glassid);
@@ -142,8 +141,14 @@
         } else if (results == 400) {
             map.put("message2", "400");
         }
-
         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);
+    }
 }

--
Gitblit v1.8.0