From 62f0eb6e3296fa3ef589e48bca06198ed26f9893 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 25 三月 2025 17:32:40 +0800
Subject: [PATCH] 设备技术协议
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 2f377e2..b9b2553 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
@@ -4,11 +4,13 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.entity.DeviceClass;
+import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.service.DeviceClassService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
@@ -49,7 +51,7 @@
@PreAuthorize("@pms.hasPermission('platformx_deviceClass_view')" )
public R getDeviceClassPage(@ParameterObject Page page, @ParameterObject DeviceClass deviceClass) {
LambdaQueryWrapper<DeviceClass> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(StrUtil.isNotBlank(deviceClass.getName()),DeviceClass::getName,deviceClass.getName());
+ wrapper.like(StrUtil.isNotBlank(deviceClass.getName()),DeviceClass::getName,deviceClass.getName());
wrapper.eq(StrUtil.isNotBlank(deviceClass.getNumber()),DeviceClass::getNumber,deviceClass.getNumber());
return R.ok(deviceClassService.page(page, wrapper));
}
@@ -99,6 +101,12 @@
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());
return R.ok(deviceClassService.save(deviceClass));
}
@@ -116,6 +124,15 @@
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));
}
--
Gitblit v1.9.1