zhouwentao
/
ocr-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

Browse Source
master
周文涛 2 years ago
parent 74cb1133fb
commit 91ecb9ea18
7 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java
Unescape View File

@ -52,9 +52,8 @@ public class OcrApiCallStatisticsController extends JeecgController<OcrApiCallSt
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<OcrApiCallStatistics> queryWrapper = QueryGenerator.initQueryWrapper(ocrApiCallStatistics, req.getParameterMap());
Page<OcrApiCallStatistics> page = new Page<OcrApiCallStatistics>(pageNo, pageSize);
IPage<OcrApiCallStatistics> pageList = ocrApiCallStatisticsService.page(page, queryWrapper);
IPage<OcrApiCallStatistics> pageList = ocrApiCallStatisticsService.pageList(page, ocrApiCallStatistics);
return Result.OK(pageList);
}

15
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java
Unescape View File

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

12
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrApiCallStatistics.java
Unescape View File

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

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/OcrApiCallStatisticsMapper.java
Unescape View File

@ -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<OcrApiCallStatistics> {
IPage<OcrApiCallStatistics> pageList(@Param("page") Page<OcrApiCallStatistics> page,@Param("map") Map<String, Object> map);
}

22
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrApiCallStatisticsMapper.xml
Unescape View File

@ -2,4 +2,26 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.ocr.mapper.OcrApiCallStatisticsMapper">
<select id="pageList" resultType="org.jeecg.modules.ocr.entity.OcrApiCallStatistics">
SELECT * FROM (SELECT
api.id,api.create_by,api.create_time,api.api_name,api.api_url,count(api.count) as `count`,
api.start_time,api.end_time
FROM ocr_api_call_statistics api
WHERE 1=1
<if test="map.apiName!=null and map.apiName!=''">
AND api.api_name like concat('%',#{map.apiName},'%')
</if>
<if test="map.apiUrl!=null and map.apiUrl!=''">
AND api.api_url like concat('%',#{map.apiUrl},'%')
</if>
<if test="map.startTime!=null and map.endTime!=null">
AND (api.start_time >= #{map.startTime} AND api.end_time &lt;=#{map.endTime})
</if>
GROUP by api.api_name
ORDER by api.create_time desc)as a
WHERE 1=1
<if test="map.count!=null">
AND a.count = #{map.count}
</if>
</select>
</mapper>

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java
Unescape View File

@ -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<OcrApiCallStatistics> {
IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, OcrApiCallStatistics ocrApiCallStatistics);
}

15
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java
Unescape View File

@ -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<OcrApiCallStatisticsMapper, OcrApiCallStatistics> implements IOcrApiCallStatisticsService {
@Override
public IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, OcrApiCallStatistics ocrApiCallStatistics) {
Map<String,Object> map=new LinkedHashMap<>();
map.put("apiUrl",ocrApiCallStatistics.getApiUrl());
map.put("count",ocrApiCallStatistics.getCount());
map.put("startTime",ocrApiCallStatistics.getStartTime());
map.put("endTime",ocrApiCallStatistics.getEndTime());
IPage<OcrApiCallStatistics> pageList = this.baseMapper.pageList(page,map);
return pageList;
}
}

Write Preview
Loading…
Cancel
Save