From 02e3fbfc96e08c9285daaa5a6ec53716c747a671 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 10:42:18 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 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 44ff76c..fe48530 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,11 +6,13 @@
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;
@@ -24,10 +26,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2023/6/12
@@ -59,10 +58,13 @@
@OperationLog("generate task from open api")
public R save(@RequestBody OpenBusSubmitParam param) {
if (!configService.getVal("TaskAssignMode", Boolean.class)) {
- if (configService.getVal("InAndOutMode", Boolean.class, false)) {
- mainService.generateBusAndTask(param, null);
- return R.ok("generate tasks success");
+ for (TaskDto taskDto : param.getTaskList()) {
+ if (Cools.isEmpty(taskDto.getSeqNum())) {
+ return R.error("缂哄け浠诲姟鍙�");
+ }
}
+ mainService.generateBusAndTask(param, null);
+ return R.ok("generate tasks success");
}
return R.error("generate tasks error");
}
@@ -76,9 +78,36 @@
}
List<Boolean> data = new ArrayList<>();
for (String id : taskIds) {
- data.add(taskService.cancel(taskService.selectBySeqNum(id).getId(), 9527L));
+ 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 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.buildWrapperExcludeNull(true)));
}
@@ -105,14 +134,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