From 7e97f2a6bdce6997939db8882191665fd42ce2c5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 09:37:58 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index 989b5d2..b527b50 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -1,17 +1,25 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.Wave;
+import com.vincent.rsf.server.manager.entity.WaveItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
import com.vincent.rsf.server.manager.service.WaveService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +32,8 @@
@Autowired
private WaveService waveService;
+ @Autowired
+ private TaskItemService taskItemService;
@PreAuthorize("hasAuthority('manager:wave:list')")
@PostMapping("/wave/page")
@@ -79,6 +89,13 @@
@OperationLog("Delete 娉㈡鍗曟嵁")
@PostMapping("/wave/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ if (Objects.isNull(ids)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSourceId, ids));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("鏈夋湭瀹屾垚浠诲姟锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
if (!waveService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
@@ -105,4 +122,28 @@
ExcelUtil.build(ExcelUtil.create(waveService.list(), Wave.class), response);
}
+ @PreAuthorize("hasAuthority('manager:wave:update')")
+ @ApiOperation("娉㈡涓嬪彂浠诲姟")
+ @PostMapping("/wave/public/task")
+ public R publicTask(@RequestBody Map<String, Object> map) {
+ if (Cools.isEmpty(map) || Cools.isEmpty(map.get("wave"))) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return waveService.publicTask(map, getLoginUserId());
+ }
+
+ @PreAuthorize("hasAuthority('manager:wave:list')")
+ @ApiOperation("娉㈡鍑哄簱浠诲姟棰勮")
+ @PostMapping("/wave/locs/preview/page")
+ public R mergeWavePreview(@RequestBody Map<String, Object> map) {
+ if (Cools.isEmpty(map.get("waveId")) || StringUtils.isBlank(map.get("waveId").toString())) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ Long waveId = Long.parseLong(map.get("waveId").toString());
+ List<WaveItem> waveItems = waveService.mergeWavePreview(waveId);
+ PageResult<WaveItem> pageResult = new PageResult<>();
+ pageResult.setRecords(waveItems).setTotal(Long.parseLong(waveItems.size() + ""));
+ return R.ok().add(pageResult);
+ }
+
}
--
Gitblit v1.9.1