From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
index 0961847..e842e64 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
@@ -9,14 +9,17 @@
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.BasStation;
import com.vincent.rsf.server.manager.entity.BasStationArea;
import com.vincent.rsf.server.manager.service.BasStationAreaService;
+import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -24,31 +27,34 @@
@Autowired
private BasStationAreaService basStationAreaService;
+ @Autowired
+ private BasStationServiceImpl basStationService;
@PreAuthorize("hasAuthority('manager:basStationArea:list')")
@PostMapping("/basStationArea/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<BasStationArea, BaseParam> pageParam = new PageParam<>(baseParam, BasStationArea.class);
- return R.ok().add(basStationAreaService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<BasStationArea, BaseParam> page = basStationAreaService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:basStationArea:list')")
@PostMapping("/basStationArea/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(basStationAreaService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(basStationAreaService.list()));
}
@PreAuthorize("hasAuthority('manager:basStationArea:list')")
@PostMapping({"/basStationArea/many/{ids}", "/basStationAreas/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(basStationAreaService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(basStationAreaService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:basStationArea:list')")
@GetMapping("/basStationArea/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(basStationAreaService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(basStationAreaService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:basStationArea:save')")
@@ -59,10 +65,17 @@
basStationArea.setCreateTime(new Date());
basStationArea.setUpdateBy(getLoginUserId());
basStationArea.setUpdateTime(new Date());
+ List<String> objects = new ArrayList<>();
+ for (String station: basStationArea.getStationAlias()) {
+ long parseLong = Long.parseLong(station);
+ BasStation byId = basStationService.getById(parseLong);
+ objects.add(byId.getStationName());
+ }
+ basStationArea.setStationAliasStaNo(objects);
if (!basStationAreaService.save(basStationArea)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(basStationArea);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(basStationArea));
}
@PreAuthorize("hasAuthority('manager:basStationArea:update')")
@@ -74,7 +87,7 @@
if (!basStationAreaService.updateById(basStationArea)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(basStationArea);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(basStationArea));
}
@PreAuthorize("hasAuthority('manager:basStationArea:remove')")
@@ -84,7 +97,7 @@
if (!basStationAreaService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:basStationArea:list')")
@@ -98,13 +111,13 @@
basStationAreaService.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:basStationArea:list')")
@PostMapping("/basStationArea/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(basStationAreaService.list(), BasStationArea.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(basStationAreaService.list()), BasStationArea.class), response);
}
}
--
Gitblit v1.9.1