From 60edff747d52eb42aadb036e3fbd580252de4c05 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 28 八月 2025 08:15:54 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java
index a55eee0..e744f97 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java
@@ -6,14 +6,17 @@
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.TaskDto;
import com.zy.acs.manager.core.constant.LocGroupConstant;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Sta;
+import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.StaStsType;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
+import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import com.zy.acs.manager.system.service.ConfigService;
import io.swagger.annotations.Api;
@@ -23,9 +26,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2023/6/12
@@ -47,6 +48,11 @@
@Autowired
private ConfigService configService;
+
+ @Autowired
+ private TaskService taskService;
+
+
//@PreAuthorize("hasAuthority('open:bus:submit')")
@PostMapping("/bus/submit")
@OperationLog("generate task from open api")
@@ -59,6 +65,54 @@
}
return R.error("generate tasks error");
}
+
+
+ @OperationLog("Cancel Task")
+ @PostMapping("/task/cancel")
+ public R cancel(@RequestBody List<String> taskIds) {
+ if (Cools.isEmpty(taskIds)) {
+ return R.error("task cancel error");
+ }
+ List<Boolean> data = new ArrayList<>();
+ for (String id : taskIds) {
+ data.add(taskService.cancelCheckTaskSts(taskService.selectBySeqNum(id).getId(), 9527L));
+ }
+ return R.ok().add(data);
+ }
+
+
+ @OperationLog("updateTaskPriority")
+ @PostMapping("/task/updateTaskPriority")
+ public R update(@RequestBody List<TaskDto> taskDtos) {
+ if (Cools.isEmpty(taskDtos)) {
+ return R.error("task update error");
+ }
+ List<Boolean> data = new ArrayList<>();
+ for (TaskDto taskDto : taskDtos) {
+ Task task = taskService.selectBySeqNum(taskDto.getSeqNum());
+ task.setPriority(taskDto.getPriority());
+ task.setUpdateBy(9527L);
+ task.setUpdateTime(new Date());
+ data.add(taskService.updateById(task));
+ }
+ return R.ok("Update Success").add(data);
+ }
+
+
+ @PostMapping("/loc/sync")
+ @OperationLog("sync loc")
+ public R loc(@RequestBody(required = false) Map<String, Object> map) {
+ if (map.get("current") == null) {
+ map.put("current", 1);
+ }
+ if (map.get("pageSize") == null) {
+ map.put("pageSize", 100);
+ }
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
+ return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
@PostMapping("/sta/update")
@OperationLog("sync sta")
@@ -83,14 +137,6 @@
return R.error("update loc fail");
}
- //@PreAuthorize("hasAuthority('open:bus:submit')")
- @PostMapping("/loc/sync")
- @OperationLog("sync loc")
- public R loc(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
- return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
- }
@PostMapping("/loc/one")
@OperationLog("one loc")
--
Gitblit v1.9.1