From 1930fa774bec2a088cc2cdb83dbf359168c6798f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 07 一月 2026 16:00:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 42 +++++++++++++++++++++++++++++-------------
src/main/java/com/zy/asrs/domain/vo/StationStatus.java | 13 +++++++++++++
src/main/resources/application.yml | 4 ++--
3 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/vo/StationStatus.java b/src/main/java/com/zy/asrs/domain/vo/StationStatus.java
new file mode 100644
index 0000000..f7b6ba6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/StationStatus.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StationStatus implements Serializable {
+
+ private String staNo;
+
+ private Boolean conveyable;
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index 2b2cdc4..259d514 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -1,9 +1,11 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.core.exception.CoolException;
import com.zy.asrs.controller.requestParam.StationRequestParam;
+import com.zy.asrs.domain.vo.StationStatus;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.News;
import com.zy.core.cache.MessageQueue;
@@ -142,16 +144,18 @@
return;
}
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && staProtocol.isPakMk()) {
- Integer workNo = staProtocol.getWorkNo();
- staProtocol.setWorkNo(0);
- staProtocol.setStaNo((short) 0);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- log.info("1007绔欑偣娓呯┖锛歿},{}", staProtocol.getWorkNo(), 1006);
- StaProtocol staProtocol1006 = devpThread.getStation().get(1006);
- staProtocol1006.setWorkNo(workNo);
- staProtocol1006.setStaNo((short) 1007);
- boolean result2 = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- log.info("1006绔欑偣寰�鍓嶈蛋涓�鏍硷細{},{}", staProtocol.getWorkNo(), 1007);
+ if (station(1007)) {
+ Integer workNo = staProtocol.getWorkNo();
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo((short) 0);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ log.info("1007绔欑偣娓呯┖锛歿},{}", staProtocol.getWorkNo(), 1006);
+ StaProtocol staProtocol1006 = devpThread.getStation().get(1006);
+ staProtocol1006.setWorkNo(workNo);
+ staProtocol1006.setStaNo((short) 1007);
+ boolean result2 = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ log.info("1006绔欑偣寰�鍓嶈蛋涓�鏍硷細{},{}", staProtocol.getWorkNo(), 1007);
+ }
}
}
@@ -173,14 +177,26 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- log.info("涓嬪彂浠诲姟杩斿洖鏁版嵁锛歿}", response);
- return true;
+ log.info("RCS杩斿洖鏁版嵁锛歿}", response);
+ JSONArray data = jsonObject.getJSONArray("data");
+ List<StationStatus> stationStatuses = JSONArray.parseArray(data.toString(), StationStatus.class);
+ for (StationStatus object : stationStatuses) {
+ if (object.getStaNo().equals(staNo + "")) {
+ if (object.getConveyable()) {
+ return true;
+ } else {
+ log.info("绔欑偣锛歿}鐘舵�佷笉瀵�", staNo);
+ return false;
+ }
+ }
+ }
+ log.info("鏈繑鍥炵珯鐐圭姸鎬侊細{}", staNo);
} else {
//log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ctuUrl + sendTask, JSON.toJSONString(openBusSubmitParam), response);
throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊");
}
} catch (Exception e) {
- //log.error("fail", e);
+ log.error("fail", e);
}
return false;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 076be0f..066f935 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,8 +15,8 @@
ctu:
- url: 10.10.10.200:8088
- station: /station/convey
+ url: 192.168.3.216:8088
+ station: /api/open/station/convey
locSync: /api/open/loc/sync
sendTask: /api/open/bus/submit
getLoc: /api/open/loc/one
--
Gitblit v1.9.1