From 16559bd4f8f14a80a0a1c2b4debfad7142a16679 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 11 Mar 2025 16:41:23 +0800
Subject: [PATCH] =?UTF-8?q?change(hwmom-mes):=20(MeterSphere100025)?=
 =?UTF-8?q?=E3=80=90=E8=AE=BE=E5=A4=87=E5=A4=A7=E7=B1=BB=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=91=E7=BC=96=E5=8F=B7=E3=80=81=E5=90=8D=E7=A7=B0=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在保存设备类别信息前，增加对设备类别名称和编号的唯一性校验
- 如果存在重复的名称或编号，抛出异常并提示相应错误信息
---
 .../impl/BaseDeviceCategoryServiceImpl.java   | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceCategoryServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceCategoryServiceImpl.java
index 89a91e3d..1997e450 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceCategoryServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceCategoryServiceImpl.java
@@ -1,5 +1,8 @@
 package org.dromara.mes.service.impl;
 
+
+import org.springframework.util.ObjectUtils;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -7,7 +10,6 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.dromara.mes.domain.bo.BaseDeviceCategoryBo;
@@ -116,6 +118,33 @@ public class BaseDeviceCategoryServiceImpl implements IBaseDeviceCategoryService
      */
     private void validEntityBeforeSave(BaseDeviceCategory entity){
         //TODO 做一些数据校验,如唯一约束
+
+        //编号校验
+        if (StringUtils.isNotNull(entity.getDeviceCategoryCode())){
+            BaseDeviceCategoryBo query = new BaseDeviceCategoryBo();
+            query.setDeviceCategoryCode(entity.getDeviceCategoryCode());
+            MPJLambdaWrapper<BaseDeviceCategory> lqw = buildQueryWrapper(query);
+            BaseDeviceCategory detail = baseMapper.selectOne(lqw);
+            if ( !ObjectUtils.isEmpty(detail)
+                && !detail.getDeviceCategoryId().equals(entity.getDeviceCategoryId())){
+                throw new ServiceException("编号已存在");
+            }
+        }
+
+        //名称校验
+        if (StringUtils.isNotNull(entity.getDeviceCategoryName())){
+            BaseDeviceCategoryBo query = new BaseDeviceCategoryBo();
+            query.setDeviceCategoryName(entity.getDeviceCategoryName());
+            MPJLambdaWrapper<BaseDeviceCategory> lqw = JoinWrappers.lambda(BaseDeviceCategory.class)
+            .selectAll(BaseDeviceCategory.class)
+            .eq(StringUtils.isNotBlank(query.getDeviceCategoryName()),BaseDeviceCategory::getDeviceCategoryName, query.getDeviceCategoryName());
+            BaseDeviceCategory detail = baseMapper.selectOne(lqw);
+            if ( !ObjectUtils.isEmpty(detail)
+                && !detail.getDeviceCategoryId().equals(entity.getDeviceCategoryId())){
+                throw new ServiceException("名称已存在");
+            }
+        }
+
     }
 
     /**