From 9598da0195806329f911f6d5b73573b429f1926c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 15 一月 2026 09:56:23 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 44 +-------------------------------------------
1 files changed, 1 insertions(+), 43 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 ec0beb1..0c06dcd 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,6 @@
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);
-// }
-//
-// }
return R.ok().add(page);
}
@@ -64,13 +51,6 @@
@GetMapping("/basContainer/{id}")
public R get(@PathVariable("id") Long id) {
BasContainer basContainer = basContainerService.getById(id);
- String content = basContainer.getAreas().substring(1, basContainer.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());
- }
- basContainer.setAreaIds(longArray);
return R.ok().add(basContainer);
}
@@ -82,12 +62,9 @@
basContainer.setCreateTime(new Date());
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
- BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()).orderByDesc(BasContainer::getId),false);
+ BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()));
if (null != container) {
return R.error("璇ョ被鍨嬪凡琚垵濮嬪寲");
- }
- if (null !=basContainer.getAreaIds()){
- basContainer.setAreas(Arrays.toString(basContainer.getAreaIds()));
}
if (!basContainerService.save(basContainer)) {
return R.error("Save Fail");
@@ -101,9 +78,6 @@
public R update(@RequestBody BasContainer basContainer) {
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
- if (null !=basContainer.getAreaIds()){
- basContainer.setAreas(Arrays.toString(basContainer.getAreaIds()));
- }
if (!basContainerService.updateById(basContainer)) {
return R.error("Update Fail");
}
@@ -133,22 +107,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