From f7543a1cc6c89ea03c0d6a0591526baf10d7934b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 16:37:23 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
index b40081f..78408a8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java
@@ -1,34 +1,90 @@
package com.zy.acs.manager.core.integrate.wms;
-import com.zy.acs.manager.common.annotation.OperationLog;
+import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.system.controller.BaseController;
-import com.zy.acs.manager.core.service.MainService;
+import com.zy.acs.manager.common.annotation.IntegrationAuth;
+import com.zy.acs.manager.common.annotation.OperationLog;
+import com.zy.acs.manager.common.constant.Constants;
+import com.zy.acs.manager.common.domain.TaskBoolDto;
+import com.zy.acs.manager.core.domain.type.NamespaceType;
+import com.zy.acs.manager.core.integrate.dto.OpenBusCancelParam;
+import com.zy.acs.manager.core.integrate.dto.OpenBusCancelResult;
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
+import com.zy.acs.manager.core.service.MainService;
+import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.TaskStsType;
+import com.zy.acs.manager.manager.service.BusService;
+import com.zy.acs.manager.manager.service.TaskService;
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 javax.servlet.http.HttpServletRequest;
+
/**
* Created by vincent on 2023/6/12
*/
+@Slf4j
@Api(tags = "Open Api")
@RestController
@RequestMapping("/api/open")
-public class OpenController extends BaseController {
+public class OpenController {
@Autowired
private MainService mainService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private BusService busService;
-// @PreAuthorize("hasAuthority('open:bus:submit')")
@PostMapping("/bus/submit")
@OperationLog("generate task from open api")
- public R save(@RequestBody OpenBusSubmitParam param) {
+ @IntegrationAuth(name = NamespaceType.RCS_BUS_RECEIVE)
+ public R submit(@RequestBody OpenBusSubmitParam param, HttpServletRequest request) {
mainService.generateBusAndTask(param, null);
return R.ok("generate tasks success");
}
+ @PostMapping("/task/cancel")
+ @OperationLog("cancel task from open api")
+ @IntegrationAuth(name = NamespaceType.RCS_TASK_CANCEL)
+ public R cancel(@RequestBody OpenBusCancelParam param) {
+ if (Cools.isEmpty(param.getBatchNo())) {
+ return R.error("batchNo is empty");
+ }
+ if (Cools.isEmpty(param.getTasks())) {
+ return R.error("tasks is empty");
+ }
+ Bus bus = busService.selectByBusNo(param.getBatchNo());
+ if (null == bus) {
+ return R.error("batchNo is not exist");
+ }
+ OpenBusCancelResult result = new OpenBusCancelResult();
+ result.setBatchNo(param.getBatchNo());
+ for (String taskNo : param.getTasks()) {
+ Task task = taskService.selectBySeqNum(bus.getId(), taskNo);
+ if (null == task) {
+ result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE, "task " + taskNo + " is not exist"));
+ continue;
+ }
+ if (!task.getTaskSts().equals(TaskStsType.INIT.val())) {
+ result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE, "task " + taskNo + " has already been assigned"));
+ continue;
+ }
+ Boolean cancel = false;
+ try {
+ cancel = taskService.cancel(task.getId(), null, Constants.UPLINK);
+ } catch (Exception e) {
+ log.error("failed to cancel task {}", taskNo, e);
+ }
+ result.getTasks().add(new TaskBoolDto(taskNo, cancel, "failed to cancel task " + taskNo));
+ }
+ return R.ok("cancel tasks success").add(result);
+ }
+
}
--
Gitblit v1.9.1