From d4ae421c04e90172b808cbebb86f297412ea8345 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 11:05:32 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
index 86046c5..83fdcaa 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java
@@ -5,14 +5,15 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.OperationLog;
-import com.zy.acs.manager.common.domain.BaseParam;
-import com.zy.acs.manager.common.domain.KeyValVo;
-import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.*;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.controller.param.BusCreateParam;
+import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
import com.zy.acs.manager.manager.service.BusService;
+import com.zy.acs.manager.manager.service.LocService;
+import com.zy.acs.manager.manager.service.StaService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,6 +30,10 @@
private BusService busService;
@Autowired
private MainService mainService;
+ @Autowired
+ private StaService staService;
+ @Autowired
+ private LocService locService;
@PreAuthorize("hasAuthority('manager:bus:list')")
@PostMapping("/bus/page")
@@ -60,7 +65,27 @@
@OperationLog("Create Bus")
@PostMapping("/bus/save")
public R save(@RequestBody BusCreateParam param) {
- Bus bus = mainService.generateBusAndTask();
+ OpenBusSubmitParam submitParam = new OpenBusSubmitParam();
+ submitParam.setBatch(param.getBatch());
+ for (TaskIdByLongDto dto : param.getTaskList()) {
+ TaskDto taskDto = new TaskDto();
+ taskDto.setSeqNum(dto.getSeqNum());
+ taskDto.setPriority(dto.getPriority());
+ if (!Cools.isEmpty(dto.getOriSta())) {
+ taskDto.setOriSta(staService.getById(dto.getOriSta()).getStaNo());
+ }
+ if (!Cools.isEmpty(dto.getOriLoc())) {
+ taskDto.setOriSta(locService.getById(dto.getOriLoc()).getLocNo());
+ }
+ if (!Cools.isEmpty(dto.getDestSta())) {
+ taskDto.setOriSta(staService.getById(dto.getDestSta()).getStaNo());
+ }
+ if (!Cools.isEmpty(dto.getDestLoc())) {
+ taskDto.setOriSta(locService.getById(dto.getDestLoc()).getLocNo());
+ }
+ submitParam.getTaskList().add(taskDto);
+ }
+ Bus bus = mainService.generateBusAndTask(submitParam, param.getMemo());
return R.ok("Save Success").add(bus);
}
--
Gitblit v1.9.1