guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复默认图片功能和添加日志搜索类星星

Browse Source
feat/addPrevailCloudLog
Vincent 1 year ago
parent 8cdf0a3d0f
commit 3d20ab8c8a
5 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File

10
htmlweb/web/backstage/oa/ocr/prevailcloudlog/list.html
Unescape View File

@ -16,7 +16,14 @@
<input name='search_callTime' id='search_callTime' class='form-control' placeholder='字段名称'/>
</div>-->
<div class="form-group">
<select class="form-control" style="width: 78px" name='type' id='type'>
<option value="">全部</option>
<option value="0">图片</option>
<option value="1">数据回传</option>
<option value="2">账号</option>
</select>
<select class="form-control" name='callStatus' id='callStatus'>
<option value="">全部</option>
<option value="100">成功</option>
<option value="999">失败</option>
<option value="500">异常</option>
@ -79,6 +86,7 @@
pageSize: params.limit,
start: (params.offset / params.limit) + 1,
status: $("#callStatus").val(),
type: $("#type").val(),
callTimeStart: params.callTimeStart,
callTimeEnd: params.callTimeEnd,
};
@ -113,7 +121,7 @@
if (oData.type == 0) {
listOperation = "图片";
} else if (oData.type == 1) {
listOperation = "工作流";
listOperation = "数据回传";
} else if (oData.type == 2) {
listOperation = "账号";
} else {

9
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java
Unescape View File

@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -32,9 +33,15 @@ public class OcrPrevailCloudLogController {
public ResultVo<IPage<OcrPrevailCloudLog>> list(@RequestParam(name = "start", defaultValue = "1") Integer start,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "status", required = false) String status,
@RequestParam(name = "type", required = false) String type,
HttpServletRequest request) {
QueryWrapper<OcrPrevailCloudLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", status);
if (!StringUtils.isEmpty(status)) {
queryWrapper.eq("status", status);
}
if (!StringUtils.isEmpty(type)) {
queryWrapper.eq("type", type);
}
ResultVo<IPage<OcrPrevailCloudLog>> resultVo = new ResultVo<>();
ParamterPage paramterPage = new ParamterPage();
paramterPage.setPagesize(pageSize);

14
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java
Unescape View File

@ -77,8 +77,6 @@ public class PrevailCloudApiController {
if(StringUtils.isBlank(accountNoStr)){
return "业务主体不能为空";
}
Long tenantNo = Long.parseLong(request.getParameter("tenantNo"));
Long accountNo = Long.parseLong(request.getParameter("accountNo"));
return "";
}
@ -137,8 +135,6 @@ public class PrevailCloudApiController {
map.put("imgName", "default.png");
livePhoto.add(map);
pictureSourceResult.setLivePhoto(livePhoto);
// continue;
}
//赋值日志参数
pictureSourceResult.setRequestParam(pictureSourceParameter);
@ -221,7 +217,6 @@ public class PrevailCloudApiController {
map.put("imgName", "default.png");
livePhoto.add(map);
pictureSourceResult.setLivePhoto(livePhoto);
}
//赋值默认参数
pictureSourceResult.setRequestParam(pictureSourceParameter);
@ -322,6 +317,15 @@ public class PrevailCloudApiController {
for (PictureSourceResult pictureSourceResult : totalList) {
int retryCount = 0;
boolean addedToQueue = false;
//1.如果不存在图片默认一个默认图片，方便走测试。
if (pictureSourceResult.getLivePhoto() == null) {
List<Map<String, Object>> livePhoto = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
map.put("imgName", "default.png");
livePhoto.add(map);
pictureSourceResult.setLivePhoto(livePhoto);
}
if (pictureSourceResult.getLivePhoto() != null && !pictureSourceResult.getLivePhoto().isEmpty()) {
size++;
// 尝试将数据加入队列

16
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java
Unescape View File

@ -4,9 +4,11 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.jyjz.xiaoyao.admin.dataDao.DepartmentMybatisDao;
import cn.jyjz.xiaoyao.admin.dataobject.Department;
import cn.jyjz.xiaoyao.common.base.util.StringUtils;
import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService;
import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
@ -22,8 +24,10 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -53,6 +57,9 @@ public class PictureSourceTimerJob {
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Resource
private ApiConfig apiConfig;
/**
* 请求图片数据job （定时执行 每日拉取上一日全部数据）
*
@ -96,6 +103,15 @@ public class PictureSourceTimerJob {
int count = totalList.size();
int size = 0;
for (PictureSourceResult pictureSourceResult : totalList) {
//1.如果不存在图片默认一个默认图片，方便走测试。
if (pictureSourceResult.getLivePhoto() == null) {
List<Map<String, Object>> livePhoto = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
map.put("imgName", "default.png");
livePhoto.add(map);
pictureSourceResult.setLivePhoto(livePhoto);
}
if (pictureSourceResult.getLivePhoto() != null) {
size++;
pictureSourceResult.setRequestParam(pictureSourceParameter);

16
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java
Unescape View File

@ -4,9 +4,11 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.jyjz.xiaoyao.admin.dataDao.DepartmentMybatisDao;
import cn.jyjz.xiaoyao.admin.dataobject.Department;
import cn.jyjz.xiaoyao.common.base.util.StringUtils;
import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService;
import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
@ -20,8 +22,10 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -40,6 +44,9 @@ public class PullPictureDataJob {
@Resource
private OcrPrevailCloudLogService ocrPrevailCloudLogService;
@Resource
private ApiConfig apiConfig;
// @Scheduled(cron = "0 5 0 * * ?") // 每天晚上0点五分执行一次
public void pullPicture() {
//配置查询参数信息
@ -101,6 +108,15 @@ public class PullPictureDataJob {
int count = totalList.size();
int size = 0;
for (PictureSourceResult pictureSourceResult : totalList) {
//1.如果不存在图片默认一个默认图片，方便走测试。
if (pictureSourceResult.getLivePhoto() == null) {
List<Map<String, Object>> livePhoto = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
map.put("imgName", "default.png");
livePhoto.add(map);
pictureSourceResult.setLivePhoto(livePhoto);
}
if (pictureSourceResult.getLivePhoto() != null) {
size++;
// 将可以处理数据放入处理队列中

Write Preview
Loading…
Cancel
Save