From de6afc2ec06724885de7cc0eb8b8cad61f8c0b3b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 07 十二月 2023 08:32:41 +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 | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 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 99f4c1c..1f3445c 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,24 +5,42 @@
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.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.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")
@@ -40,7 +58,22 @@
SpianMapper spianMapper;
@Autowired
+ OutSliceServive outSliceServive;
+
+ @Autowired
+ North_Glass_Buffer1Service north_Glass_Buffer1Service;
+
+ @Autowired
private JdbcConnections jdbcConnections;
+
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鏉冮檺
+ @GetMapping("/SelectPermissionByUserName")
+ public Result SelectPermissionByUserName(String username) {
+ Map<String, Object> map = new HashMap<>();
+ List<RolePermission> permission = homeMapper.SelectPermissionByUserName(username);
+ map.put("permission", permission);
+ return Result.success(map);
+ }
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
@@ -54,6 +87,7 @@
// 鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
@GetMapping("/loads")
public Result selectRack() {
+
List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
@@ -157,8 +191,11 @@
if (result == null) {
north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+ String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+ int sequence = homeMapper.SelectMaxSquence();
homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
- north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString());
+ north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
+ sequence, position);
map.put("message2", "200");
} else {
map.put("message2", "500");
@@ -273,12 +310,8 @@
// 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
@PostMapping("/SelectAluminumFrameInfoById")
public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
- List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdss(FrameBarcode);
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
- for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
- north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
- north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
- }
+ List<north_glass_buffer1> listAluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
Map<String, Object> map = new HashMap<>();
map.put("listAluminumFrame", listAluminumFrame);
map.put("flip", flip);
@@ -303,21 +336,17 @@
// 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
- public Result DeleteProductionQueueGlass(Short id) {
- homeMapper.DeleteProductionQueueGlass(id);
+ public Result DeleteProductionQueueGlass(String FrameNo) {
+ homeMapper.DeleteProductionQueueGlass(FrameNo);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
}
- // 娣诲姞鍑虹墖
+ // 娣诲姞閾濇id瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
@PostMapping("/AddOutSliceS")
- public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) {
- for (String[] item : AluminumFrames) {
- if (item[1] == "true") {
- homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5]);
- }
- }
+ public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws SQLException {
+ outSliceServive.AddOutSliceS(AluminumFrames);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -326,14 +355,21 @@
// 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
@PostMapping("/isAllowQueues")
public Result isAllowQueues(Boolean isAllowQueue, @RequestBody List<Out_slice> out_slice) {
-
Plchome.isAllowQueue = isAllowQueue;
if (isAllowQueue == true) {
for (Out_slice out_slice2 : out_slice) {
- homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(),out_slice2.getSequence());
+ homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(), out_slice2.getSequence());
}
}
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+ // 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
+ @PostMapping("/isConfirmStates")
+ public Result isConfirmStates(Boolean isConfirmStates) {
+ Plchome.isConfirm = isConfirmStates;
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
--
Gitblit v1.8.0