From 4f5b35538baf84ecd3cdbd4afd797b0f5d1641de Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 15:02:05 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenController.java | 131 ++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 57 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..04dfbb9 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
@@ -57,14 +56,17 @@
//@PreAuthorize("hasAuthority('open:bus:submit')")
@PostMapping("/bus/submit")
@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");
+ public synchronized R save(@RequestBody OpenBusSubmitParam param) {
+ for (TaskDto taskDto : param.getTaskList()) {
+ if (Cools.isEmpty(taskDto.getSeqNum())) {
+ return R.error("缂哄け浠诲姟鍙�");
+ }
+ if (Cools.isEmpty(taskDto.getPriority())) {
+ taskDto.setPriority(1);
}
}
- return R.error("generate tasks error");
+ mainService.generateBusAndTask(param, null);
+ return R.ok("generate tasks success");
}
@@ -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,57 +134,45 @@
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")
public R emptyLoc(@RequestBody Map<String, Object> map) {
- if (!configService.getVal("TaskAssignMode", Boolean.class)) {
- if (configService.getVal("InAndOutMode", Boolean.class, false)) {
- String staNo = map.get("staNo").toString();
- Integer startRow = null;
- Integer endRow = null;
- if (staNo.equals("101-2") || staNo.equals("101-3") || staNo.equals("102-2") || staNo.equals("102-3")) {
- startRow = Collections.min(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
- endRow = Collections.max(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
- } else if (staNo.equals("103-2") || staNo.equals("103-3") || staNo.equals("104-2") || staNo.equals("104-3")) {
- startRow = Collections.min(LocGroupConstant.RIGHT_LOC_ROW_LIST);
- endRow = Collections.max(LocGroupConstant.RIGHT_LOC_ROW_LIST);
- } else if (staNo.equals("105-2") || staNo.equals("105-3") || staNo.equals("106-2") || staNo.equals("106-3")) {
- startRow = Collections.min(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
- endRow = Collections.max(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
- } else if (staNo.equals("107-2") || staNo.equals("107-3") || staNo.equals("108-2") || staNo.equals("108-3")) {
- startRow = Collections.min(LocGroupConstant.LEFT_LOC_ROW_LIST);
- endRow = Collections.max(LocGroupConstant.LEFT_LOC_ROW_LIST);
- } else if (staNo.equals("1007") || staNo.equals("1001")) {
- startRow = Collections.min(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
- endRow = Collections.max(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
- } else {
- return R.error("staNo is not support");
- }
- LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, Long.parseLong(map.get("sts").toString()));
- if (null != startRow) {
- idleWrapper.ge(Loc::getRow, startRow);
- }
- if (null != endRow) {
- idleWrapper.le(Loc::getRow, endRow);
- }
- List<Loc> idleList = locService.list(idleWrapper);
- if (Cools.isEmpty(idleList)) {
- return R.error("娌＄┖搴撲綅");
- }
- Collections.shuffle(idleList);
- return R.ok().add(idleList.get(0));
- }
+
+ String staNo = map.get("staNo").toString();
+ Integer startRow = null;
+ Integer endRow = null;
+ if (staNo.equals("101-2") || staNo.equals("101-3") || staNo.equals("102-2") || staNo.equals("102-3")) {
+ startRow = Collections.min(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
+ endRow = Collections.max(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
+ } else if (staNo.equals("103-2") || staNo.equals("103-3") || staNo.equals("104-2") || staNo.equals("104-3")) {
+ startRow = Collections.min(LocGroupConstant.RIGHT_LOC_ROW_LIST);
+ endRow = Collections.max(LocGroupConstant.RIGHT_LOC_ROW_LIST);
+ } else if (staNo.equals("105-2") || staNo.equals("105-3") || staNo.equals("106-2") || staNo.equals("106-3")) {
+ startRow = Collections.min(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
+ endRow = Collections.max(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
+ } else if (staNo.equals("107-2") || staNo.equals("107-3") || staNo.equals("108-2") || staNo.equals("108-3")) {
+ startRow = Collections.min(LocGroupConstant.LEFT_LOC_ROW_LIST);
+ endRow = Collections.max(LocGroupConstant.LEFT_LOC_ROW_LIST);
+ } else if (staNo.equals("1007") || staNo.equals("1001")) {
+ startRow = Collections.min(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
+ endRow = Collections.max(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
+ } else {
+ return R.error("staNo is not support");
}
- return R.error("鏈紑鍚妯″紡");
+ LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, Long.parseLong(map.get("sts").toString()));
+ if (null != startRow) {
+ idleWrapper.ge(Loc::getRow, startRow);
+ }
+ if (null != endRow) {
+ idleWrapper.le(Loc::getRow, endRow);
+ }
+ List<Loc> idleList = locService.list(idleWrapper);
+ if (Cools.isEmpty(idleList)) {
+ return R.error("娌＄┖搴撲綅");
+ }
+ Collections.shuffle(idleList);
+ return R.ok().add(idleList.get(0));
}
}
--
Gitblit v1.9.1