From 70f2265af5c8ec078ef2a7be65dd7229ab5f2924 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 10:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

---
 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 64025c1..d80bf8e 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);
     }
     

--
Gitblit v1.8.0