From a609def9badafcb8e8ffa97e8d54962271b1e108 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 28 六月 2025 09:30:27 +0800
Subject: [PATCH] rgv功能完善
---
src/main/java/com/zy/core/thread/RgvThread.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 +++++++----
src/main/webapp/views/index.html | 50 ++++++++++++------------
src/main/resources/license.lic | 0
src/main/resources/application.yml | 4 +
5 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8bcef14..e3369a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -377,7 +377,12 @@
runRgv:
for (WrkMast wrkMast : wrkMasts) {
- BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getRgvSstaNo())); // 绔欑偣
+ Integer rgvSstaNo = wrkMast.getRgvSstaNo();
+ // 1090锛�1089,1086,1083 鎸�1083绔欑偣浣嶇疆璁＄畻锛岃兘鍙�1083锛屽氨鑳藉彇1090锛�1089锛�1086锛岄伩鍏嶄换鍔″欢杩熶笅鍙戞柟妗堜竴鐩寸粰1083鍙�
+ if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086) {
+ rgvSstaNo = 1083;
+ }
+ BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", rgvSstaNo)); // 绔欑偣
long position = basDevpPositions.getPlcPosition(); // 璧峰绔欎綅缃�
TreeMap<Long, RgvProtocol> map = new TreeMap<>();
for (RgvProtocol rgvProtocol : rgvProtocolList) {
@@ -389,13 +394,13 @@
}
map.put(distance, rgvProtocol);
}
- log.info("鍙栬揣绔欑偣锛歿}锛屽悗闈㈠皬杞︽帓搴�", basDevpPositions.getDevNo());
- StringBuilder sb = new StringBuilder();
- for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
- RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
- sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
- }
- log.info(sb.toString());
+// log.info("鍙栬揣绔欑偣锛歿}锛屽悗闈㈠皬杞︽帓搴�", basDevpPositions.getDevNo());
+// StringBuilder sb = new StringBuilder();
+// for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
+// RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
+// sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
+// }
+// log.info(sb.toString());
for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
RgvProtocol rgvProtocol = rgvProtocolMap.getValue(); // 鏈�杩戣窛绂诲皬杞�
@@ -562,7 +567,7 @@
log.error("灏忚溅澶嶄綅RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}", rgvNo);
return false;
} else {
- log.info("RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}", rgvNo);
+ log.info("灏忚溅澶嶄綅RGV鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}", rgvNo);
return true;
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 723db3e..2225e69 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -275,7 +275,7 @@
Thread.sleep(100L);
result = siemensNet.Write("DB24.10.0", true);
} else {
- siemensNet.Write("DB24.10.1", true);
+ result = siemensNet.Write("DB24.10.1", true);
log.info("浠诲姟瀹屾垚鍚庡浣嶆竻闄gv淇℃伅锛氬皬杞﹀彿锛歿}锛宎ck:{}", command.getRgvNo(),command.getAckFinish1());
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0d8d9a5..d95c602 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,9 +6,11 @@
spring:
application:
name: @pom.build.finalName@
+ jmx:
+ enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.2.201:1433;databasename=mdqzasrs
+ url: jdbc:sqlserver://192.168.2.203:1433;databasename=mdqzasrs
# url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
username: sa
password: sa@123
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index df70474..00182a4 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 647f504..7548540 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -5,7 +5,7 @@
<title>鐜舰绌挎杞︽櫤鑳界郴缁�</title>
<link rel="stylesheet" href="../static/css/element.css">
<link rel="stylesheet" href="../static/css/element-ui.css">
- <link rel="icon" href="../static/images/favicon.ico" type="image/x-icon">
+<!-- <link rel="icon" href="../static/images/favicon.ico" type="image/x-icon">-->
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/vue.min.js"></script>
@@ -295,18 +295,18 @@
prop="rgvSts"
label="RGV鐘舵��">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- type="template">
- <template slot-scope="scope">
- <el-button
- type="danger"
- size="small"
- @click="taskDelete(scope.row)">
- 鍒犻櫎
- </el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- label="鎿嶄綔"-->
+<!-- type="template">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- size="small"-->
+<!-- @click="taskDelete(scope.row)">-->
+<!-- 鍒犻櫎-->
+<!-- </el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
</div>
@@ -350,18 +350,18 @@
prop="status$"
label="鐘舵��">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- type="template">
- <template slot-scope="scope">
- <el-button
- :type="scope.row.status === 0 ? 'primary' : 'danger'"
- size="small"
- @click="toggleStatus(scope.$index, scope.row)">
- {{ scope.row.status === 0 ? '绂佺敤' : '瑙ｉ櫎绂佺敤' }}
- </el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- label="鎿嶄綔"-->
+<!-- type="template">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-button-->
+<!-- :type="scope.row.status === 0 ? 'primary' : 'danger'"-->
+<!-- size="small"-->
+<!-- @click="toggleStatus(scope.$index, scope.row)">-->
+<!-- {{ scope.row.status === 0 ? '绂佺敤' : '瑙ｉ櫎绂佺敤' }}-->
+<!-- </el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
</div>
--
Gitblit v1.9.1