From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 9bc3c5d..ffcecf0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -10,20 +10,26 @@
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.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.BasStation;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
-import com.vincent.rsf.server.manager.service.TaskService;
-import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "缁勬嫋閫氱煡妗�")
@RestController
@@ -33,32 +39,41 @@
private WaitPakinService waitPakinService;
@Autowired
+ private WaitPakinItemService waitPakinItemService;
+
+ @Autowired
+ private BasStationService basStationService;
+
+ @Autowired
private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
- return R.ok().add(waitPakinService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<WaitPakin, BaseParam> page = waitPakinService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waitPakinService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinService.list()));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping({"/waitPakin/many/{ids}", "/waitPakins/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waitPakinService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@GetMapping("/waitPakin/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waitPakinService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:waitPakin:save')")
@@ -77,7 +92,7 @@
if (!waitPakinService.save(waitPakin)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(waitPakin);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waitPakin));
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -89,17 +104,29 @@
if (!waitPakinService.updateById(waitPakin)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(waitPakin);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waitPakin));
}
@PreAuthorize("hasAuthority('manager:waitPakin:remove')")
@OperationLog("Delete 缁勬嫋妗�")
@PostMapping("/waitPakin/remove/{ids}")
+ @Transactional(rollbackFor = Exception.class)
public R remove(@PathVariable Long[] ids) {
- if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (Arrays.asList(ids).isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Delete Success").add(ids);
+ for (Long id : ids) {
+ WaitPakin waitPakin = waitPakinService.getById(id);
+ BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getBarcode, waitPakin.getBarcode())
+ .last("LIMIT 1")
+ );
+ if (!Cools.isEmpty(isBarcodeSta)){
+ throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
+ }
+ }
+
+ return waitPakinService.removePakin(Arrays.asList(ids));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@@ -113,24 +140,27 @@
waitPakinService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waitPakinService.list()), WaitPakin.class), response);
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("鐢熸垚浠诲姟鍒楄〃")
@PostMapping("/waitPakin/merge")
- public R generateTask(@RequestBody List<WaitPakin> waitPakin) {
- if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
+ public R generateTask(@RequestBody GenerateTaskParams taskParams) {
+ if (Objects.isNull(taskParams)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return taskService.generateTasks(waitPakin);
+ if (Objects.isNull(taskParams.getWaitPakins()) || taskParams.getWaitPakins().isEmpty()) {
+ throw new CoolException("缁勬嫋妗ｄ笉鑳戒负绌猴紒锛�");
+ }
+ return taskService.generateTasks(taskParams, getLoginUserId());
}
}
--
Gitblit v1.9.1