feat:OpenApi调用统计添加自定义查询

@@ -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()){

@@ -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);
 }
 }