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 | 19 ++++++++-----------
1 files changed, 8 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 e744f97..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
@@ -58,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");
}
@@ -101,16 +104,10 @@
@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);
- }
+ 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)));
+ return R.ok().add(locService.page(pageParam, pageParam.buildWrapperExcludeNull(true)));
}
--
Gitblit v1.9.1