From c40cf5dde3e41339ef5300192e0310070886e5af Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 26 三月 2025 17:22:19 +0800
Subject: [PATCH] fix: 新增设备时自动添加编号
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java | 21 ++++++---------------
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java | 4 ++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java | 32 +++++---------------------------
3 files changed, 15 insertions(+), 42 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..63b3c22 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;
/**
* 鍒嗛〉鏌ヨ
@@ -101,12 +106,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){
- return R.failed("璇ョ紪鍙峰凡瀛樺湪");
- }
+ deviceClass.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_CLASS_NUM));
deviceClass.setPId(deviceClass.getParentId().longValue());
return R.ok(deviceClassService.save(deviceClass));
}
@@ -123,15 +123,6 @@
public R updateById(@RequestBody DeviceClass deviceClass) {
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());
return R.ok(deviceClassService.updateById(deviceClass));
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
index b9943ed..0994dce 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
@@ -12,10 +12,12 @@
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.service.DeviceInventoryService;
import com.by4cloud.platformx.device.service.DeviceService;
+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;
@@ -44,6 +46,7 @@
private final DeviceService deviceService;
private final DeviceInventoryService inventoryService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -118,15 +121,7 @@
if(StringUtils.isBlank(device.getNumber())){
return R.failed("璇峰～鍐欒澶囩紪鍙�");
}
- QueryWrapper<Device> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(Device::getNumber,device.getNumber());
- List<Device> list = deviceService.list(wrapper);
- if(list !=null && list.size()>0){
- Device device1 = list.get(0);
- if(!device1.getId().equals(device.getId())){
- return R.failed("宸插瓨鍦ㄨ缂栧彿");
- }
- }
+ device.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
device.setReqStatus(1);
deviceService.updateById(device);
return R.ok();
@@ -159,15 +154,7 @@
if(device.getReqStatus()==0){
return R.ok(deviceService.save(device));
}
- if(StringUtils.isBlank(device.getNumber())){
- return R.failed("璇峰～鍐欒澶囩紪鍙�");
- }
- QueryWrapper<Device> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(Device::getNumber,device.getNumber());
- List<Device> list = deviceService.list(wrapper);
- if(list !=null && list.size()>0){
- return R.failed("宸插瓨鍦ㄨ缂栧彿");
- }
+ device.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
return R.ok(deviceService.save(device));
}
@@ -194,15 +181,6 @@
@PutMapping
@PreAuthorize("@pms.hasPermission('platformx_device_edit')" )
public R updateById(@RequestBody Device device) {
- QueryWrapper<Device> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(Device::getNumber,device.getNumber());
- List<Device> list = deviceService.list(wrapper);
- if(list !=null && list.size()>0){
- Device device1 = list.get(0);
- if(!device1.getId().equals(device.getId())){
- return R.failed("宸插瓨鍦ㄨ缂栧彿");
- }
- }
return R.ok(deviceService.updateById(device));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
index 864f549..03ff167 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -7,8 +7,10 @@
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.DeviceDemandPlan;
import com.by4cloud.platformx.device.service.DeviceDemandPlanService;
+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;
@@ -36,6 +38,7 @@
public class DeviceDemandPlanController {
private final DeviceDemandPlanService deviceDemandPlanService;
+ private final JcMaxSizeService maxSizeService;
/**
* 鍒嗛〉鏌ヨ
@@ -76,6 +79,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('platformx_deviceDemandPlan_add')" )
public R save(@RequestBody DeviceDemandPlan deviceDemandPlan) {
+ deviceDemandPlan.setNumber(maxSizeService.nextNo(MaxSizeContant.PLAN_NUM));
return R.ok(deviceDemandPlanService.save(deviceDemandPlan));
}
--
Gitblit v1.9.1