From d426473660914f321ba593cf7f2203d4bb2d3d7c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 23 四月 2024 23:19:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index f7eff5d..4b555fa 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -63,9 +63,6 @@
JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(1000);
-
- String s1=S7controlalbia.getinstance().readStrings("DB14.38");
- String s2=S7controlalbia.getinstance().readStrings("DB14.40");
// 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
@@ -274,7 +271,6 @@
boolean D01ResponseState = D01respnse.contains((short) 1);
// jsonObject.append("D01RequestState", D01RequestState);
// 鑷姩杩涚墖
- isConfirm = true;
if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390
|| form3.getglassheight() > 1810
--
Gitblit v1.8.0