From 7737c1a11778a236592ff3677d54a44776fd440f Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 11 十月 2025 15:15:46 +0800
Subject: [PATCH] 容器管理初始化功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index e352697..264d337 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -9,6 +9,7 @@
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.InitContainerParams;
import com.vincent.rsf.server.manager.entity.BasContainer;
import com.vincent.rsf.server.manager.entity.BasStation;
import com.vincent.rsf.server.manager.service.BasContainerService;
@@ -32,18 +33,18 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<BasContainer, BaseParam> pageParam = new PageParam<>(baseParam, BasContainer.class);
PageParam<BasContainer, BaseParam> page = basContainerService.page(pageParam, pageParam.buildWrapper(true));
- for (BasContainer container : page.getRecords()) {
- if (!Cools.isEmpty(container.getAreas())) {
- String content = container.getAreas().substring(1, container.getAreas().length() - 1);
- String[] parts = content.split(",");
- Long[] longArray = new Long[parts.length];
- for (int i = 0; i < parts.length; i++) {
- longArray[i] = Long.parseLong(parts[i].trim());
- }
- container.setAreaIds(longArray);
- }
-
- }
+// for (BasContainer container : page.getRecords()) {
+// if (!Cools.isEmpty(container.getAreas())) {
+// String content = container.getAreas().substring(1, container.getAreas().length() - 1);
+// String[] parts = content.split(",");
+// Long[] longArray = new Long[parts.length];
+// for (int i = 0; i < parts.length; i++) {
+// longArray[i] = Long.parseLong(parts[i].trim());
+// }
+// container.setAreaIds(longArray);
+// }
+//
+// }
return R.ok().add(page);
}
@@ -133,6 +134,22 @@
return R.ok().add(vos);
}
+
+ /**
+ * 鍒濆鍖�
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:basContainer:list')")
+ @OperationLog("瀹瑰櫒鍒濆鍖�")
+ @PostMapping("/basContainer/init/save")
+ public R init(@RequestBody InitContainerParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return basContainerService.init(params, getLoginUserId());
+ }
+
+
@PreAuthorize("hasAuthority('manager:basContainer:list')")
@PostMapping("/basContainer/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
--
Gitblit v1.9.1