diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java index 1698e39..f448cc5 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java @@ -1,6 +1,7 @@ package com.aucma.base.mapper; import java.util.List; +import org.apache.ibatis.annotations.Param; import com.aucma.base.domain.BaseDeviceParam; /** @@ -67,6 +68,15 @@ public interface BaseDeviceParamMapper */ public List selectByParamCodes(List paramCodes); + /** + * 校验参数编号唯一性 + * + * @param paramCode 参数编号 + * @param excludeObjId 排除的主键(更新时使用) + * @return 已存在数量 + */ + public int countByParamCode(@Param("paramCode") String paramCode, @Param("excludeObjId") Long excludeObjId); + /** * 批量新增设备参数 * diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamServiceImpl.java index 8a78d0e..f86907c 100644 --- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamServiceImpl.java +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamServiceImpl.java @@ -59,6 +59,14 @@ public class BaseDeviceParamServiceImpl implements IBaseDeviceParamService @Override public int insertBaseDeviceParam(BaseDeviceParam baseDeviceParam) { + String paramCode = baseDeviceParam.getParamCode(); + int count = baseDeviceParamMapper.countByParamCode(paramCode, null); + System.out.println(count + paramCode); + // 校验参数编号唯一 + if (count > 0) + { + throw new ServiceException("参数编号已存在:" + paramCode); + } return baseDeviceParamMapper.insertBaseDeviceParam(baseDeviceParam); } @@ -71,6 +79,13 @@ public class BaseDeviceParamServiceImpl implements IBaseDeviceParamService @Override public int updateBaseDeviceParam(BaseDeviceParam baseDeviceParam) { + String paramCode = baseDeviceParam.getParamCode(); + int count = baseDeviceParamMapper.countByParamCode(paramCode, baseDeviceParam.getObjId()); + System.out.println(count + paramCode + baseDeviceParam.getObjId()); + if (count > 0) + { + throw new ServiceException("参数编号已存在:" + baseDeviceParam.getParamCode()); + } return baseDeviceParamMapper.updateBaseDeviceParam(baseDeviceParam); } diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml index 4211b42..9b49106 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml @@ -61,10 +61,26 @@ + + +