Merge branch 'fix/teambition/2024-10-28' into 'master_dev'

Fix/teambition/2024 10 28

See merge request yunteng/thingskit!457

@@ -393,25 +393,30 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "是否场景联动调用,是true") @RequestParam(value = "isSceneLinkage", required = false)  Boolean isSceneLinkage,
       @ApiParam(value = "是否场景联动调用,是true") @RequestParam(value = "isSceneLinkage", required = false)  Boolean isSceneLinkage,
       @ApiParam(value = "是否边缘分配设备调用,是true") @RequestParam(value = "isEdgeDistribution", required = false) Boolean isEdgeDistribution,
       @ApiParam(value = "是否边缘分配设备调用,是true") @RequestParam(value = "isEdgeDistribution", required = false) Boolean isEdgeDistribution,
       @ApiParam(value = "edgeId") @RequestParam(value = "edgeId", required = false) String edgeId,
       @ApiParam(value = "edgeId") @RequestParam(value = "edgeId", required = false) String edgeId,
-      @ApiParam(value = "排除边端设备是true") @RequestParam(value = "isExcludeEdge", required = false) Boolean isExcludeEdge
+      @ApiParam(value = "排除边端设备是true") @RequestParam(value = "isExcludeEdge", required = false) Boolean isExcludeEdge,
+      @ApiParam(value = "排除云端设备是true") @RequestParam(value = "isExcludeCloud", required = false) Boolean isExcludeCloud
   )
   )
       throws ThingsboardException {
       throws ThingsboardException {
-    if(isExcludeEdge==null){
-      isExcludeEdge=false;
+    if (isExcludeEdge == null) {
+      isExcludeEdge = false;
+    }
+    if (isExcludeCloud == null) {
+      isExcludeCloud = false;
     }
     }
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
-        deviceType,
-        getCurrentUser().getTenantId().getId(),
-        organizationId,
-        deviceLabel,
-        StringUtils.isEmpty(deviceProfileId)?null:UUID.fromString(deviceProfileId),
-        transportType,
-        isSceneLinkage,
-        isEdgeDistribution,
-        StringUtils.isEmpty(edgeId)?null:UUID.fromString(edgeId),
-            isExcludeEdge
+            deviceType,
+            getCurrentUser().getTenantId().getId(),
+            organizationId,
+            deviceLabel,
+            StringUtils.isEmpty(deviceProfileId) ? null : UUID.fromString(deviceProfileId),
+            transportType,
+            isSceneLinkage,
+            isEdgeDistribution,
+            StringUtils.isEmpty(edgeId) ? null : UUID.fromString(edgeId),
+            isExcludeEdge,
+            isExcludeCloud
     );
     );
-    }
+  }
 
 
 
 
   @PostMapping("/getListByDeviceProfileIds")
   @PostMapping("/getListByDeviceProfileIds")

@@ -83,6 +83,21 @@ public class TkOpenApiRecordController extends BaseController {
     return ResponseEntity.ok(openApiRecordService.getClassify(getCurrentUser().getTenantId().toString(), type));
     return ResponseEntity.ok(openApiRecordService.getClassify(getCurrentUser().getTenantId().toString(), type));
   }
   }
 
 
+  @GetMapping("/getCustomClassify")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
+  @ApiImplicitParams(value = {
+          @ApiImplicitParam(name = "startTime", value = "开始时间" ,required = true),
+          @ApiImplicitParam(name = "endTime", value = "结束时间" ,required = true),
+          @ApiImplicitParam(name = "type", value = "统计类型 day以两小时为分组,month以一天为分组" ,required = true)
+  })
+  public ResponseEntity<List<OpenApiRecordClassifyAllDTO>> getCustomClassify(
+          @RequestParam(value = "startTime", required = true) Long startTime,
+          @RequestParam(value = "endTime", required = true) Long endTime,
+          @RequestParam(value = "type" ) String type
+  ) throws ThingsboardException {
+    return ResponseEntity.ok(openApiRecordService.getClassify(getCurrentUser().getTenantId().toString(), type,new java.util.Date(startTime),new java.util.Date(endTime)));
+  }
+
 
 
   @GetMapping("/getPage")
   @GetMapping("/getPage")
   public TkPageData<OpenApiRecordTopDTO> getPage(
   public TkPageData<OpenApiRecordTopDTO> getPage(

@@ -19,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.OpenApiRecordService;
 
 
 import java.sql.Time;
 import java.sql.Time;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -126,7 +127,11 @@ public class OpenApiRecordImpl extends AbstractBaseService<OpenApiRecordMapper,
       case "week":startTime=new java.util.Date(endTime.getTime()- HOUR_TIMESTAMP*24L*7L);break;
       case "week":startTime=new java.util.Date(endTime.getTime()- HOUR_TIMESTAMP*24L*7L);break;
       case "month":startTime=new java.util.Date(endTime.getTime()- HOUR_TIMESTAMP*24L*30L);break;
       case "month":startTime=new java.util.Date(endTime.getTime()- HOUR_TIMESTAMP*24L*30L);break;
     }
     }
+    return getClassify(tenantId,type,startTime,endTime);
+  }
 
 
+  @Override
+  public List<OpenApiRecordClassifyAllDTO> getClassify(String tenantId, String type, Date startTime, Date endTime) {
     List<OpenApiRecordClassifyDTO> tops =  baseMapper.getClassify(tenantId,type,startTime,endTime);
     List<OpenApiRecordClassifyDTO> tops =  baseMapper.getClassify(tenantId,type,startTime,endTime);
     List<OpenApiRecordClassifyAllDTO> allList =new ArrayList<>();
     List<OpenApiRecordClassifyAllDTO> allList =new ArrayList<>();
     if(!tops.isEmpty()){
     if(!tops.isEmpty()){

@@ -328,7 +328,8 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
             Boolean  isSceneLinkage,
             Boolean  isSceneLinkage,
             Boolean isEdgeDistribution,
             Boolean isEdgeDistribution,
             UUID edgeId,
             UUID edgeId,
-            Boolean isExcludeEdge) {
+            Boolean isExcludeEdge,
+            Boolean isExcludeCloud) {
         List<String> orgIds = organizationService.organizationAllIds(tenantId.toString(), organizationId);
         List<String> orgIds = organizationService.organizationAllIds(tenantId.toString(), organizationId);
         if (orgIds.isEmpty()) {
         if (orgIds.isEmpty()) {
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.ORGANIZATION_NOT_EXTIED.getI18nCode()));
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.ORGANIZATION_NOT_EXTIED.getI18nCode()));
@@ -336,7 +337,7 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
 
 
         List<TkDeviceEntity> listEntity = baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
         List<TkDeviceEntity> listEntity = baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
                 deviceType == null ? null : deviceType.name(),
                 deviceType == null ? null : deviceType.name(),
-                deviceLabel, deviceProfileId, transportTypeEnum,isSceneLinkage,isEdgeDistribution,edgeId,isExcludeEdge);
+                deviceLabel, deviceProfileId, transportTypeEnum,isSceneLinkage,isEdgeDistribution,edgeId,isExcludeEdge,isExcludeCloud);
         return  listEntity.stream().map(entity -> {
         return  listEntity.stream().map(entity -> {
                     return CopyUtils.copyAndReturn(entity, new DeviceDTO());
                     return CopyUtils.copyAndReturn(entity, new DeviceDTO());
                 }
                 }

@@ -62,7 +62,7 @@ public class TkDeviceStateLogServiceImpl
     }
     }
     if(isPtCommonTenant){
     if(isPtCommonTenant){
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId((List<String>) queryMap.get("orgIds"),
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId((List<String>) queryMap.get("orgIds"),
-              null,null,null,null,false,false,null,false);
+              null,null,null,null,false,false,null,false,false);
       List<String> finalTbDevices = new ArrayList<>();
       List<String> finalTbDevices = new ArrayList<>();
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       deviceIds = finalTbDevices;
       deviceIds = finalTbDevices;

@@ -250,7 +250,7 @@ public class TkHomePageServiceImpl implements HomePageService {
       totalFilter.put("organizationIds",organizationIds);
       totalFilter.put("organizationIds",organizationIds);
       //查询所有设备
       //查询所有设备
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(organizationIds,null,
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(organizationIds,null,
-              null,null,null,false,false,null,false);
+              null,null,null,false,false,null,false,false);
       List<String> finalTbDevices = new ArrayList<>();
       List<String> finalTbDevices = new ArrayList<>();
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       todayFilter.put("deviceIds",finalTbDevices);
       todayFilter.put("deviceIds",finalTbDevices);

@@ -113,7 +113,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
             List<TkVideoGbtDeviceDTO> deviceList = new ArrayList<>();
             List<TkVideoGbtDeviceDTO> deviceList = new ArrayList<>();
             List<DeviceDTO> deviceDTOS =  tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
             List<DeviceDTO> deviceDTOS =  tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
                     null, UUID.fromString(dto.getTenantId()),organizationId,null,
                     null, UUID.fromString(dto.getTenantId()),organizationId,null,
-                    null, TransportTypeEnum.GBT28181,false,false,null,true);
+                    null, TransportTypeEnum.GBT28181,false,false,null,true,false);
             if(deviceDTOS.isEmpty()){
             if(deviceDTOS.isEmpty()){
                 return dto;
                 return dto;
             }
             }

@@ -165,7 +165,8 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
           @Param("isSceneLinkage")Boolean  isSceneLinkage,
           @Param("isSceneLinkage")Boolean  isSceneLinkage,
           @Param("isEdgeDistribution")Boolean isEdgeDistribution,
           @Param("isEdgeDistribution")Boolean isEdgeDistribution,
           @Param("edgeId")UUID edgeId,
           @Param("edgeId")UUID edgeId,
-          @Param("isExcludeEdge")Boolean isExcludeEdge) ;
+          @Param("isExcludeEdge")Boolean isExcludeEdge,
+          @Param("isExcludeCloud")Boolean isExcludeCloud) ;
 
 
 
 
   List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(
   List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(

@@ -21,4 +21,5 @@ public interface OpenApiRecordService extends BaseService<TkOpenApiRecordEntity>
     TkPageData<OpenApiRecordTopDTO> getPage(String tenantId,Integer page,Integer pageSize);
     TkPageData<OpenApiRecordTopDTO> getPage(String tenantId,Integer page,Integer pageSize);
 
 
     List<OpenApiRecordClassifyAllDTO> getClassify(String tenantId,String type);
     List<OpenApiRecordClassifyAllDTO> getClassify(String tenantId,String type);
+    public  List<OpenApiRecordClassifyAllDTO> getClassify(String tenantId,String type,java.util.Date startTime,java.util.Date endTime);
 }
 }

@@ -81,7 +81,7 @@ public interface TkDeviceService extends TbBaseService<TkDeviceEntity> {
           TransportTypeEnum transportTypeEnum,
           TransportTypeEnum transportTypeEnum,
           Boolean  isSceneLinkage,
           Boolean  isSceneLinkage,
           Boolean isEdgeDistribution,
           Boolean isEdgeDistribution,
-          UUID edgeId,Boolean excludeEdge);
+          UUID edgeId,Boolean excludeEdge,Boolean isExcludeCloud);
 
 
 
 
   List<DeviceDTO> findDevicesByOrganizationIds(
   List<DeviceDTO> findDevicesByOrganizationIds(

@@ -567,18 +567,16 @@
         <include refid="basicColumns"/>,dev.transport_type
         <include refid="basicColumns"/>,dev.transport_type
         FROM device ifd
         FROM device ifd
         left join device_profile dev on ifd.device_profile_id = dev.id
         left join device_profile dev on ifd.device_profile_id = dev.id
-        <if test="isSceneLinkage == true">
-        <!--此设备是边端创建或者已经分配给边端-->
+        <if test="isSceneLinkage == true or isExcludeEdge == true or isExcludeCloud == true">
             LEFT JOIN relation re on re.to_id = ifd.id and re.from_type = 'EDGE'  and( re.relation_type = 'ManagedByEdge' or re.relation_type = 'Contains')
             LEFT JOIN relation re on re.to_id = ifd.id and re.from_type = 'EDGE'  and( re.relation_type = 'ManagedByEdge' or re.relation_type = 'Contains')
         </if>
         </if>
-
-        <if test="edgeId != null">
-            LEFT JOIN relation re on re.to_id = ifd.id
-            and re.from_id =#{edgeId}
-            and re.from_type = 'EDGE'
-            and re.relation_type_group = 'EDGE'
-            and re.relation_type = 'Contains'
-        </if>
+<!--        <if test="edgeId != null">-->
+<!--            LEFT JOIN relation re on re.to_id = ifd.id-->
+<!--            and re.from_id =#{edgeId}-->
+<!--            and re.from_type = 'EDGE'-->
+<!--            and re.relation_type_group = 'EDGE'-->
+<!--            and re.relation_type = 'Contains'-->
+<!--        </if>-->
         <if test="isEdgeDistribution == true">
         <if test="isEdgeDistribution == true">
             <!--此设备是否已被场景联动使用-->
             <!--此设备是否已被场景联动使用-->
             LEFT JOIN tk_do_action action on  action.device_id LIKE CONCAT('%',ifd.id ,'%')
             LEFT JOIN tk_do_action action on  action.device_id LIKE CONCAT('%',ifd.id ,'%')
@@ -588,14 +586,17 @@
         where
         where
         1=1
         1=1
         <if test="isExcludeEdge == true">
         <if test="isExcludeEdge == true">
-            and ifd.id not in (SELECT dev.id from device dev inner join relation re_edge on dev.id=re_edge.to_id and re_edge.from_type = 'EDGE'  and re_edge.relation_type = 'ManagedByEdge')
+            and (dev.transport_type!='GBT28181' or re.to_id is null)
+        </if>
+        <if test="isExcludeCloud == true">
+            and (dev.transport_type!='GBT28181' or re.to_id is not null)
         </if>
         </if>
         <if test="isSceneLinkage == true">
         <if test="isSceneLinkage == true">
             and re.to_id is null
             and re.to_id is null
         </if>
         </if>
-        <if test="edgeId != null">
-            and re.from_id is null
-        </if>
+<!--        <if test="edgeId != null">-->
+<!--            and re.from_id is null-->
+<!--        </if>-->
         <if test="isEdgeDistribution == true">
         <if test="isEdgeDistribution == true">
             and action.device_id is null
             and action.device_id is null
             and cond.entity_id is null
             and cond.entity_id is null