From 9ca146e7afa543d2c516a91c95929d34aa48a52c Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 16 四月 2026 11:45:23 +0800
Subject: [PATCH] 电视机提醒
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/tv/TvRcsStationPollService.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 106 insertions(+), 9 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/tv/TvRcsStationPollService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/tv/TvRcsStationPollService.java
index fc4507b..29ea3a0 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/tv/TvRcsStationPollService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/tv/TvRcsStationPollService.java
@@ -4,17 +4,26 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.vincent.rsf.openApi.feign.wms.WmsServerFeignClient;
import com.vincent.rsf.openApi.service.RcsTvCallbackService;
+import com.vincent.rsf.openApi.service.WcsStationStatusService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
/**
- * 璋冪敤 RCS 绔欑偣鎺ュ彛锛岀粨鏋滃啓鍏ョ數瑙嗘満 Redis锛岀敱 zy-monitor-admin WebSocket 鎺ㄩ�佸埌鐢佃鏈�
+ * 瀹氭椂锛欸ET RCS /station/getTaskNo锛汸OST RCS /station/getError锛涗换鍔″彿瀛樺湪鏃惰皟 WMS queryTask 鍚堝苟鏂欑涓庣墿鏂欐槑缁嗚繘 Redis
*/
@Slf4j
@Service
@@ -28,12 +37,18 @@
private RcsTvCallbackService rcsTvCallbackService;
@Resource
private TvRcsStationPollProperties pollProperties;
+ @Resource
+ private WcsStationStatusService wcsStationStatusService;
+ @Resource
+ private WmsServerFeignClient wmsServerFeignClient;
public void pollOnce() {
+ String stationId = pollProperties.getTaskNoStationId();
if (StringUtils.hasText(pollProperties.getTaskNoPollUrl())) {
try {
String raw = restTemplate.getForObject(pollProperties.getTaskNoPollUrl(), String.class);
- applyTaskNoResponse(raw, pollProperties.getTaskNoStationId());
+ String taskNo = applyTaskNoResponse(raw, stationId);
+ enrichSnapshotFromWms(stationId, taskNo);
} catch (RestClientException e) {
log.warn("RCS 浠诲姟鍙疯疆璇� HTTP 澶辫触: {}", e.getMessage());
} catch (Exception e) {
@@ -42,7 +57,7 @@
}
if (StringUtils.hasText(pollProperties.getErrorPollUrl())) {
try {
- String raw = restTemplate.getForObject(pollProperties.getErrorPollUrl(), String.class);
+ String raw = pollErrorRaw();
applyErrorResponse(raw, pollProperties.getErrorStationId());
} catch (RestClientException e) {
log.warn("RCS 寮傚父杞 HTTP 澶辫触: {}", e.getMessage());
@@ -52,22 +67,104 @@
}
}
- private void applyTaskNoResponse(String raw, String staNo) {
- if (!StringUtils.hasText(staNo)) {
+ private void enrichSnapshotFromWms(String stationId, String taskNo) {
+ if (!pollProperties.isEnrichTaskFromWms()) {
return;
+ }
+ if (!StringUtils.hasText(stationId)) {
+ return;
+ }
+ if (!StringUtils.hasText(taskNo) || "0".equals(taskNo.trim())) {
+ wcsStationStatusService.clearStationSnapshot(stationId);
+ return;
+ }
+ Map<String, Object> req = new HashMap<>();
+ req.put("taskNo", taskNo);
+ try {
+ Map<String, Object> res = wmsServerFeignClient.openAsrsQueryTask(req);
+ if (res == null) {
+ wcsStationStatusService.upsertFromRcsPoll(stationId, taskNo, null);
+ return;
+ }
+ Object codeObj = res.get("code");
+ int code = parseCode(codeObj);
+ if (code != 200) {
+ log.debug("WMS queryTask 闈炴垚鍔� code={} msg={}", code, res.get("msg"));
+ wcsStationStatusService.upsertFromRcsPoll(stationId, taskNo, null);
+ return;
+ }
+ Object data = res.get("data");
+ @SuppressWarnings("unchecked")
+ Map<String, Object> dataMap = data instanceof Map ? (Map<String, Object>) data : null;
+ wcsStationStatusService.upsertFromRcsPoll(stationId, taskNo, dataMap);
+ } catch (Exception e) {
+ log.warn("WMS queryTask 璋冪敤澶辫触: {}", e.getMessage());
+ wcsStationStatusService.upsertFromRcsPoll(stationId, taskNo, null);
+ }
+ }
+
+ private static int parseCode(Object codeObj) {
+ if (codeObj == null) {
+ return 0;
+ }
+ if (codeObj instanceof Number) {
+ return ((Number) codeObj).intValue();
+ }
+ try {
+ return Integer.parseInt(String.valueOf(codeObj));
+ } catch (Exception e) {
+ return 0;
+ }
+ }
+
+ private String pollErrorRaw() throws Exception {
+ if (pollProperties.isErrorPollUsePost()) {
+ ObjectNode body = objectMapper.createObjectNode();
+ body.put("staNo", pollProperties.getErrorStationId());
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ HttpEntity<String> entity = new HttpEntity<>(objectMapper.writeValueAsString(body), headers);
+ ResponseEntity<String> resp = restTemplate.exchange(
+ pollProperties.getErrorPollUrl(), HttpMethod.POST, entity, String.class);
+ return resp.getBody();
+ }
+ return restTemplate.getForObject(pollProperties.getErrorPollUrl(), String.class);
+ }
+
+ /** 鍐欏叆 tvRcs 浠诲姟鍙� Hash锛涜繑鍥炶В鏋愬嚭鐨� taskNo锛堢敤浜� WMS 鍚堝苟锛� */
+ private String applyTaskNoResponse(String raw, String staNo) {
+ if (!StringUtils.hasText(staNo)) {
+ return null;
}
if (!StringUtils.hasText(raw)) {
rcsTvCallbackService.writeStationTaskNo(staNo, null);
- return;
+ return null;
}
String trimmed = raw.trim();
try {
JsonNode root = objectMapper.readTree(trimmed);
+ if (!httpSuccess(root)) {
+ rcsTvCallbackService.writeStationTaskNo(staNo, null);
+ return null;
+ }
String taskNo = extractTaskNo(root);
rcsTvCallbackService.writeStationTaskNo(staNo, taskNo);
+ return taskNo;
} catch (Exception e) {
rcsTvCallbackService.writeStationTaskNo(staNo, trimmed);
+ return trimmed;
}
+ }
+
+ private static boolean httpSuccess(JsonNode root) {
+ if (root == null || !root.isObject()) {
+ return true;
+ }
+ JsonNode c = root.get("code");
+ if (c == null || c.isNull()) {
+ return true;
+ }
+ return c.asInt(200) == 200;
}
private static String extractTaskNo(JsonNode root) {
@@ -122,15 +219,15 @@
rcsTvCallbackService.handleStationError(body);
}
- /**
- * 褰掍竴鎴� {@link com.vincent.rsf.openApi.service.RcsTvCallbackService#handleStationError} 鍙瘑鍒殑 data 鏁扮粍
- */
private JsonNode buildErrorCallbackBody(String raw, String defaultStaNo) throws Exception {
if (!StringUtils.hasText(raw)) {
return objectMapper.createArrayNode();
}
String trimmed = raw.trim();
JsonNode root = objectMapper.readTree(trimmed);
+ if (!httpSuccess(root)) {
+ return objectMapper.createArrayNode();
+ }
if (root.isArray()) {
return fillStaNo((ArrayNode) root, defaultStaNo);
}
--
Gitblit v1.9.1