Merge branch 'cherry-pick-aec4c325' into 'master_dev'

feat:场景联动选择设备后不允许分配给边端

See merge request yunteng/thingskit!423

@@ -19,6 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
@@ -40,12 +41,14 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.device.DeviceDao;
 import org.thingsboard.server.dao.model.sql.DeviceEntity;
+import org.thingsboard.server.dao.model.sql.DeviceInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.util.SqlDao;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import static org.thingsboard.server.dao.DaoUtil.convertTenantEntityInfosToDto;
 
@@ -65,6 +68,8 @@ public class JpaDeviceDao extends JpaAbstractDao<DeviceEntity, Device> implement
 
     @Autowired
     private DeviceProfileRepository deviceProfileRepository;
+    @Autowired
+    TkDeviceService tkDeviceService;
 
     @Override
     protected Class<DeviceEntity> getEntityClass() {
@@ -107,17 +112,25 @@ public class JpaDeviceDao extends JpaAbstractDao<DeviceEntity, Device> implement
 
     @Override
     public PageData<DeviceInfo> findDeviceInfosByFilter(DeviceInfoFilter filter, PageLink pageLink) {
-        return DaoUtil.toPageData(
-                deviceRepository.findDeviceInfosByFilter(
-                        filter.getTenantId().getId(),
-                        DaoUtil.getStringId(filter.getCustomerId()),
-                        DaoUtil.getStringId(filter.getEdgeId()),
-                        filter.getType(),
-                        DaoUtil.getStringId(filter.getDeviceProfileId()),
-                        filter.getActive() != null,
-                        Boolean.TRUE.equals(filter.getActive()),
-                        pageLink.getTextSearch(),
-                        DaoUtil.toPageable(pageLink)));
+        Page<DeviceInfoEntity> list = deviceRepository.findDeviceInfosByFilter(
+                filter.getTenantId().getId(),
+                DaoUtil.getStringId(filter.getCustomerId()),
+                DaoUtil.getStringId(filter.getEdgeId()),
+                filter.getType(),
+                DaoUtil.getStringId(filter.getDeviceProfileId()),
+                filter.getActive() != null,
+                Boolean.TRUE.equals(filter.getActive()),
+                pageLink.getTextSearch(),
+                DaoUtil.toPageable(pageLink));
+        List<DeviceInfoEntity> listContent = new CopyOnWriteArrayList<>(list.getContent());
+        for (DeviceInfoEntity entity:listContent) {
+            String result =  tkDeviceService.usedBySceneLinkage(entity.getTenantId().toString(), entity.getId().toString());
+            if(!result.isEmpty()){
+                listContent.remove(entity);
+            }
+        }
+        Page<DeviceInfoEntity> newPage = new PageImpl<>(listContent,  DaoUtil.toPageable(pageLink), listContent.size());
+        return DaoUtil.toPageData(newPage);
     }
 
     @Override

@@ -603,8 +603,8 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
         return usedBySceneLinkage(tenantId, tbDeviceId.toString());
     }
 
-    @Nullable
-    private String usedBySceneLinkage(String tenantId, String tbDeviceId) {
+    @Override
+    public String usedBySceneLinkage(String tenantId, String tbDeviceId) {
         LambdaQueryWrapper<TkSceneLinkageEntity> sceneFilter =
                 new QueryWrapper<TkSceneLinkageEntity>()
                         .lambda()

@@ -286,4 +286,6 @@ public interface TkDeviceService extends TbBaseService<TkDeviceEntity> {
    * @return true成功 false失败
    */
   boolean updateDeviceProfileByTbDeviceId(UUID tenantId,UUID tbDeviceId,UUID tbDeviceProfileId);
+
+  String usedBySceneLinkage(String tenantId, String tbDeviceId);
 }