Merge branch 'cherry-pick-1bc7bd30' into 'master_dev'

feat: 新功能开发：优化查询所有接口

See merge request yunteng/thingskit!169

@@ -145,11 +145,11 @@ public class TkDataViewInterfaceController extends BaseController {
     }
     }
 
 
 
 
-    @GetMapping("/find_all_interface")
+    @GetMapping("/find_all_interface/{state}")
     @ApiOperation("查询所有接口")
     @ApiOperation("查询所有接口")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    public List<TkDataViewInterfaceDTO> findAll() throws ThingsboardException {
-        return tkDataViewInterfaceService.findAll(getCurrentUser().getCurrentTenantId());
+    public List<TkDataViewInterfaceDTO> findAll(@PathVariable("state") String state) throws ThingsboardException {
+        return tkDataViewInterfaceService.findAll(state,getCurrentUser().getCurrentTenantId());
     }
     }
 
 
 
 

@@ -156,11 +156,11 @@ public class TkDataViewInterfaceServiceImpl
     }
     }
 
 
     @Override
     @Override
-    public List<TkDataViewInterfaceDTO> findAll(String tenantId){
+    public List<TkDataViewInterfaceDTO> findAll(String state,String tenantId){
         List<String> tenantIds = new ArrayList<>();
         List<String> tenantIds = new ArrayList<>();
         tenantIds.add(tenantId);
         tenantIds.add(tenantId);
         tenantIds.add(EntityId.NULL_UUID.toString());
         tenantIds.add(EntityId.NULL_UUID.toString());
-        List<TkDataViewInterfaceDTO>  lists =baseMapper.findAll(tenantIds);
+        List<TkDataViewInterfaceDTO>  lists =baseMapper.findAll(Integer.parseInt(state),tenantIds);
         return lists;
         return lists;
     }
     }
 
 

@@ -35,7 +35,7 @@ public interface TkDataViewInterfaceMapper extends BaseMapper<TkDataViewInterfac
      * @param tenantIds
      * @param tenantIds
      * @return
      * @return
      */
      */
-    List<TkDataViewInterfaceDTO> findAll(@Param("tenantIds") List<String> tenantIds);
+    List<TkDataViewInterfaceDTO> findAll(@Param("state") Integer state,@Param("tenantIds") List<String> tenantIds);
 
 
     /**
     /**
      * SQL 查询
      * SQL 查询

@@ -28,7 +28,7 @@ public interface TkDataViewInterfaceService {
 
 
     List<TkDataViewInterfaceDTO> filterByInterfaceType(String type,String tenantId);
     List<TkDataViewInterfaceDTO> filterByInterfaceType(String type,String tenantId);
 
 
-    List<TkDataViewInterfaceDTO> findAll(String tenantId);
+    List<TkDataViewInterfaceDTO> findAll(String state,String tenantId);
 
 
     boolean batchPublishInterface(List<String> ids, String tenantId);
     boolean batchPublishInterface(List<String> ids, String tenantId);
 
 

@@ -65,6 +65,11 @@
         <include refid="columns"/>
         <include refid="columns"/>
         FROM tk_data_view_interface
         FROM tk_data_view_interface
         <where>
         <where>
+
+            <if test="state !=null and state !=''">
+                state = #{state}
+            </if>
+
             <if test="tenantIds !=null">
             <if test="tenantIds !=null">
                 AND tenant_id IN
                 AND tenant_id IN
                 <foreach collection="tenantIds" item="tenantId" open="(" separator="," close=")">
                 <foreach collection="tenantIds" item="tenantId" open="(" separator="," close=")">