From 13ea8b334572c2423abb8d156fd8428f8d074172 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 08:24:58 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java
index f6fb37d..f351041 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java
@@ -1,8 +1,7 @@
package com.zy.acs.manager.manager.controller;
-import com.zy.acs.framework.common.Cools;
+import com.alibaba.fastjson.JSONObject;
import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.core.service.MainZkdService;
import com.zy.acs.manager.core.third.zkd.dto.Navigation;
import com.zy.acs.manager.manager.controller.param.OpenAgvParam;
@@ -10,17 +9,15 @@
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.OpenAlgorithmService;
import com.zy.acs.manager.system.controller.BaseController;
-import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* Created by vincent on 2023/6/12
*/
-@Api(tags = "Open Api")
+//@Api(tags = "Open Api")
+@Slf4j
@RestController
@RequestMapping("/api/open/algorithm")
public class OpenAlgorithmController extends BaseController {
@@ -37,24 +34,31 @@
@Autowired
private CodeService codeService;
+ @GetMapping("/demo")
+ public R demo() {
+ return R.ok("demo");
+ }
+
@PostMapping("/getAgv")
- @OperationLog("get agv msg")
- public R save(@RequestBody OpenAgvParam param) {
- if (Cools.isEmpty(param)) {
- return R.error("涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getMapId())) {
- return R.error("鍦板浘缂栧彿涓嶈兘涓虹┖");
- }
+// @OperationLog("get agv msg")
+ public R save(@RequestBody(required = false) OpenAgvParam param) {
+// if (Cools.isEmpty(param)) {
+// return R.error("涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getMapId())) {
+// return R.error("鍦板浘缂栧彿涓嶈兘涓虹┖");
+// }
return R.ok(openAlgorithmService.listAgv(param));
}
@RequestMapping("/zkd/navigation/v1")
- public Object navigation(@RequestBody Navigation navigation) {
+ public Object navigation(@RequestBody String data) {
+ log.info("鏀跺埌鐨勫鑸俊鎭細{}", data);
+ Navigation navigation = JSONObject.parseObject(data, Navigation.class);
Long agvId = agvService.getAgvId(navigation.getAgvId());
mainZkdService.buildMajorTask(agvId, navigation);
- return null;
+ return R.ok();
}
}
--
Gitblit v1.9.1