From 09fe50d59e2f1e2261d376eb49ad6c40301f25b4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 五月 2024 16:08:59 +0800
Subject: [PATCH] 修改IP与数据库连接

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java |   88 +++++++++++++++++++++++--------------------
 1 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 54d6a6d..99f639c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -15,6 +16,7 @@
 
 import com.example.springboot.mapper.AlarmMapper;
 
+@Slf4j
 public class Plcalarm extends Thread {
   private AlarmMapper alarmMapper;
 
@@ -28,7 +30,7 @@
     FileInputStream fileInputStream;
     try {
       // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
-      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Alarm.json");
+      fileInputStream = new FileInputStream("D:/canadames/Alarm.json");
       // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙g爜涓哄瓧绗�
       InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
       // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
@@ -78,16 +80,12 @@
     while (this != null) {
       try {
         Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-
-//      this.readValue();
-//      String PlcAddress = this.name;
-//      Integer Plccount = this.count;
+        this.readValue();
+      String PlcAddress = this.name;
+      Integer Plccount = this.count;
 
       // 鏍规嵁鍦板潃璇诲彇PCL鏁版嵁
-      List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", 71);
+      List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", Plccount);
 //      List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
       // System.out.println(plclist);
       // Boolean[] values = { false, false, true, false, true, false, true, false,
@@ -101,42 +99,50 @@
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.append("params", plclist);
-        WebSocketServer sendwServer = WebSocketServer.sessionMap.get("alarm");
+        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("alarm");
         if (sendwServer != null) {
-          sendwServer.sendMessage(jsonObject.toString());
-        }
+          for (WebSocketServer webserver : sendwServer) {
+            webserver.sendMessage(jsonObject.toString());
 
-        // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
-        List<Integer> Intlist = new ArrayList<>();
-        for (Boolean value : plclist) {
-          Intlist.add(value == true ? 1 : 0);
-
-        }
-
-        // 灏咺ntlist杞崲涓烘暟缁�
-        // System.out.println(Intlist);
-        Integer[] shuzu1 = Intlist.toArray(new Integer[0]);
-
-        // 瀹氫箟鐨勬姤璀﹀唴瀹规暟缁�,鑾峰彇json杩斿洖鐨勯泦鍚�
-        List<String> myCollection;
-        myCollection = readValue();
-        String[] array1 = myCollection.toArray(new String[myCollection.size()]);
-
-        alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
-        for (short i = 0; i < array1.length; i++) {
-          // 鏌ヨ瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁�
-          short result = alarmMapper.selectnullti(array1[i]);
-          // 璇诲彇鍒癙LC鐨勫�间负1骞朵笖瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁扮殑鏉℃暟涓�0
-          // System.out.println(result);
-          if (shuzu1[i] == 1 && result == 0) {
-            // 濉姞涓�鏉℃姤璀︿俊鎭�,鏈夊紑濮嬫椂闂�
-            // alarmMapper.Insertalarm(array1[i]);
-          } else if (shuzu1[i] == 0 && result > 0) {
-            // 淇敼璇ユ潯鎶ヨ淇℃伅鐨勭粨鏉熸椂闂�
-            alarmMapper.updatealarm(array1[i]);
           }
+
         }
+            // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
+            List<Integer> Intlist = new ArrayList<>();
+            for (Boolean value : plclist) {
+              Intlist.add(value == true ? 1 : 0);
+
+            }
+
+            // 灏咺ntlist杞崲涓烘暟缁�
+//             System.out.println(Intlist);
+//     System.out.println(Intlist.toArray().length);
+            Integer[] shuzu1 = Intlist.toArray(new Integer[0]);
+
+            // 瀹氫箟鐨勬姤璀﹀唴瀹规暟缁�,鑾峰彇json杩斿洖鐨勯泦鍚�
+            List<String> myCollection;
+            myCollection = readValue();
+            String[] array1 = myCollection.toArray(new String[myCollection.size()]);
+            //  System.out.println(array1.length);
+            alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
+            for (short i = 0; i < array1.length; i++) {
+              // 鏌ヨ瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁�
+              short result = alarmMapper.selectnullti(array1[i]);
+              // 璇诲彇鍒癙LC鐨勫�间负1骞朵笖瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁扮殑鏉℃暟涓�0
+    //System.out.println(result);
+              if (shuzu1[i] == 1 && result == 0) {
+                // 濉姞涓�鏉℃姤璀︿俊鎭�,鏈夊紑濮嬫椂闂�
+                alarmMapper.Insertalarm(array1[i]);
+              } else if (shuzu1[i] == 0 && result > 0) {
+                // 淇敼璇ユ潯鎶ヨ淇℃伅鐨勭粨鏉熸椂闂�
+                alarmMapper.updatealarm(array1[i]);
+              }
+            }
+          }
+      } catch (InterruptedException e) {
+        e.printStackTrace();
       }
+
     }
   }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0