From ea46f28356e2acb3bc7cc69b9af3c52fab38c0b0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 16:56:47 +0800
Subject: [PATCH] 终止任务功能测试
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 99 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 18 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 3884738..f2f32ee 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
@@ -4,7 +4,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +17,9 @@
import com.example.springboot.service.SpianService;
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.alarmmg;
@@ -34,11 +34,7 @@
@RequestMapping("/home")
public class HomeController {
@Autowired
-
HomeMapper homeMapper;
-
- @Autowired
- HomeService storageRackService;
@Autowired
SpianService spianService;
@@ -138,11 +134,11 @@
return Result.success(map);
}
- //缁堟杩涚墖/鍑虹墖浠诲姟
+ // 缁堟杩涚墖/鍑虹墖浠诲姟
@GetMapping("/EndTask")
public Result EndTask(int types) {
storageCageService.EndTask(types);
-
+
Map<String, Object> map = new HashMap<>();
map.put("message3", "200");
return Result.success(map);
@@ -183,15 +179,18 @@
if (result == null) {
north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+
if (flip != null) {
String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
if (position != null) {
+ String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+ String frameheight = jdbcConnections.SelectFrameHeightByFrameBarcode(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(),
sequence, position, (short) 0, north_glass_buffer1.getordernumber(), north_glass_buffer1.getlistnumber(),
north_glass_buffer1.getboxnumber(), north_glass_buffer1.getglasslength().toString(),
- north_glass_buffer1.getglassheight().toString());
+ north_glass_buffer1.getglassheight().toString(), framelength, frameheight);
map.put("message2", "200");
} else {
map.put("message2", "300");
@@ -321,9 +320,9 @@
@PostMapping("/SelectAluminumFrameInfoById")
public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
- List<north_glass_buffer1> listAluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
+ List<north_glass_buffer1> AluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
Map<String, Object> map = new HashMap<>();
- map.put("listAluminumFrame", listAluminumFrame);
+ map.put("AluminumFrame", AluminumFrame);
map.put("flip", flip);
return Result.success(map);
}
@@ -341,7 +340,8 @@
// 娣诲姞閾濇id瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
@PostMapping("/AddOutSliceS")
public Result AddOutSliceS(String FrameNo) throws SQLException {
- //public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws SQLException {
+ // public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
+ // SQLException {
north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -353,9 +353,10 @@
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());
- // }
+ // for (Out_slice out_slice2 : out_slice) {
+ // homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(),
+ // out_slice2.getSequence());
+ // }
// }
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -393,9 +394,71 @@
// 鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/FrameStateUpdate")
- public Result FrameStateUpdate(String frameno, String framestate) {
- return outSliceServive.FrameStateUpdate(frameno, framestate);
+ public Result FrameStateUpdate(String frameno) {
+ return outSliceServive.FrameStateUpdate(frameno);
}
-
+
+ // 鎵嬪姩鍐欏叆plc鎵爜浣嶇幓鐠僫d
+ @PostMapping("/WriteGlassID")
+ public Result WriteGlassID(String glassid) {
+ // 鎵爜浣嶅啓鍏ョ幓鐠僫d
+ spianService.outmesid(glassid, "DB103.286");
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 娓呴櫎鎸囧畾浣嶇疆id
+ @PostMapping("/ClearGlassId")
+ public Result ClearGlassId(String position, String glassid) {
+ return storageCageService.ClearGlassId(position, glassid);
+ }
+
+ // 娓呴櫎寰呯‘璁ら摑妗嗕俊鎭�
+ @PostMapping("/CloseForm7")
+ public Result CloseForm7() {
+ Plchome.AluminumFrame = null;
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 缁堟杩�/鍑虹墖浠诲姟
+ @PostMapping("/TaskStop")
+ public Result TaskStop(Short num) {
+ storageCageService.EndTask(num);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 杞�ュ仠
+ @PostMapping("/SoftEmergencyStop")
+ public Result SoftEmergencyStop(Short num) {
+ String position = "DB101.11.3";
+ Map<String, Object> map = new HashMap<>();
+ if (S7control.getinstance().CheckConnected() == true) {
+ S7control.getinstance().WriteBit(position, false);
+ try {
+ TimeUnit.MILLISECONDS.sleep(300);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ S7control.getinstance().WriteBit(position, true);
+ map.put("message", "200");
+ } else {
+ map.put("message", "300");
+ }
+ return Result.success(map);
+ }
+
+ // 鍒囨崲PLC鑾峰彇浜岀淮鐮佹柟寮�
+ @PostMapping("/SwitchScanMethod")
+ public Result SwitchScanMethod(Boolean scansmethod) {
+ S7control.getinstance().WriteBit("DB101.11.4", scansmethod);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0