From faf27b105f85b5b11e75f2fa041c2f53229794de Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:09 +0800
Subject: [PATCH] fix: 租赁计划修改page方法
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 19 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
index 8ebe9d6..bd5ecd0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
@@ -3,11 +3,15 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.entity.DeviceDemandPlan;
+import com.by4cloud.platformx.device.entity.DeviceDemandSub;
import com.by4cloud.platformx.device.entity.DeviceDemandTotal;
+import com.by4cloud.platformx.device.service.DeviceDemandSubService;
import com.by4cloud.platformx.device.service.DeviceDemandTotalService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
@@ -36,6 +40,7 @@
public class DeviceDemandTotalController {
private final DeviceDemandTotalService deviceDemandTotalService;
+ private final DeviceDemandSubService deviceDemandSubService;
/**
* 鍒嗛〉鏌ヨ
@@ -59,12 +64,40 @@
*/
@Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
@GetMapping("/{id}" )
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_view')" )
public R getById(@PathVariable("id" ) Long id) {
- return R.ok(deviceDemandTotalService.getById(id));
+ DeviceDemandTotal demandTotal = deviceDemandTotalService.getById(id);
+ QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(DeviceDemandSub::getTotalId,demandTotal.getId());
+ List<DeviceDemandSub> list = deviceDemandSubService.list(wrapper);
+ demandTotal.setSubList(list);
+ return R.ok(demandTotal);
}
- /**
+ /**
+ * 閫氳繃id鏌ヨ璁惧闇�姹傝鍒掗」鐩瓙琛�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+ @GetMapping("/getByPlanId/{id}" )
+ public R getByPlanId(@PathVariable("id" ) Long id) {
+ QueryWrapper<DeviceDemandTotal> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(DeviceDemandTotal::getPlanId,id);
+ List<DeviceDemandTotal> list = deviceDemandTotalService.list(wrapper);
+ for (DeviceDemandTotal deviceDemandTotal : list) {
+ QueryWrapper<DeviceDemandSub> wrapper1 = new QueryWrapper<>();
+ wrapper1.lambda()
+ .eq(DeviceDemandSub::getTotalId,deviceDemandTotal.getId());
+ List<DeviceDemandSub> list1 = deviceDemandSubService.list(wrapper1);
+ deviceDemandTotal.setSubList(list1);
+ }
+ return R.ok(list);
+ }
+
+
+ /**
* 鏂板璁惧闇�姹傝鍒掗」鐩瓙琛�
* @param deviceDemandTotal 璁惧闇�姹傝鍒掗」鐩瓙琛�
* @return R
@@ -72,9 +105,17 @@
@Operation(summary = "鏂板璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "鏂板璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@SysLog("鏂板璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@PostMapping
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_add')" )
public R save(@RequestBody DeviceDemandTotal deviceDemandTotal) {
- return R.ok(deviceDemandTotalService.save(deviceDemandTotal));
+ if(deviceDemandTotal.getPlanId()==null){
+ return R.failed("璁″垝id蹇呬紶");
+ }
+ deviceDemandTotalService.save(deviceDemandTotal);
+ List<DeviceDemandSub> subList = deviceDemandTotal.getSubList();
+ for (DeviceDemandSub deviceDemandSub : subList) {
+ deviceDemandSub.setTotalId(deviceDemandTotal.getId());
+ deviceDemandSubService.save(deviceDemandSub);
+ }
+ return R.ok("娣诲姞鎴愬姛");
}
/**
@@ -85,23 +126,55 @@
@Operation(summary = "淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@SysLog("淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@PutMapping
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_edit')" )
public R updateById(@RequestBody DeviceDemandTotal deviceDemandTotal) {
- return R.ok(deviceDemandTotalService.updateById(deviceDemandTotal));
+ List<DeviceDemandSub> subList = deviceDemandTotal.getSubList();
+ QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(DeviceDemandSub::getTotalId,deviceDemandTotal.getId());
+ List<DeviceDemandSub> list = deviceDemandSubService.list(wrapper);
+ deviceDemandSubService.removeBatchByIds(list);
+ for (DeviceDemandSub deviceDemandSub : subList) {
+ deviceDemandSub.setTotalId(deviceDemandTotal.getId());
+ deviceDemandSubService.save(deviceDemandSub);
+ }
+ return R.ok(deviceDemandTotalService.updateById(deviceDemandTotal));
}
- /**
- * 閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�
- * @param ids id鍒楄〃
- * @return R
- */
- @Operation(summary = "閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" )
- @SysLog("閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" )
- @DeleteMapping
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_del')" )
- public R removeById(@RequestBody Long[] ids) {
- return R.ok(deviceDemandTotalService.removeBatchByIds(CollUtil.toList(ids)));
- }
+ /**
+ * 閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" )
+ @SysLog("閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" )
+ @GetMapping("/deleteById/{id}")
+ public R deleteById(@PathVariable("id" ) Long id) {
+ DeviceDemandTotal byId = deviceDemandTotalService.getById(id);
+ if(byId != null){
+ deviceDemandTotalService.removeById(id);
+ QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(DeviceDemandSub::getTotalId,byId.getId());
+ List<DeviceDemandSub> list = deviceDemandSubService.list(wrapper);
+ deviceDemandSubService.removeBatchByIds(list);
+ }else {
+ return R.failed("鏈煡璇㈠埌璇ラ」鐩�");
+ }
+ return R.ok();
+ }
+
+// /**
+// * 閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�
+// * @param ids id鍒楄〃
+// * @return R
+// */
+// @Operation(summary = "閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" )
+// @SysLog("閫氳繃id鍒犻櫎璁惧闇�姹傝鍒掗」鐩瓙琛�" )
+// @DeleteMapping
+// @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_del')" )
+// public R removeById(@RequestBody Long[] ids) {
+// return R.ok(deviceDemandTotalService.removeBatchByIds(CollUtil.toList(ids)));
+// }
/**
--
Gitblit v1.9.1