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 | 22 +++-------------------
1 files changed, 3 insertions(+), 19 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 9c90c63..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,44 +5,28 @@
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 com.example.springboot.service.StorageCageService;
-import cn.hutool.core.util.StrUtil;
-
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")
@@ -64,7 +48,7 @@
OutSliceServive outSliceServive;
@Autowired
- StorageCageService storageCageService;
+ StorageCageService StorageCageService;
@Autowired
North_Glass_Buffer1Service north_Glass_Buffer1Service;
@@ -145,7 +129,7 @@
// 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟 缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
- storageCageService.UpdateTask(types, shelfrack, glassid);
+ StorageCageService.UpdateTask(types, shelfrack, glassid);
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
@@ -154,7 +138,7 @@
//缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/EndTask")
public Result EndTask(int types) {
- storageCageService.EndTask(types);
+ StorageCageService.EndTask(types);
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
--
Gitblit v1.8.0