From 2d9f1f41744f49377a7ec930635d4889b9d355c6 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 01 四月 2025 16:04:00 +0800
Subject: [PATCH] fix: 修改设备添加逻辑
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java | 12 ++++++++++--
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java | 3 +++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java
index 5a68e34..ba939c8 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/Device.java
@@ -49,6 +49,9 @@
@Schema(description = "鍒堕�犲巶鍟�")
@Column(columnDefinition="VARCHAR(64) comment '鍒堕�犲巶鍟�'")
private String manu;
+ @Schema(description = "鍒堕�犲巶鍟�")
+ @Column(columnDefinition="long comment '鍒堕�犲巶鍟�'")
+ private Long manuId;
@Schema(description = "鍙戝竷浜�")
@Column(columnDefinition="VARCHAR(64) comment '鍙戝竷浜�'")
private String releasePerson;
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 3f4dadc..1ffdbd0 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
@@ -29,6 +29,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -67,7 +68,8 @@
Page<Device> page1 = deviceService.page(page, wrapper);
for (Device device1 : page1.getRecords()) {
QueryWrapper<DeviceInventory> wrapper1 = new QueryWrapper<>();
- wrapper1.lambda().eq(DeviceInventory::getDeviceId,device1.getId());
+ wrapper1.lambda().eq(DeviceInventory::getDeviceId,device1.getId())
+ .eq(DeviceInventory::getInventoryStatus,1);
long count = inventoryService.count(wrapper1);
device1.setNum(Integer.parseInt(count+""));
}
@@ -157,6 +159,7 @@
return R.ok(deviceService.save(device));
}
device.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
+ device.setReleaseDate(new Date());
return R.ok(deviceService.save(device));
}
@@ -183,7 +186,12 @@
@PutMapping
@PreAuthorize("@pms.hasPermission('platformx_device_edit')" )
public R updateById(@RequestBody Device device) {
- return R.ok(deviceService.updateById(device));
+ Device byId = deviceService.getById(device.getId());
+ if(StringUtils.isNotBlank(byId.getNumber())){
+ byId.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_NUM));
+ byId.setReleaseDate(new Date());
+ }
+ return R.ok(deviceService.updateById(device));
}
/**
--
Gitblit v1.9.1