From 209a57aecbf26911f6a3ae0692b51ed0289f5b1a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 九月 2023 17:04:56 +0800
Subject: [PATCH] 优化理片笼逻辑
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 138 ++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 66 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..f45650a 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
@@ -3,6 +3,7 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import com.example.springboot.mapper.AlarmMapper;
@@ -20,79 +21,84 @@
}
List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.DBx0.0", 40);
+ // Boolean[] values = { true, false, true, false, true, false, true, false,
+ // true, false, true, false, true, false,
+ // true, false, true, false, true, false, true, false, true, false, true, false,
+ // true, false, true, false, true,
+ // false, true, false, true, false,
+ // true, false, true, false };
+ // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+ if (plclist != null) {
- if(plclist==null){
+ JSONObject jsonObject = new JSONObject();
- }else{
+ jsonObject.append("params", plclist);
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("alarm");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
-
- JSONObject jsonObject = new JSONObject();
+ // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
+ List<Integer> Intlist = new ArrayList<>();
+ for (Boolean value : plclist) {
+ Intlist.add(value == true ? 1 : 0);
- jsonObject.append("params", plclist);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("alarm");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ }
+ // 灏咺ntlist杞崲涓烘暟缁�
+ Integer[] shuzu1 = Intlist.toArray(new Integer[0]);
- 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 < shuzu.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