From 314e1feef3ea9b2c4414664180a6f144de4a96d2 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Mon, 27 Feb 2023 14:59:44 +0800
Subject: [PATCH] ACS controller 增加swagger api
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
index 68858a6..af7a045 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
@@ -12,38 +12,33 @@ import org.jeecg.modules.wms.config.address.service.IAddressService;
import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
import org.jeecg.modules.wms.task.agvTask.service.IAgvTaskService;
-import org.jeecg.utils.HuahengJwtUtil;
import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
-import org.springframework.transaction.annotation.Transactional;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import cn.monitor4all.logRecord.annotation.OperationLog;
-import cn.monitor4all.logRecord.context.LogRecordContext;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@RestController
@RequestMapping("/api/wms/acs")
+@Api(tags = "AGV接口")
public class AcsController extends HuahengBaseController {
@Resource
private IAcsService acsService;
-
+
@Resource
private IAgvTaskService agvTaskService;
-
+
@Resource
private IAddressService addressService;
-
+
// @PassApiAuthentication
// @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST")
@ResponseBody
@PostMapping(value = "/testTokenCheck")
- @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
+ @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')", extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
// String audience = ApiAuthentication.getInstance().getAudience();
// String url = "http://localhost:8080/wms/api/wms/acs/testTokenCheck";
@@ -51,13 +46,11 @@ public class AcsController extends HuahengBaseController {
// String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_AGV_TASK_ASSIGN);
return Result.ok();
}
-
@PostMapping("/notifyAGVTask")
@ApiOperation("更新AGV状态")
@ResponseBody
@ApiLogger(apiName = "更新AGV状态", from = "ACS")
- @Transactional(rollbackFor = Exception.class)
public Result notifyAGVTask(@RequestBody AcsStatus acsStatus) {
if (acsStatus == null) {
return Result.error("更新AGV状态，数据为空");
--
libgit2 0.22.2