Merge branch 'fix/i18n-openapi' into 'master_dev'

perf: 调整openapi调用趋势查询

See merge request yunteng/thingskit!442

@@ -37,3 +37,7 @@ rebuild-docker.sh
 */.run/**
 */.run/**
 .run/**
 .run/**
 .run
 .run
+protocol-template/
+template/
+
+

@@ -75,7 +75,7 @@ public class TkOpenApiRecordController extends BaseController {
   @GetMapping("/getClassify")
   @GetMapping("/getClassify")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   @ApiImplicitParams(value = {
   @ApiImplicitParams(value = {
-          @ApiImplicitParam(name = "type", value = "统计类型 hour按小时;week按7天;month按30天" ,required = true)
+          @ApiImplicitParam(name = "type", value = "统计类型 hour按小时;day按1天;week按7天;month按30天" ,required = true)
   })
   })
   public ResponseEntity<List<OpenApiRecordClassifyAllDTO>> getClassify(
   public ResponseEntity<List<OpenApiRecordClassifyAllDTO>> getClassify(
           @RequestParam(value = "type" ) String type
           @RequestParam(value = "type" ) String type

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.ApplicationApiEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ApplicationApiEnum;
 
 
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 @Data
 @Data
@@ -13,7 +14,7 @@ public class OpenApiRecordClassifyDTO {
   private ApplicationApiEnum classify;
   private ApplicationApiEnum classify;
 
 
   @ApiModelProperty(value = "时间")
   @ApiModelProperty(value = "时间")
-  private LocalDateTime time;
+  private String time;
 
 
   @ApiModelProperty(value = "调用数量")
   @ApiModelProperty(value = "调用数量")
   private Integer count;
   private Integer count;

@@ -17,7 +17,9 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.entities.TkOpenApiEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkOpenApiEntity;
 import org.thingsboard.server.dao.yunteng.mapper.OpenApiMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OpenApiMapper;
+import org.thingsboard.server.dao.yunteng.mapper.OpenApiRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.OpenApiRecordService;
 import org.thingsboard.server.dao.yunteng.service.OpenApiService;
 import org.thingsboard.server.dao.yunteng.service.OpenApiService;
 
 
 import java.util.*;
 import java.util.*;
@@ -29,6 +31,8 @@ import java.util.stream.Collectors;
 public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEntity>
 public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEntity>
     implements OpenApiService {
     implements OpenApiService {
 
 
+  OpenApiRecordMapper openApiRecordMapper;
+
 
 
   @Override
   @Override
   public OpenApiDTO getDto(String id) {
   public OpenApiDTO getDto(String id) {
@@ -85,7 +89,9 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
                 NOT_HAVE_PERMISSION.getI18nCode())));
                 NOT_HAVE_PERMISSION.getI18nCode())));
       }
       }
     });
     });
-    return baseMapper.deleteBatchIds(apiIds) > 0;
+    baseMapper.deleteBatchIds(apiIds);
+    openApiRecordMapper.deleteByAppIds(apiIds);
+    return true;
   }
   }
 
 
   @Override
   @Override

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.utils.DateTimeUtils;
 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.TkApplicationEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkApplicationEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkOpenApiRecordEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkOpenApiRecordEntity;
@@ -16,6 +17,7 @@ import org.thingsboard.server.dao.yunteng.mapper.OpenApiRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.OpenApiRecordService;
 import org.thingsboard.server.dao.yunteng.service.OpenApiRecordService;
 
 
+import java.sql.Time;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -28,6 +30,7 @@ public class OpenApiRecordImpl extends AbstractBaseService<OpenApiRecordMapper,
     implements OpenApiRecordService {
     implements OpenApiRecordService {
 
 
   private final ApplicationMapper applicationMapper;
   private final ApplicationMapper applicationMapper;
+  private final long HOUR_TIMESTAMP=1000L*60L*60L;
   @Override
   @Override
   public OpenApiRecordDTO getDto(String id) {
   public OpenApiRecordDTO getDto(String id) {
     TkOpenApiRecordEntity entity  = baseMapper.selectById(id);
     TkOpenApiRecordEntity entity  = baseMapper.selectById(id);
@@ -106,7 +109,7 @@ public class OpenApiRecordImpl extends AbstractBaseService<OpenApiRecordMapper,
 
 
   @Override
   @Override
   public TkPageData<OpenApiRecordTopDTO> getPage(String tenantId,Integer page,Integer pageSize) {
   public TkPageData<OpenApiRecordTopDTO> getPage(String tenantId,Integer page,Integer pageSize) {
-    List<OpenApiRecordTopDTO> tops =  baseMapper.getTop(tenantId,page,pageSize);
+    List<OpenApiRecordTopDTO> tops =  baseMapper.getTop(tenantId,page<1?1:page,pageSize);
     Long count  = applicationMapper.selectCount(new LambdaQueryWrapper<TkApplicationEntity>()
     Long count  = applicationMapper.selectCount(new LambdaQueryWrapper<TkApplicationEntity>()
             .eq(TkApplicationEntity::getTenantId, tenantId));
             .eq(TkApplicationEntity::getTenantId, tenantId));
     return new TkPageData<>(tops, count);
     return new TkPageData<>(tops, count);
@@ -114,13 +117,24 @@ public class OpenApiRecordImpl extends AbstractBaseService<OpenApiRecordMapper,
 
 
   @Override
   @Override
   public  List<OpenApiRecordClassifyAllDTO> getClassify(String tenantId,String type) {
   public  List<OpenApiRecordClassifyAllDTO> getClassify(String tenantId,String type) {
-    List<OpenApiRecordClassifyDTO> tops =  baseMapper.getClassify(tenantId,type);
+    //value = "统计类型 hour按小时;day按1天;week按7天;month按30天" ,required = true)
+    java.util.Date endTime=new java.util.Date();
+    java.util.Date startTime=null;
+    switch (type){
+      case "hour":startTime=new java.util.Date(endTime.getTime()- HOUR_TIMESTAMP);break;
+      case "day":startTime =new  java.util.Date(endTime.getTime()-  HOUR_TIMESTAMP*24L);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;
+    }
+
+    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()){
       for (OpenApiRecordClassifyDTO entity: tops) {
       for (OpenApiRecordClassifyDTO entity: tops) {
+        if(entity==null){continue;}
         // 查找 listDto 中是否已有相同 enum 的 entity
         // 查找 listDto 中是否已有相同 enum 的 entity
         OpenApiRecordClassifyAllDTO existingDto = allList.stream()
         OpenApiRecordClassifyAllDTO existingDto = allList.stream()
-                .filter(dto -> dto.getClassify().name().equals(entity.getClassify().name()))
+                .filter(dto -> entity.getClassify()!=null && dto.getClassify().name().equals(entity.getClassify().name()))
                 .findFirst()
                 .findFirst()
                 .orElse(null);
                 .orElse(null);
         if (existingDto != null) {
         if (existingDto != null) {

@@ -15,8 +15,7 @@ public interface OpenApiRecordMapper extends BaseMapper<TkOpenApiRecordEntity> {
 
 
     List<OpenApiRecordTopDTO> getTop(@Param("tenantId") String tenantId,@Param("page")Integer page,@Param("pageSize")Integer pageSize);
     List<OpenApiRecordTopDTO> getTop(@Param("tenantId") String tenantId,@Param("page")Integer page,@Param("pageSize")Integer pageSize);
 
 
-    List<OpenApiRecordClassifyDTO> getClassify(@Param("tenantId") String tenantId,
-                                               @Param("type") String type);
+    List<OpenApiRecordClassifyDTO> getClassify(@Param("tenantId") String tenantId,@Param("type") String type,@Param("startTime") java.util.Date startTime,@Param("endTime") java.util.Date endTime);
 
 
     int deleteByAppIds(@Param("applicationIds") Collection<String> applicationId);
     int deleteByAppIds(@Param("applicationIds") Collection<String> applicationId);
 }
 }

@@ -23,7 +23,7 @@
             AND  tenant_id = '13814000-1dd2-11b2-8080-808080808080' AND status = 1
             AND  tenant_id = '13814000-1dd2-11b2-8080-808080808080' AND status = 1
             OR tenant_id = #{tenantId}
             OR tenant_id = #{tenantId}
         </if>
         </if>
-        <if test="status !=null and status !=''">
+        <if test="status !=null">
             AND  status  = #{status}
             AND  status  = #{status}
         </if>
         </if>
         <if test="dictItemId !=null and dictItemId !=''">
         <if test="dictItemId !=null and dictItemId !=''">

@@ -14,7 +14,6 @@
         <result property="classify" column="classify"/>
         <result property="classify" column="classify"/>
         <result property="time" column="time_period"/>
         <result property="time" column="time_period"/>
         <result property="count" column="call_count"/>
         <result property="count" column="call_count"/>
-
     </resultMap>
     </resultMap>
 
 
     <select id="getTop" resultMap="DTOMap">
     <select id="getTop" resultMap="DTOMap">
@@ -35,34 +34,37 @@
     </select>
     </select>
 
 
     <select id="getClassify" resultMap="map">
     <select id="getClassify" resultMap="map">
-        SELECT
-        classify,
-        <if test="type == 'hour'">
-            DATE_TRUNC('hour', request_time) AS time_period,
-        </if>
-        <if test="type == 'week'">
-            DATE_TRUNC('week', request_time) AS time_period,
-        </if>
-        <if test="type == 'month'">
-            DATE_TRUNC('month', request_time) AS time_period,
-        </if>
-        COUNT(*) AS call_count
-        FROM
-        tk_open_api_record
-        WHERE tenant_id = #{tenantId}
-        GROUP BY
-        classify,
-        <if test="type == 'hour'">
-        DATE_TRUNC('hour', request_time)
-        </if>
-        <if test="type == 'week'">
-            DATE_TRUNC('week', request_time)
-        </if>
-        <if test="type == 'month'">
-            DATE_TRUNC('month', request_time)
-        </if>
-        ORDER BY
-        time_period
+        SELECT foo.classify,foo.time_period,count(foo.time_period) as call_count from (
+
+              SELECT
+              classify,
+
+                  concat(
+
+                        EXTRACT(YEAR  FROM request_time), '-',
+                        EXTRACT(MONTH  FROM request_time),'-',
+                        EXTRACT(DAY  FROM request_time)
+                        <choose>
+                            <when test="type == 'hour'">
+                              , ' ',
+                              EXTRACT(HOUR  FROM request_time), ':',
+                              floor( EXTRACT(MINUTE  FROM request_time) / 5 ) * 5
+                            </when>
+                            <when test="type == 'day'">
+                              , ' ',
+                              floor( EXTRACT(HOUR  FROM request_time) / 2 ) * 2, ':',
+                              '00'
+                            </when>
+
+                        </choose>
+                  )
+               as time_period
+              FROM tk_open_api_record
+              WHERE tenant_id = #{tenantId} AND request_time <![CDATA[ >= ]]> #{startTime} AND request_time <![CDATA[ <= ]]> #{endTime}
+
+        ) as foo
+        GROUP BY foo.classify,foo.time_period
+        ORDER BY foo.time_period;
     </select>
     </select>
 
 
     <delete id="deleteByAppIds">
     <delete id="deleteByAppIds">