From 66e2b81704718350c0a3fcf0dfbd2f9d614b044c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 13 一月 2026 08:30:38 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 41 ++++++++++++-----------------------------
1 files changed, 12 insertions(+), 29 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 264d337..e352697 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,7 +9,6 @@
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;
@@ -33,18 +32,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,22 +132,6 @@
);
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")
--
Gitblit v1.9.1