bug修复

@@ -8,11 +8,17 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceCagegoryDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceCagegoryDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceCagegoryService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceCagegoryService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @RestController
 @RestController
 @TbCoreComponent
 @TbCoreComponent
@@ -23,6 +29,8 @@ import java.util.List;
 public class TkDeviceCagegoryController extends BaseController {
 public class TkDeviceCagegoryController extends BaseController {
     private final TkDeviceCagegoryService tkDeviceCagegoryService;
     private final TkDeviceCagegoryService tkDeviceCagegoryService;
 
 
+    private final TkDeviceAccountService tkDeviceAccountService;
+
     @PostMapping("/getCagegoryByParentid")
     @PostMapping("/getCagegoryByParentid")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @ApiOperation("根据父类型获取设备类别")
     @ApiOperation("根据父类型获取设备类别")
@@ -48,6 +56,12 @@ public class TkDeviceCagegoryController extends BaseController {
     @GetMapping("/delete")
     @GetMapping("/delete")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
     public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
     public ResponseEntity<Boolean> delete(@RequestParam("id") String id) throws ThingsboardException {
+        Map<String, Object> params = new HashMap<>();
+        params.put("categoryId", id);
+        TkPageData<TkDeviceAccountDTO> page = tkDeviceAccountService.page(params);
+        if (page != null && page.getTotal() > 0) {
+            throw new TkDataValidationException("类别下还有关联数据不能删除！");
+        }
         return ResponseEntity.ok(tkDeviceCagegoryService.delete(id));
         return ResponseEntity.ok(tkDeviceCagegoryService.delete(id));
     }
     }
 
 

@@ -11,10 +11,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkDeviceCagegoryDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkSupplierDTO;
-import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceAccountEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceAccountEntity;
@@ -24,6 +21,7 @@ import org.thingsboard.server.dao.yunteng.service.*;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -156,6 +154,21 @@ public class TkDeviceAccountServiceImpl extends AbstractBaseService<TkDeviceAcco
     }
     }
 
 
     @Override
     @Override
+    public List<TkDeviceAccountDTO> listBySupplierId(List<String> supplierIdList) throws ThingsboardException {
+        if (CollectionUtils.isNotEmpty(supplierIdList)) {
+            throw new TkDataValidationException("供应商id不能为空！");
+        }
+        QueryWrapper<TkDeviceAccountEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkDeviceAccountEntity> lambda = wrapper.lambda();
+        TenantId tenantId = SpringBeanUtils.getTenantId();
+        lambda.eq(TkDeviceAccountEntity::getTenantId, tenantId.getId().toString());
+        lambda.in(TkDeviceAccountEntity::getSupplierId, supplierIdList);
+        List<TkDeviceAccountEntity> entities = baseMapper.selectList(wrapper);
+        return Optional.ofNullable(entities).map(all -> all.stream().map(item -> item.getDTO(TkDeviceAccountDTO.class))
+                .collect(Collectors.toList())).orElse(null);
+    }
+
+    @Override
     public boolean delete(String id) {
     public boolean delete(String id) {
         int count = baseMapper.deleteById(id);
         int count = baseMapper.deleteById(id);
         return count > 0;
         return count > 0;

@@ -107,7 +107,7 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag
         }
         }
         TkDeviceCagegoryUtil utils = new TkDeviceCagegoryUtil(topMenuList, subMenu);
         TkDeviceCagegoryUtil utils = new TkDeviceCagegoryUtil(topMenuList, subMenu);
         List<TkDeviceCagegoryDTO> result = utils.getTree();
         List<TkDeviceCagegoryDTO> result = utils.getTree();
-        return result;
+        return Optional.ofNullable(result).orElse(new ArrayList<>());
     }
     }
 
 
     private List<String> getFullTreeId(List<String> filterIdList, Map<String, String> idMap) {
     private List<String> getFullTreeId(List<String> filterIdList, Map<String, String> idMap) {

@@ -142,7 +142,7 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
             dto.setTenantId(SpringBeanUtils.getTenantId().getId().toString());
         }
         }
 
 
-        if (dto.getPreserveStatus() != null) {
+        if (dto.getPreserveStatus() == null) {
             dto.setPreserveStatus(PreserveRecordStatusEnum.INCOMPLETE);
             dto.setPreserveStatus(PreserveRecordStatusEnum.INCOMPLETE);
         }
         }
     }
     }

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkSupplierDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkSupplierDTO;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -18,8 +19,11 @@ import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSupplierEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSupplierEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkSupplierMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkSupplierMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkSupplierService;
 import org.thingsboard.server.dao.yunteng.service.TkSupplierService;
 
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -29,6 +33,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @Slf4j
 public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper, TkSupplierEntity>
 public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper, TkSupplierEntity>
         implements TkSupplierService {
         implements TkSupplierService {
+
+    private TkDeviceAccountService tkDeviceAccountService;
+
     @Override
     @Override
     public TkPageData<TkSupplierDTO> page(TkSupplierDTO condition) throws ThingsboardException {
     public TkPageData<TkSupplierDTO> page(TkSupplierDTO condition) throws ThingsboardException {
         QueryWrapper<TkSupplierEntity> wrapper = new QueryWrapper<>();
         QueryWrapper<TkSupplierEntity> wrapper = new QueryWrapper<>();
@@ -114,7 +121,13 @@ public class TkSupplierServiceImpl extends AbstractBaseService<TkSupplierMapper,
     }
     }
 
 
     @Override
     @Override
-    public boolean delete(String id) {
+    public boolean delete(String id) throws ThingsboardException {
+        List<String> supplierId = new ArrayList<>();
+        supplierId.add(id);
+        List<TkDeviceAccountDTO> tkDeviceAccountDTOS = tkDeviceAccountService.listBySupplierId(supplierId);
+        if (CollectionUtils.isNotEmpty(tkDeviceAccountDTOS)) {
+            throw new TkDataValidationException("存在关联的供应商无法删除！");
+        }
         int count = baseMapper.deleteById(id);
         int count = baseMapper.deleteById(id);
         return count > 0;
         return count > 0;
     }
     }

@@ -19,6 +19,8 @@ public interface TkDeviceAccountService extends BaseService<TkDeviceAccountEntit
 
 
     List<String> getIdByDeviceName(String deviceName) throws ThingsboardException;
     List<String> getIdByDeviceName(String deviceName) throws ThingsboardException;
 
 
+    List<TkDeviceAccountDTO> listBySupplierId(List<String> supplierId) throws ThingsboardException;
+
     boolean delete(String id);
     boolean delete(String id);
 
 
 }
 }

@@ -16,7 +16,7 @@ public interface TkSupplierService extends BaseService<TkSupplierEntity> {
 
 
     TkSupplierDTO detail(String id) throws ThingsboardException;
     TkSupplierDTO detail(String id) throws ThingsboardException;
 
 
-    boolean delete(String id);
+    boolean delete(String id) throws ThingsboardException;
 
 
     boolean delete(List<String> ids);
     boolean delete(List<String> ids);
 }
 }