From cf55ebf52cb3fa96f1efced495c120dc0c4ecd7b Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 09 四月 2025 10:06:04 +0800
Subject: [PATCH] 优化项优化 设备分类新增问题 库存列表状态字段 中标单按钮限制
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java
index b9b2553..f0862ac 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java
@@ -9,9 +9,12 @@
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.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.DeviceClass;
import com.by4cloud.platformx.device.entity.DeviceInventory;
+import com.by4cloud.platformx.device.entity.MaxSize;
import com.by4cloud.platformx.device.service.DeviceClassService;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -22,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.Max;
import java.util.List;
import java.util.Objects;
@@ -39,6 +43,7 @@
public class DeviceClassController {
private final DeviceClassService deviceClassService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -85,7 +90,7 @@
@GetMapping("/{id}" )
public R getById(@PathVariable("id" ) Long id) {
DeviceClass byId = deviceClassService.getById(id);
- byId.setParentId(byId.getPId().intValue());
+ byId.setParentId(byId.getPId());
return R.ok(byId);
}
@@ -101,13 +106,8 @@
if(deviceClass.getParentId()==null){
return R.failed("涓婄骇鍒嗙被鏈�夋嫨锛�");
}
- QueryWrapper<DeviceClass> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(DeviceClass::getNumber,deviceClass.getNumber());
- List<DeviceClass> list = deviceClassService.list(wrapper);
- if(list!=null&&list.size()>0){
- return R.failed("璇ョ紪鍙峰凡瀛樺湪");
- }
- deviceClass.setPId(deviceClass.getParentId().longValue());
+ deviceClass.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_CLASS_NUM));
+ deviceClass.setPId(deviceClass.getParentId());
return R.ok(deviceClassService.save(deviceClass));
}
@@ -124,16 +124,7 @@
if(deviceClass.getParentId()==null){
return R.failed("涓婄骇鍒嗙被鏈�夋嫨锛�");
}
- QueryWrapper<DeviceClass> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(DeviceClass::getNumber,deviceClass.getNumber());
- List<DeviceClass> list = deviceClassService.list(wrapper);
- if(list!=null&&list.size()>0){
- DeviceClass deviceClass1 = list.get(0);
- if(!deviceClass1.getId().equals(deviceClass.getId())){
- return R.failed("宸插瓨鍦ㄨ搴忓垪鍙凤紝璇烽噸鏂版坊鍔�");
- }
- }
- deviceClass.setPId(deviceClass.getParentId().longValue());
+ deviceClass.setPId(deviceClass.getParentId());
return R.ok(deviceClassService.updateById(deviceClass));
}
--
Gitblit v1.9.1