From e156048b1ea844434ca7675af45e37a2dfad6e8c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 16 六月 2025 14:18:55 +0800
Subject: [PATCH] rgv调度优化
---
src/main/java/com/zy/core/thread/RgvThread.java | 4 +---
src/main/java/com/zy/asrs/utils/Utils.java | 14 +++++++-------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/webapp/views/index.html | 16 +++++++++-------
4 files changed, 18 insertions(+), 18 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 2d3ea4a..86f45c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -300,7 +300,7 @@
continue;
}
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("rgv_no", rgvProtocol.getRgvNo()).eq("wrk_sts",9));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("rgv_no", rgvProtocol.getRgvNo()).eq("wrk_sts",10));
if (!wrkMasts.isEmpty()) {
continue;
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index eb4d949..abdce8f 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -186,26 +186,26 @@
// 绫诲瀷璇存槑锛�0-鐩寸嚎锛�1-鍦嗗姬锛堥渶瑕佸渾蹇冨潗鏍囷級
Object[][] intervals = {
// 鐩寸嚎鍖洪棿锛�0-134400锛�
- {0.0, 296680.0, 0, 350.0, 700.0, 1200.0, 700.0},
+ {0.0, 296680.0, 0, 400.0, 750.0, 1000.0, 750.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�-杞集-133锛変繚鎸佽礉濉炲皵鏇茬嚎
- {296680.0, 450865.0, 2, 1200.0, 700.0, 1200.0, 800.0, 1150.0, 650.0},
+ {296680.0, 450865.0, 2, 1000.0, 750.0, 1000.0, 700.0, 950.0, 725.0},
// 鐩寸嚎鍖洪棿
- {450865.0, 945407.0,0, 100.0, 800.0, 1200.0, 800.0},
+ {450865.0, 950000.0,0, 1000.0, 700.0, 100.0, 700.0},
// 鐩寸嚎鍖洪棿
- {450865.0, 1473370.0,0, 100.0, 800.0, 100.0, 100.0},
+ {950000.0, 1473370.0,0, 100.0, 700.0, 100.0, -40.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�112-椤剁偣锛夛紝鎺у埗鐐瑰亣璁句负(1215, 80)
- {1473370.0, 1550588.0,2, 0.0, 0.0, 100.0, 100.0,50.0,50.0},
+ {1473370.0, 1550588.0,2, 100.0, -40.0, 50.0, -40.0,75.0,-15.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�-椤剁偣-111锛夛紝鎺у埗鐐瑰亣璁句负(1164, 125)
// {1016193.0, 1063563.0,0, 1164.0, 80.0, 1115.0, 125.0},
// 鐩寸嚎鍖洪棿
- {1550588.0, 2068254.0,0, 0.0, 0.0, 0.0, 700.0},
+ {1550588.0, 2100000.0,0, 50.0, -40.0, 50.0, 750.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�101-杞集锛夛紝鎺у埗鐐瑰亣璁句负(1115, 750)
// {2068254.0, 2110201.0,2, 1115.0, 720.0, 1100.0, 750.0,0.0,0.0},
// 鐩寸嚎鍖洪棿
- {2110201.0, 2318250.0,0, 0.0, 700.0, 350.0, 700.0},
+ {2100000.0, 2318250.0,0, 50.0, 750.0, 400.0, 750.0},
};
for (Object[] interval : intervals) {
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 7b1e7f2..723db3e 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -214,9 +214,7 @@
array[4] = command.getTaskNo1();
OperateResult result = siemensNet.Write("DB24.0", array);
-
if (command.getAckFinish1().equals((short)0)) {
- Thread.sleep(100L);
result = siemensNet.Write("DB24.10.0", true);
} else {
siemensNet.Write("DB24.10.1", true);
@@ -243,7 +241,7 @@
} catch (Exception ignore) {}
if (result != null && result.IsSuccess) {
- Thread.sleep(200);
+ Thread.sleep(400);
this.readStatus();
log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b8dbdfd..9a152eb 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -138,7 +138,7 @@
}
.container {
width: 100vh;
- height: 72vh;
+ height: 90vh;
position: absolute;
/*background: #8c939d;*/
}
@@ -205,13 +205,15 @@
<!-- C 250,100 90,90 100,250 z"-->
<!-- style="fill:none; stroke:blue; stroke-width:4;" />-->
<path d="M 0 0
- L 80 0
- L 80 600
- L 800 600
- L 800 650
- L 0 650
+ L 32 -40
+ L 32 810
+ L 1100 810
+ L 1100 770
+ L 100 770
+ L 100 -40
+<!-- L 40 40-->
Z"
- style="fill:none; stroke:blue; stroke-width:4;" />
+ style="fill:none; stroke:blue; stroke-width:1;" />
</svg>
<!-- <div class="bus-station">-->
<!-- <div v-for="(item,i) in devpPos1" class="bus-item-top" :style="'left:' + (75 + i * 15) + 'px'">{{item.dev_no}}</div>-->
--
Gitblit v1.9.1