From fddf1c716af76c2968e08ce11895eaa1c26319a5 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 十一月 2024 14:43:21 +0800
Subject: [PATCH] 增加翻译文件和bug解决
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 0f14f82..e40202c 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
@@ -515,8 +515,8 @@
// 鏌ヨ鐜荤拑淇℃伅
@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);
}
// 娣诲姞鐜荤拑淇℃伅鍒扮瀛�
@@ -551,8 +551,13 @@
// 寮�濮嬪伐绋�
@PostMapping("/StartChange")
- public Result StartChange(String flowcard,int 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);
}
// 閲嶆柊娴嬮噺
@@ -573,7 +578,13 @@
System.out.println("鎺у埗鍣�:" + num);
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) {
@@ -581,4 +592,33 @@
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)) {
+ System.err.println("鍐欏叆bit" + address + "+" + value);
+ S7control.getinstance().WriteBit(address, true);
+ }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);
+ }
}
--
Gitblit v1.8.0