fix: 修改设备添加逻辑

kongdeqiang

2025-04-01 2d9f1f41744f49377a7ec930635d4889b9d355c6

fix: 修改设备添加逻辑

 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;

 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));
    }

    /**