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