bug修复

@@ -32,6 +32,9 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
     @Override
     public TkDeviceCagegoryDTO save(TkDeviceCagegoryDTO tkDeviceCagegoryDTO) throws ThingsboardException {
         checkDto(tkDeviceCagegoryDTO);
+        if (StringUtils.isBlank(tkDeviceCagegoryDTO.getId()) && checkDuplicateData(tkDeviceCagegoryDTO)) {
+            throw new TkDataValidationException("同级目录下存在重名类别！");
+        }
         String parentId = tkDeviceCagegoryDTO.getParentId();
         TkDeviceCagegoryDTO parentDto = null;
         if (StringUtils.isNotBlank(parentId)) {
@@ -61,6 +64,27 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
         return tkDeviceCagegoryDTO;
     }
 
+    private boolean checkDuplicateData(TkDeviceCagegoryDTO tkDeviceCagegoryDTO) throws ThingsboardException {
+        Boolean result = false;
+        if (StringUtils.isBlank(tkDeviceCagegoryDTO.getParentId())) {
+            return result;
+        }
+        QueryWrapper<TkDeviceCagegoryEntity> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<TkDeviceCagegoryEntity> lambda = queryWrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkDeviceCagegoryEntity::getTenantId, tenantId.getId().toString());
+        lambda.eq(TkDeviceCagegoryEntity::getParentId, tkDeviceCagegoryDTO.getParentId());
+        lambda.eq(TkDeviceCagegoryEntity::getName, tkDeviceCagegoryDTO.getName());
+
+        List<TkDeviceCagegoryEntity> entityList = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(entityList)) {
+            return true;
+        }
+
+        return result;
+
+    }
+
     private void checkDto(TkDeviceCagegoryDTO dto) throws ThingsboardException {
         if (StringUtils.isBlank(dto.getName())) {
             throw new TkDataValidationException("类型名称不能为空！");

@@ -15,6 +15,7 @@ import org.thingsboard.server.common.data.yunteng.dto.TkMalfunctionReasonDTO;
 import org.thingsboard.server.common.data.yunteng.enums.MalfunctionReasonStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkMalfunctionReasonEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkMalfunctionReasonMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -48,6 +49,7 @@ public class TkMalfunctionReasonServiceImpl extends AbstractBaseService<TkMalfun
             lambda.eq(TkMalfunctionReasonEntity::getStatus, condition.getStatus());
         }
 
+        lambda.orderByDesc(TenantBaseEntity::getCreateTime);
         Page<TkMalfunctionReasonEntity> page = new Page<>();
         page.setCurrent(condition.getPage());
         page.setSize(condition.getPageSize());
@@ -82,6 +84,17 @@ public class TkMalfunctionReasonServiceImpl extends AbstractBaseService<TkMalfun
     @Override
     public TkMalfunctionReasonDTO save(TkMalfunctionReasonDTO tkMalfunctionReasonDTO) throws ThingsboardException {
         checkDto(tkMalfunctionReasonDTO);
+        if (StringUtils.isBlank(tkMalfunctionReasonDTO.getId())) {
+            List<TkMalfunctionReasonDTO> reasonEntities = checkDuplicateData(tkMalfunctionReasonDTO.getReason());
+            if (CollectionUtils.isNotEmpty(reasonEntities)) {
+                throw new TkDataValidationException("该故障原因已存在！");
+            }
+            List<TkMalfunctionReasonDTO> codeEntities = checkDuplicateData(tkMalfunctionReasonDTO.getCode());
+            if (CollectionUtils.isNotEmpty(codeEntities)) {
+                throw new TkDataValidationException("该故障编码已存在！");
+            }
+        }
+
         TkMalfunctionReasonEntity entity = new TkMalfunctionReasonEntity();
         if (StringUtils.isBlank(tkMalfunctionReasonDTO.getId())) {
             tkMalfunctionReasonDTO.copyToEntity(entity);
@@ -98,6 +111,19 @@ public class TkMalfunctionReasonServiceImpl extends AbstractBaseService<TkMalfun
         return tkMalfunctionReasonDTO;
     }
 
+    private List<TkMalfunctionReasonDTO> checkDuplicateData(String key) throws ThingsboardException {
+        QueryWrapper<TkMalfunctionReasonEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkMalfunctionReasonEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkMalfunctionReasonEntity::getTenantId, tenantId.getId().toString());
+        if (StringUtils.isNotBlank(key)) {
+            lambda.and(e -> e.eq(TkMalfunctionReasonEntity::getCode, key).or().eq(TkMalfunctionReasonEntity::getReason, key));
+        }
+        List<TkMalfunctionReasonEntity> entitys = baseMapper.selectList(wrapper);
+        return Optional.ofNullable(entitys).map(all -> all.stream().map(item -> item.getDTO(TkMalfunctionReasonDTO.class))
+                .collect(Collectors.toList())).orElse(null);
+    }
+
     @Override
     public TkMalfunctionReasonDTO detail(String id) throws ThingsboardException {
         TkMalfunctionReasonDTO result = null;

@@ -21,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkSupplierService;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -32,19 +33,17 @@ public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper,
     @Override
     public TkPageData<TkSupplierDTO> page(TkSupplierDTO condition) throws ThingsboardException {
         QueryWrapper<TkSupplierEntity> wrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<TkSupplierEntity> lambda = wrapper.lambda();
         TenantId tenantId = SpringBeanUtils.getTenantId();
-        lambda.eq(TkSupplierEntity::getTenantId, tenantId.getId().toString());
+        wrapper.eq("tenant_id", tenantId.getId().toString());
         if (StringUtils.isNotBlank(condition.getCode())) {
-            lambda.like(TkSupplierEntity::getCode, condition.getCode());
+            wrapper.like("lower(code)", condition.getCode().toLowerCase(Locale.ROOT));
         }
 
         if (StringUtils.isNotBlank(condition.getName())) {
-            lambda.like(TkSupplierEntity::getName, condition.getName());
+            wrapper.like("lower(name)", condition.getName().toLowerCase(Locale.ROOT));
         }
 
-        lambda.orderByDesc(TenantBaseEntity::getCreateTime);
-
+        wrapper.orderByDesc("create_time");
         Page<TkSupplierEntity> page = new Page<>();
         page.setCurrent(condition.getPage());
         page.setSize(condition.getPageSize());
@@ -114,7 +113,7 @@ public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper,
     }
 
     @Override
-    public boolean delete(String id){
+    public boolean delete(String id) {
         int count = baseMapper.deleteById(id);
         return count > 0;
     }

@@ -53,7 +53,7 @@
                 AND o.tenant_id = #{queryMap.tenantId}
             </if>
             <if test="queryMap.code !=null and queryMap.code !=''">
-                AND o.code LIKE concat('%',#{queryMap.code}::TEXT,'%')
+                AND o.code ILIKE concat('%',#{queryMap.code}::TEXT,'%')
             </if>
             <if test="queryMap.status !=null and queryMap.status !=''">
                 AND o.status = #{queryMap.status}