From 328f9b1f7a046378ef5d8f2b8337770fff372cc7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 26 十月 2024 19:12:07 +0800
Subject: [PATCH] 更新测试后代码
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 b2fa075..3cb75d4 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
@@ -61,14 +61,20 @@
@Autowired
private JdbcConnections jdbcConnections;
- // 鍐欏叆word
@GetMapping("/WriteWord")
- public Result WriteWord(String address,float value) {
- System.err.println("鍐欏叆word"+address+"+"+value);
- if(address.equals("DB10.224")||address.equals("DB10.226")||address.equals("DB10.228")||address.equals("DB10.230")){
-
+ public Result WriteWord(String address,float value,String type) {
+
+ if("0".equals(type)){
+ System.err.println("鍐欏叆word"+address+"+"+value);
S7control.getinstance().WriteWord(address, (short)value);
- }else{
+
+ }
+ else if("3".equals(type)){
+ System.err.println("鍐欏叆time"+address+"+"+value);
+ S7control.getinstance().writetime(address, (long)value);
+ }
+ else{
+ System.err.println("鍐欏叆float"+address+"+"+value);
S7control.getinstance().writeFloat32(address, value);
}
@@ -410,7 +416,6 @@
map.put("message", "200");
return Result.success(map);
}
-
// 鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/CompleteQueue")
public Result CompleteQueue(String id, String frameid, String glassid) {
@@ -532,6 +537,12 @@
public Result ManualTake(@RequestBody String glassInfo) {
return storageCageService.ManualTake(glassInfo);
}
+
+ //寮�濮嬪伐绋�
+ @PostMapping("/StartChange")
+ public Result StartChange(String flowcard) {
+ return storageCageService.StartChange(flowcard);
+ }
//閲嶆柊娴嬮噺
@PostMapping("/AnewMeasure")
public Result AnewMeasure(@RequestBody String glassInfo) {
@@ -542,4 +553,9 @@
public Result importData(@RequestBody List<Map> IportDataStr) {
return storageCageService.AddGlassinfo(IportDataStr);
}
+ //鍒犻櫎璁㈠崟
+ @PostMapping("/deleteTasks")
+ public Result deleteTasks(@RequestBody String flowcard){
+ return storageCageService.deleteTasks(flowcard);
+ }
}
--
Gitblit v1.8.0