From 6bf8a537012962b8eb7daef698da1cc46b8310f6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 九月 2023 09:52:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 d391d59..91b1802 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
@@ -21,6 +21,11 @@
List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.DBx0.0", 40);
+ if(plclist==null){
+
+ }else{
+
+
JSONObject jsonObject = new JSONObject();
jsonObject.append("params", plclist);
@@ -84,9 +89,10 @@
if (shuzu1[i] == 1 && result == 0) {
// alarmMapper.Insertalarm(shuzu[i]);
} else if (shuzu1[i] == 0 && result > 0) {
- alarmMapper.updatealarm(shuzu[i]);
+ // alarmMapper.updatealarm(shuzu[i]);
}
}
}
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0