From f907e31b2d4423daba7b4a09e64a38455ec40914 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 28 八月 2025 19:21:44 +0800
Subject: [PATCH] 异常信息上报接口优化
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java | 17 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ExMsgParams.java | 23 +++++++++++
rsf-open-api/src/main/resources/application-dev.yml | 7 +++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 25 ++++++++----
5 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java
index 6a31602..ca0c218 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/PlatformProperties.java
@@ -34,4 +34,21 @@
public String getBaseUrl() {
return this.host + ":" + this.port + "/" + this.prePath;
}
+
+
+ @Data
+ @Configuration
+ @ConfigurationProperties(prefix = "platform.wms")
+ public class WmsApi {
+ /**
+ * rcs璋冪敤璺緞
+ */
+ private String host;
+
+ /**rcs璋冪敤绔彛**/
+ private String port;
+
+ }
+
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
index 0ecefd8..f94be28 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
@@ -41,6 +41,9 @@
private PlatformProperties rcsApi;
@Autowired
+ private PlatformProperties.WmsApi wmsApi;
+
+ @Autowired
private RestTemplate restTemplate;
@@ -100,6 +103,8 @@
*/
@Override
public R callBackEvent(Map<String, Object> params) {
+ String rcsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + RcsConstant.pubTask;
+
return R.ok();
}
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index bc1bd20..ba2ddcb 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -58,4 +58,9 @@
#閾炬帴
host: http://192.168.4.84
#绔彛
- port: 8088
\ No newline at end of file
+ port: 8088
+ wms:
+ #閾炬帴
+ host: http://127.0.0.1
+ #绔彛
+ port: 8080
\ No newline at end of file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index 92b0dc7..f1309c5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -4,7 +4,6 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
-
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.service.WcsService;
@@ -25,8 +24,6 @@
@Autowired
private WcsService wcsService;
-// @Autowired
-// private WmsRcsService wmsRcsService;
@ApiOperation(value = "wcs鐢熸垚鍏ュ簱浠诲姟鎺ュ彛")
@PostMapping("/create/in/task")
@@ -45,8 +42,6 @@
}
InTaskMsgDto msgDto = wcsService.createInTask(param);
return R.ok(msgDto);
-
-
}
@ApiOperation(value = "agv鍙栬揣瀹屾垚鎺ュ彛")
@@ -72,8 +67,7 @@
/**
* 鎺ユ敹WCS璋冨害锛屽洖浼犳墽琛岀姸鎬�
- * //TODO 1. 鎷ｆ枡鍑哄簱锛屽啀鍏ュ簱鎵ц锛屼慨鏀圭姸鎬佷负199.浠诲姟瀹屾垚 骞惰褰曞叆搴撶珯鐐癸紙婧愮珯鐐癸級锛屾坊鍔犱换鍔″彿鍙傛暟
- *
+ * TODO 1. 鎷ｆ枡鍑哄簱锛屽啀鍏ュ簱鎵ц锛屼慨鏀圭姸鎬佷负199.浠诲姟瀹屾垚 骞惰褰曞叆搴撶珯鐐癸紙婧愮珯鐐癸級锛屾坊鍔犱换鍔″彿鍙傛暟
* @param param
* @return
*/
@@ -83,10 +77,8 @@
if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
return R.ok();
}
-
/**
* @author Ryan
@@ -100,4 +92,19 @@
public R syncLocsToWms() {
return wcsService.syncLocsToWms();
}
+
+ /**
+ * @author Ryan
+ * @date 2025/8/28
+ * @description: RCS涓婃姤寮傚父淇℃伅
+ * @version 1.0
+ */
+ @ApiOperation("RCS涓婃姤寮傚父鎵ц淇℃伅")
+ @OperationLog("RCS涓婃姤寮傚父鎵ц淇℃伅")
+ @PostMapping("/receive/ex/msg")
+ public R receiveExMsg() {
+ return wcsService.receiveExMsg();
+ }
+
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ExMsgParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ExMsgParams.java
new file mode 100644
index 0000000..3c1109e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ExMsgParams.java
@@ -0,0 +1,23 @@
+package com.vincent.rsf.server.api.entity.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ExMsgParams", description = "寮傚父涓婃姤鍙傛暟")
+public class ExMsgParams {
+
+ private String seqNum;
+
+ @ApiModelProperty("浜嬩欢绫诲瀷锛� {START: 涓嬪彂鎴愬姛, OTBIN: 鍙栬揣鎴愬姛, END: 鏀捐揣鎴愬姛}")
+ private String eventType;
+
+ @ApiModelProperty("灏忚溅缂栧彿 ")
+ private String robotCode;
+
+ @ApiModelProperty("瀹瑰櫒鐮�")
+ private String zpallet;
+}
--
Gitblit v1.9.1