From fa4d27ab5d5c9ae3a1ce84854ac318d6c03b9dae Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 15:42:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java |   60 ++++++++++--------------------------------------------------
 1 files changed, 10 insertions(+), 50 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 6c25db4..001c6f7 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
@@ -5,64 +5,50 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 
 import com.example.springboot.mapper.HomeMapper;
 import com.example.springboot.mapper.SpianMapper;
-import com.example.springboot.security.constant.SystemConstant;
-import com.example.springboot.security.util.JwtUtil;
-import com.example.springboot.security.util.SecurityUtil;
 import com.example.springboot.service.HomeService;
 import com.example.springboot.service.JdbcConnections;
 import com.example.springboot.service.North_Glass_Buffer1Service;
 import com.example.springboot.service.OutSliceServive;
-import com.example.springboot.service.PermissionService;
 import com.example.springboot.service.SpianService;
-
-import cn.hutool.core.util.StrUtil;
+import com.example.springboot.service.StorageCageService;
 
 import com.example.springboot.common.Result;
 import com.example.springboot.component.Plchome;
-import com.example.springboot.component.S7control;
 import com.example.springboot.entity.CarPosition;
 import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.StorageTask;
-import com.example.springboot.entity.User;
 import com.example.springboot.entity.alarmmg;
 import com.example.springboot.entity.north_glass_buffer1;
 import com.example.springboot.entity.Out_slice;
-import com.example.springboot.entity.Permission;
 import com.example.springboot.entity.Queue;
 import com.example.springboot.entity.RolePermission;
 
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 @RestController
 @RequestMapping("/home")
 public class HomeController {
   @Autowired
-  static
+ 
   HomeMapper homeMapper;
 
   @Autowired
   HomeService storageRackService;
 
   @Autowired
-  static
   SpianService spianService;
 
   @Autowired
   SpianMapper spianMapper;
 
   @Autowired
-  static
   OutSliceServive outSliceServive;
+
+  @Autowired
+  StorageCageService StorageCageService;
 
   @Autowired
   North_Glass_Buffer1Service north_Glass_Buffer1Service;
@@ -142,44 +128,18 @@
 
   // 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟 缁堟杩涚墖/鍑虹墖浠诲姟
   @GetMapping("/UpdateTask")
-  public static Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+  public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+    StorageCageService.UpdateTask(types, shelfrack, glassid);
     Map<String, Object> map = new HashMap<>();
-    if (types == 0) {// 瀹屾垚杩涚墖
-      spianService.overtask(glassid);
-    } else if (types == 1) {// 瀹屾垚鍑虹墖
-      spianService.overtask(glassid);
-    } else if (types == 2) {// 缁堟杩涚墖浠诲姟
-      outSliceServive.StopTask(glassid, 0);
-      // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
-    } else {// 缁堟鍑虹墖浠诲姟
-      outSliceServive.StopTask(glassid, 1);
-    }
     map.put("message3", "200");
     return Result.success(map);
   }
 
   //缁堟杩涚墖/鍑虹墖浠诲姟
   @GetMapping("/EndTask")
-  public static Result EndTask(int types) {
-     if (types == 0) {// 缁堟杩涚墖浠诲姟
-      List<StorageTask> cageList = homeMapper.SelectTaskByState(types);
-      for (StorageTask storageTask : cageList) {
-        outSliceServive.StopTask(storageTask.getGlassId(), types);  
-      }
-      // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙�
-    } else {// 缁堟鍑虹墖浠诲姟
-      List<StorageCage> storageCages =homeMapper.selectinout(types);
-      for (StorageCage storageCage : storageCages) {
-        List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId());
-        for (StorageCage storageCagez : storageCagess) {
-          if (storageCagez.getState().equals("2")) {//璋冩嫧杩涚墖
-            outSliceServive.StopTask(storageCagez.getGlassId(), 0);
-          }else{//鍑虹墖
-            outSliceServive.StopTask(storageCagez.getGlassId(), types);
-          }
-        }
-      }
-    }
+  public Result EndTask(int types) {
+    StorageCageService.EndTask(types);
+     
     Map<String, Object> map = new HashMap<>();
     map.put("message3", "200");
     return Result.success(map);

--
Gitblit v1.8.0