设备台账和供应商接口

@@ -16,6 +16,8 @@ public class TkDeviceCagegoryDTO extends TenantDTO {
     private String parentId;
     @ApiModelProperty(value = "排序")
     private Integer cagegoryOrder;
+    @ApiModelProperty(value = "pathid")
+    private String pathId;
     @ApiModelProperty(value = "子类别")
     private List<TkDeviceCagegoryDTO> children;
 }

@@ -15,4 +15,5 @@ public class TkDeviceCagegoryEntity extends TenantBaseEntity {
     private String name;
     private String parentId;
     private Integer cagegoryOrder;
+    private String pathId;
 }

@@ -20,6 +20,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDeviceAccountEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceAccountMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -35,11 +36,15 @@ public class TkDeviceAccountServiceImpl extends AbstractBaseService<TkDeviceAcco
     private final TkUserService tkUserService;
 
     @Override
-    public TkPageData<TkDeviceAccountDTO> page(Map<String, Object> params) {
+    public TkPageData<TkDeviceAccountDTO> page(Map<String, Object> params) throws ThingsboardException {
         TkPageData<TkDeviceAccountDTO> result = new TkPageData<>();
         IPage<TkDeviceAccountEntity> page =
                 getPage(params, "create_time", false);
-
+        String categoryId = (String) params.get("categoryId");
+        if (StringUtils.isNotBlank(categoryId)) {
+            List<String> childIdList = tkDeviceCagegoryService.getChildIdById(categoryId);
+            params.put("categoryIds", childIdList);
+        }
         IPage<TkDeviceAccountDTO> pageData = baseMapper.getDataPage(page, params);
         if (pageData != null) {
             result.setItems(pageData.getRecords());

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceCagegoryDTO;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.dao.util.TkDeviceCagegoryUtil;
+import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceCagegoryEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceCagegoryMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -34,11 +35,27 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
     @Override
     public TkDeviceCagegoryDTO save(TkDeviceCagegoryDTO tkDeviceCagegoryDTO) throws ThingsboardException {
         checkDto(tkDeviceCagegoryDTO);
+        String parentId = tkDeviceCagegoryDTO.getParentId();
+        TkDeviceCagegoryDTO parentDto = null;
+        if (StringUtils.isNotBlank(parentId)) {
+            parentDto = detail(parentId);
+            if (parentDto == null) {
+                throw new TkDataValidationException("父级类别不存在！");
+            }
+        }
         TkDeviceCagegoryEntity entity = new TkDeviceCagegoryEntity();
         if (StringUtils.isBlank(tkDeviceCagegoryDTO.getId())) {
             tkDeviceCagegoryDTO.copyToEntity(entity);
             baseMapper.insert(entity);
+            String id = entity.getId();
+            tkDeviceCagegoryDTO.setPathId(parentDto.getPathId() + "_" + tkDeviceCagegoryDTO.getId());
+            LambdaQueryWrapper<TkDeviceCagegoryEntity> filter = new QueryWrapper<TkDeviceCagegoryEntity>().lambda()
+                    .eq(TkDeviceCagegoryEntity::getId, tkDeviceCagegoryDTO.getId());
+            entity = tkDeviceCagegoryDTO.getEntity(TkDeviceCagegoryEntity.class);
+            baseMapper.update(entity, filter);
+
         } else {
+            tkDeviceCagegoryDTO.setPathId(parentDto.getPathId() + "_" + tkDeviceCagegoryDTO.getId());
             LambdaQueryWrapper<TkDeviceCagegoryEntity> filter = new QueryWrapper<TkDeviceCagegoryEntity>().lambda()
                     .eq(TkDeviceCagegoryEntity::getId, tkDeviceCagegoryDTO.getId());
             entity = tkDeviceCagegoryDTO.getEntity(TkDeviceCagegoryEntity.class);
@@ -51,6 +68,9 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
     }
 
     private void checkDto(TkDeviceCagegoryDTO dto) throws ThingsboardException {
+        if (StringUtils.isBlank(dto.getName())) {
+            throw new TkDataValidationException("类型名称不能为空！");
+        }
         if (StringUtils.isBlank(dto.getTenantId())) {
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
@@ -146,8 +166,16 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
     }
 
     @Override
-    public List<String> getCategoryIdParentid(String parentId) {
-        List<String> result=new ArrayList<>();
+    public List<String> getChildIdById(String id) throws ThingsboardException {
+        QueryWrapper<TkDeviceCagegoryEntity> queryWrapper = new QueryWrapper();
+        LambdaQueryWrapper<TkDeviceCagegoryEntity> lambda = queryWrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkDeviceCagegoryEntity::getTenantId, tenantId.getId().toString());
+        lambda.like(TkDeviceCagegoryEntity::getPathId, id);
+        List<TkDeviceCagegoryEntity> entityList = baseMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(entityList)) {
+            return entityList.stream().map(BaseEntity::getId).collect(Collectors.toList());
+        }
         return null;
     }
 }

@@ -8,7 +8,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDeviceAccountEntity;
 import java.util.Map;
 
 public interface TkDeviceAccountService extends BaseService<TkDeviceAccountEntity> {
-    TkPageData<TkDeviceAccountDTO> page(Map<String, Object> params);
+    TkPageData<TkDeviceAccountDTO> page(Map<String, Object> params) throws ThingsboardException;
 
     TkDeviceAccountDTO save(TkDeviceAccountDTO dto) throws ThingsboardException;
 

@@ -18,5 +18,5 @@ public interface TkDeviceCagegoryService  extends BaseService<TkDeviceCagegoryEn
 
     List<TkDeviceCagegoryDTO> getCagegoryByParentid(String parentId) throws ThingsboardException;
 
-    List<String> getCategoryIdParentid(String parentId);
+    List<String> getChildIdById(String id) throws ThingsboardException;
 }

@@ -63,7 +63,7 @@
             </if>
             <if test="queryMap.categoryIds !=null">
                 AND o.category_id in
-                <foreach collection="categoryIds" item="item" index="index"
+                <foreach collection="queryMap.categoryIds" item="item" index="index"
                          separator="," open="(" close=")">
                     #{item}
                 </foreach>