From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +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 | 119 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 39 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..dbe13fa 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();
@@ -106,7 +140,7 @@
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types);
+ homeMapper.UpdateTask(types,glassid);
StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
@@ -157,9 +191,22 @@
if (result == null) {
north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
- homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
- north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString());
- map.put("message2", "200");
+ if (flip != null) {
+ String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+ if (position != null) {
+ int sequence = homeMapper.SelectMaxSquence();
+ homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
+ north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
+ sequence, position);
+ map.put("message2", "200");
+ } else {
+ map.put("message2", "300");
+ }
+
+ } else {
+ map.put("message2", "400");
+ }
+
} else {
map.put("message2", "500");
}
@@ -214,6 +261,7 @@
} else {
homeMapper.Inglassid(queue, cage, cell, tier);
spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
+ map.put("message", "200");
}
return Result.success(map);
}
@@ -236,8 +284,10 @@
map.put("message", "300");
} else {
homeMapper.InsertQueueGlassId(queue, id);
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianService.selectAll(queue.getglassId());
+ if (id == 1) {
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianService.selectAll(queue.getglassId());
+ }
map.put("message", "200");
}
return Result.success(map);
@@ -273,51 +323,27 @@
// 鏍规嵁閾濇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);
return Result.success(map);
}
- // 鏌ヨ鍑虹墖闃熷垪鏁版嵁
- @PostMapping("/SelectProductionqueue")
- public Result SelectProductionqueue() throws SQLException {
- List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
- for (Out_slice out_slice : listoutslice) {
- out_slice
- .setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
- out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
- }
- Map<String, Object> maps = new HashMap<>();
- maps.put("listoutslice", listoutslice);
- // Plchome.isAllowQueue=false;
- return Result.success(maps);
-
- }
-
// 鏍规嵁鐜荤拑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,16 +352,31 @@
// 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
@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);
+ }
+
+ //鎵嬪姩瀹屾垚浠诲姟
+ @PostMapping("/CompleteQueue")
+ public Result CompleteQueue(String id,String frameid,String glassid) {
+ return outSliceServive.CompleteQueue(id,frameid,glassid);
+
+ }
+
}
--
Gitblit v1.8.0