diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java index 0634d60..b5dc3bd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java @@ -52,9 +52,8 @@ public class OcrApiCallStatisticsController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(ocrApiCallStatistics, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - IPage pageList = ocrApiCallStatisticsService.page(page, queryWrapper); + IPage pageList = ocrApiCallStatisticsService.pageList(page, ocrApiCallStatistics); return Result.OK(pageList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java index edcf410..7b743c1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java @@ -7,7 +7,9 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RestUtil; +import org.jeecg.modules.ocr.entity.OcrApiCallStatistics; import org.jeecg.modules.ocr.entity.OcrIdentify; +import org.jeecg.modules.ocr.service.IOcrApiCallStatisticsService; import org.jeecg.modules.ocr.service.IOcrIdentifyService; import org.jeecg.modules.ocr.service.IOcrRuleCheckService; import org.jeecg.modules.ocr.vo.OcrRuleCheckVo; @@ -34,7 +36,8 @@ public class OcrApiController { IOcrIdentifyService ocrIdentifyService; @Resource IOcrRuleCheckService ruleCheckService; - + @Resource + IOcrApiCallStatisticsService ocrApiCallStatisticsService; public static final String semanticUrl="http://47.103.213.109:9099/semantic"; /** @@ -131,6 +134,16 @@ public class OcrApiController { ocrIdentify.setSourceJson(requestBody.getJSONArray("sourceJson").toJSONString());//校验数据源 ocrIdentifyService.save(ocrIdentify); } + //2.1记录 + if(true){ + OcrApiCallStatistics ocrApiCallStatistics=new OcrApiCallStatistics(); + ocrApiCallStatistics.setApiName("通用识别"); + ocrApiCallStatistics.setApiUrl("/ocr/ocrApi/identify"); + ocrApiCallStatistics.setCount(1); + ocrApiCallStatistics.setStartTime(new Date()); + ocrApiCallStatistics.setEndTime(new Date()); + ocrApiCallStatisticsService.save(ocrApiCallStatistics); + } //3.请求python ocr识别,异步执行 ocrIdentifyService.postSemantic(ocrIdentify.getId(),"https://h5.mcnetmart.com/tmp/images/dc_demo1.png"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrApiCallStatistics.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrApiCallStatistics.java index d95a1af..b3c230f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrApiCallStatistics.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrApiCallStatistics.java @@ -64,15 +64,15 @@ public class OcrApiCallStatistics implements Serializable { @ApiModelProperty(value = "调用次数") private Integer count; /**开始时间*/ - @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "开始时间") private Date startTime; /**结束时间*/ - @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束时间") private Date endTime; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrApiCallStatisticsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrApiCallStatisticsMapper.java index 280b45b..762263e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrApiCallStatisticsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrApiCallStatisticsMapper.java @@ -1,8 +1,13 @@ package org.jeecg.modules.ocr.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.ocr.entity.OcrApiCallStatistics; +import java.util.Map; + /** * @Description: api调用统计 * @Author: jeecg-boot @@ -11,4 +16,5 @@ import org.jeecg.modules.ocr.entity.OcrApiCallStatistics; */ public interface OcrApiCallStatisticsMapper extends BaseMapper { + IPage pageList(@Param("page") Page page,@Param("map") Map map); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrApiCallStatisticsMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrApiCallStatisticsMapper.xml index 456ff55..32bc395 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrApiCallStatisticsMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrApiCallStatisticsMapper.xml @@ -2,4 +2,26 @@ + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java index f26f648..a8cec32 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.ocr.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.ocr.entity.OcrApiCallStatistics; @@ -11,4 +13,5 @@ import org.jeecg.modules.ocr.entity.OcrApiCallStatistics; */ public interface IOcrApiCallStatisticsService extends IService { + IPage pageList(Page page, OcrApiCallStatistics ocrApiCallStatistics); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java index c099ba2..a72e23b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java @@ -1,11 +1,16 @@ package org.jeecg.modules.ocr.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.ocr.entity.OcrApiCallStatistics; import org.jeecg.modules.ocr.mapper.OcrApiCallStatisticsMapper; import org.jeecg.modules.ocr.service.IOcrApiCallStatisticsService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.LinkedHashMap; +import java.util.Map; + /** * @Description: api调用统计 * @Author: jeecg-boot @@ -15,4 +20,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OcrApiCallStatisticsServiceImpl extends ServiceImpl implements IOcrApiCallStatisticsService { + @Override + public IPage pageList(Page page, OcrApiCallStatistics ocrApiCallStatistics) { + Map map=new LinkedHashMap<>(); + map.put("apiUrl",ocrApiCallStatistics.getApiUrl()); + map.put("count",ocrApiCallStatistics.getCount()); + map.put("startTime",ocrApiCallStatistics.getStartTime()); + map.put("endTime",ocrApiCallStatistics.getEndTime()); + IPage pageList = this.baseMapper.pageList(page,map); + return pageList; + } }