From 28ded8102d83cf74bc232d1cdfc89b7f22c41952 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 03 十二月 2024 09:09:31 +0800
Subject: [PATCH] 增加点击防抖事件 增加笼子使用详情的计算优化。 增加数据推送时的报错处理 测量台交互逻辑增加 参数界面增加翻转加减速度
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 insertions(+), 13 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 8d9154f..6f8a991 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
@@ -491,10 +491,15 @@
return Result.success(map);
}
- // 鍒囨崲PLC鑾峰彇浜岀淮鐮佹柟寮�
+ // 鏇存敼绗煎瓙鏁伴噺
@PostMapping("/UpdateStroageCageByCell")
public Result UpdateStroageCageByCell(Integer cell, Integer num) {
- return storageCageService.UpdateStroageCageByCell(cell, num);
+ return storageCageService.UpdateStroageCageByCells(cell, num);
+ }
+
+ @PostMapping("/AddOutGlass")
+ public Result AddOutGlass(Integer cell, Integer glasstype) {
+ return storageCageService.AddOutGlass(cell, glasstype);
}
// 鎵嬪姩瀹屾垚浠诲姟
@@ -502,16 +507,17 @@
public Result FinishTask(Integer id) {
return storageCageService.FinishTask();
}
- // 鎵嬪姩缁撴潫浠诲姟
- @PostMapping("/TerminateTask")
- public Result TerminateTask(Integer id) {
- return storageCageService.TerminateTask(id);
- }
+
+ // 鎵嬪姩缁撴潫浠诲姟
+ @PostMapping("/TerminateTask")
+ public Result TerminateTask(Integer id) {
+ return storageCageService.TerminateTask(id);
+ }
// 鏌ヨ鐜荤拑淇℃伅
@PostMapping("/SelectGlassInfo")
- public Result SelectGlassInfo(String width, String height, String thickness, String films) {
- return storageCageService.SelectGlassInfo(width, height, thickness, films);
+ public Result SelectGlassInfo(String width, String height, String thickness, String films, String tier) {
+ return storageCageService.SelectGlassInfo(width, height, thickness, films, tier);
}
// 娣诲姞鐜荤拑淇℃伅鍒扮瀛�
@@ -546,8 +552,14 @@
// 寮�濮嬪伐绋�
@PostMapping("/StartChange")
- public Result StartChange(String flowcard,int orderstate) {
- return storageCageService.StartChange(flowcard,orderstate);
+ public Result StartChange(String flowcard, Integer orderstate) {
+ return storageCageService.StartChange(flowcard, orderstate);
+ }
+
+ // 寮�濮�/鏆傚仠鍑虹墖闃熷垪
+ @PostMapping("/UpdateOutTask")
+ public Result UpdateOutTask(Integer id, Integer state) {
+ return storageCageService.UpdateOutTask(id, state);
}
// 閲嶆柊娴嬮噺
@@ -569,11 +581,75 @@
return storageCageService.deleteTasks(num);
}
+ // 鍒犻櫎鍑虹墖闃熷垪
+ @PostMapping("/DeleteOutTask")
+ public Result DeleteOutTask(Integer id) {
+ System.out.println("鎺у埗鍣�:" + id);
+ return storageCageService.DeleteOutTask(id);
+ }
+
// 淇濆瓨鑶滅郴璁剧疆
@PostMapping("/SaveMeasure")
public Result SaveMeasure(String films, Integer thickness) {
- System.out.println("鎺у埗鍣�:" + films+thickness);
- return storageCageService.SaveMeasure(films,thickness);
+ System.out.println("鎺у埗鍣�:" + films + thickness);
+ return storageCageService.SaveMeasure(films, thickness);
}
+ @GetMapping("/writeValue")
+ public Result writeValue(String address, float value, String type) {
+
+ if ("0".equals(type)) {
+ System.err.println("鍐欏叆word" + address + "+" + value);
+ S7control.getinstance().WriteWord(address, (short) value);
+ } else if ("1".equals(type)) {
+ System.err.println("鍐欏叆float" + address + "+" + value);
+ S7control.getinstance().writeFloat32(address, value);
+ } else if ("2".equals(type)) {
+ Boolean boolvue;
+ if (value == 0) {
+ boolvue = false;
+ } else {
+ boolvue = true;
+ }
+ S7control.getinstance().WriteBit(address, boolvue);
+ System.err.println("鍐欏叆bit" + address + "+" + boolvue);
+ } else {
+ S7control.getinstance().writetime(address, (long) value);
+ System.err.println("鍐欏叆time" + address + "+" + value);
+ }
+
+ try {
+ TimeUnit.MILLISECONDS.sleep(300);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // S7control.getinstance().WriteBit(address, false);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ @GetMapping("/writeButton")
+ public Result writeButton(String address, float value, String type) {
+ String pd = String.valueOf(S7control.getinstance().ReadBits(address, 1).get(0));
+ if ("true".equals(pd)) {
+ System.err.println("鍐欏叆bit" + address + "+" + false);
+ S7control.getinstance().WriteBit(address, false);
+ } else {
+ System.err.println("鍐欏叆bit" + address + "+" + true);
+ S7control.getinstance().WriteBit(address, true);
+ }
+ if(value==0){
+ System.err.println("鍐欏叆bit" + address + "+" + false);
+ // S7control.getinstance().WriteBit(address, false);
+ }else{
+ System.err.println("鍐欏叆bit" + address + "+" + true);
+ // S7control.getinstance().WriteBit(address, true);
+ }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0