From cdc594d12e46b7dd2e37c7a2071c133f8404f9be Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 12 九月 2023 18:25:55 +0800
Subject: [PATCH] 测试代码,部分代码进行优化

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java |  132 +++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 67 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 91b1802..7e9a4fa 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
@@ -20,79 +20,77 @@
       }
 
       List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.DBx0.0", 40);
+      if (plclist == null) {
 
-      if(plclist==null){
+      } else {
 
-      }else{
+        JSONObject jsonObject = new JSONObject();
 
-      
-      JSONObject jsonObject = new JSONObject();
+        jsonObject.append("params", plclist);
+        WebSocketServer sendwServer = WebSocketServer.sessionMap.get("alarm");
+        if (sendwServer != null) {
+          sendwServer.sendMessage(jsonObject.toString());
+        }
+        // 灏嗚鍙杙lc鏁版嵁鐨刾lclist杞崲涓烘暟缁�
+        Short[] shuzu1 = plclist.toArray(new Short[0]);
+        // Short[] shuzu1 = {
+        // 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
+        // 1, 0, 1, 0, 0,
+        // 1, 0, 1, 0, 1, 0, 1, 0, 1,
+        // };
 
-      jsonObject.append("params", plclist);
-      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("alarm");
-      if (sendwServer != null) {
-        sendwServer.sendMessage(jsonObject.toString());
-      }
-
-      Short[] shuzu1 = plclist.toArray(new Short[0]);
-      // Short[] shuzu1 = {
-      // 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-      // 1, 0, 1, 0, 0,
-      // 1, 0, 1, 0, 1, 0, 1, 0, 1,
-      // };
-
-      String[] shuzu = {
-          "D01 VFD error",
-          "D02 VFD error",
-          "D03 VFD error",
-          "D04 VFD error",
-          "D05 VFD error",
-          "D06 VFD error",
-          "B01 VFD error",
-          "B02 VFD error",
-          "A01 VFD error",
-          "A02 VFD error",
-          "A01 servo turn error",
-          "A02 servo turn error",
-          "A01 servo travel error",
-          "A02 servo travel error",
-          "B01 servo travel error",
-          "B02 servo travel error",
-          "D01 DEC error",
-          "D01 pos error",
-          "D02 DEC error",
-          "D02 pos error",
-          "D03 DEC error",
-          "D03 pos error",
-          "D04 DEC error",
-          "D04 pos error",
-          "D05 DEC error",
-          "D05 pos error",
-          "D06 DEC error",
-          "D06 pos error",
-          "A01 DEC error",
-          "A01 pos error",
-          "A02 DEC error",
-          "A02 pos error",
-          "B01 IN DEC error",
-          "B01 IN pos error",
-          "B01 OUT DEC error",
-          "B01 OUT pos error",
-          "B02 IN DEC error",
-          "B02 IN pos error",
-          "B02 OUT DEC error",
-          "B02 OUT pos error",
-      };
-      alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
-      for (short i = 0; i < shuzu1.length; i++) {
-        short result = alarmMapper.selectnullti(shuzu[i]);
-        if (shuzu1[i] == 1 && result == 0) {
-          // alarmMapper.Insertalarm(shuzu[i]);
-        } else if (shuzu1[i] == 0 && result > 0) {
-          // alarmMapper.updatealarm(shuzu[i]);
+        String[] shuzu = {
+            "D01 VFD error",
+            "D02 VFD error",
+            "D03 VFD error",
+            "D04 VFD error",
+            "D05 VFD error",
+            "D06 VFD error",
+            "B01 VFD error",
+            "B02 VFD error",
+            "A01 VFD error",
+            "A02 VFD error",
+            "A01 servo turn error",
+            "A02 servo turn error",
+            "A01 servo travel error",
+            "A02 servo travel error",
+            "B01 servo travel error",
+            "B02 servo travel error",
+            "D01 DEC error",
+            "D01 pos error",
+            "D02 DEC error",
+            "D02 pos error",
+            "D03 DEC error",
+            "D03 pos error",
+            "D04 DEC error",
+            "D04 pos error",
+            "D05 DEC error",
+            "D05 pos error",
+            "D06 DEC error",
+            "D06 pos error",
+            "A01 DEC error",
+            "A01 pos error",
+            "A02 DEC error",
+            "A02 pos error",
+            "B01 IN DEC error",
+            "B01 IN pos error",
+            "B01 OUT DEC error",
+            "B01 OUT pos error",
+            "B02 IN DEC error",
+            "B02 IN pos error",
+            "B02 OUT DEC error",
+            "B02 OUT pos error",
+        };
+        alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
+        for (short i = 0; i < shuzu1.length; i++) {
+          short result = alarmMapper.selectnullti(shuzu[i]);
+          if (shuzu1[i] == 1 && result == 0) {
+            alarmMapper.Insertalarm(shuzu[i]);
+          } else if (shuzu1[i] == 0 && result > 0) {
+            alarmMapper.updatealarm(shuzu[i]);
+          }
         }
       }
-    }
     }
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0