From 68b112185d80c996e18a19df378d147c73539b0e Mon Sep 17 00:00:00 2001 From: Vincent <19330835921@163.com> Date: Wed, 15 May 2024 12:26:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E5=9B=BE=E5=83=8F=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/ocr/prevailcloudlog/list.html | 138 ++++++++++++++++++ .../ocr/api/entity/PictureSourceResult.java | 4 + .../ocr/api/impl/PrevailCloudApiImpl.java | 1 - .../ocr/controller/ApiTestController.java | 42 +++--- .../OcrPrevailCloudLogController.java | 47 ++++++ .../OcrPrevailCloudLogHtmlController.java | 20 +++ .../ocr/dataobject/OcrPrevailCloudLog.java | 6 + .../service/IOcrCheckDuplicateService.java | 5 +- .../service/OcrPrevailCloudLogService.java | 11 +- .../impl/OcrPrevailCloudLogServiceImpl.java | 18 +-- .../cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java | 21 ++- .../ocr/thread/tasks/PictureDisposeTask.java | 13 +- .../ocr/timerJob/PictureSourceTimerJob.java | 7 +- .../ocr/timerJob/PullPictureDataJob.java | 7 +- 14 files changed, 288 insertions(+), 52 deletions(-) create mode 100644 htmlweb/web/backstage/oa/ocr/prevailcloudlog/list.html create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogHtmlController.java diff --git a/htmlweb/web/backstage/oa/ocr/prevailcloudlog/list.html b/htmlweb/web/backstage/oa/ocr/prevailcloudlog/list.html new file mode 100644 index 00000000..65d703a4 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/prevailcloudlog/list.html @@ -0,0 +1,138 @@ +<#include "/common/taglibs.html" /> + + + + + 数据拉取日志 + <#include "/head/headlist.html" /> + + +
+
+
+
+
+ +
+ +
+ +
+  搜索 +  重置 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<#include "/head/footlist.html" /> + + + + diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java index 0f81ed0c..1180cf49 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java @@ -204,4 +204,8 @@ public class PictureSourceResult { */ Long submitTime; + /** + * 请求参数 存log用 + */ + PictureSourceParameter requestParam; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java index 2beafe0c..5833d101 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java @@ -135,7 +135,6 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { return resultApiPage; } else { logger.debug("请求图片接口数据失败,参数:{},返回值:{}", json, responseJsonStr); - } prevailCloudLogService.save(prevailCloudLog); return null; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java index 206d5f1e..2f99b642 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java @@ -12,6 +12,7 @@ import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult; import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig; import cn.jyjz.xiaoyao.ocr.api.utils.ApiPage; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService; import cn.jyjz.xiaoyao.ocr.thread.TaskQueue; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; @@ -56,34 +57,38 @@ public class ApiTestController { @Resource private OcrPictureService ocrPictureService; + @Resource + private OcrPrevailCloudLogService ocrPrevailCloudLogService; + /** * 拉取无量云任务数据，根据单租户、业务主体拉取 * pull wyl task data + * * @param request * @return */ @GetMapping("pullPictureByOneAccountNo") - public String pullPictureByOneAccountNo(HttpServletRequest request){ + public String pullPictureByOneAccountNo(HttpServletRequest request) { String beginStr = request.getParameter("beginStr"); String endStr = request.getParameter("endStr"); String pageSize = request.getParameter("pageSize"); String pageNo = request.getParameter("pageNo"); String tenantNoStr = request.getParameter("tenantNo"); - if(StringUtils.isBlank(tenantNoStr)){ + if (StringUtils.isBlank(tenantNoStr)) { return "租户不能为空"; } String accountNoStr = request.getParameter("accountNo"); - if(StringUtils.isBlank(accountNoStr)){ + if (StringUtils.isBlank(accountNoStr)) { return "业务主体不能为空"; } Long tenantNo = Long.parseLong(request.getParameter("tenantNo")); Long accountNo = Long.parseLong(request.getParameter("accountNo")); PictureSourceParameter pictureSourceParameter = new PictureSourceParameter(); - DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); + DateTime dateTime = DateUtil.parse(beginStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss"); // DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss"); Instant binstant = dateTime.toInstant(); - DateTime dateTime1 = DateUtil.parse(endStr+" 00:00:00","yyyy-MM-dd HH:mm:ss"); + DateTime dateTime1 = DateUtil.parse(endStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss"); // DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss"); Instant einstant = dateTime1.toInstant(); pictureSourceParameter.setStartTime(Date.from(binstant)); @@ -93,30 +98,31 @@ public class ApiTestController { pictureSourceParameter.setTenantNo(tenantNo); pictureSourceParameter.setAccountNo(accountNo); try { - ApiPage apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter); - if(apiPage==null){ + ApiPage apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter); + if (apiPage == null) { return "获取数据为空！"; } - List listResult= apiPage.getRecords(); + List listResult = apiPage.getRecords(); int count = apiPage.getTotal(); int localCount = listResult.size(); int size = 0; for (PictureSourceResult pictureSourceResult : listResult) { //1.如果不存在图片默认一个默认图片，方便走测试。 - if(pictureSourceResult.getLivePhoto()==null){ - List> livePhoto = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("imgUrl","http://47.93.59.251/api/image/default.png"); - map.put("imgName","default.png"); + if (pictureSourceResult.getLivePhoto() == null) { + List> livePhoto = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("imgUrl", "http://47.93.59.251/api/image/default.png"); + map.put("imgName", "default.png"); livePhoto.add(map); pictureSourceResult.setLivePhoto(livePhoto); + pictureSourceResult.setRequestParam(pictureSourceParameter); // continue; } size++; //将可以处理数据放入处理队列中 - TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService); + TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService); } - return "当前区间内图片总数:"+count+"条，本次获取："+localCount+"条，可处理数据:"+size+"条"; + return "当前区间内图片总数:" + count + "条，本次获取：" + localCount + "条，可处理数据:" + size + "条"; } catch (Exception e) { e.printStackTrace(); } @@ -191,9 +197,10 @@ public class ApiTestController { map.put("imgName", "default.png"); livePhoto.add(map); pictureSourceResult.setLivePhoto(livePhoto); + pictureSourceResult.setRequestParam(pictureSourceParameter); } //将可以处理数据放入处理队列中 - TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService); + TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService); } return "处理成功"; @@ -293,7 +300,8 @@ public class ApiTestController { size++; // 尝试将数据加入队列 while (!addedToQueue && retryCount < 5) { // 最多重试5次 - addedToQueue = TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService); + pictureSourceResult.setRequestParam(pictureSourceParameter); + addedToQueue = TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService); if (!addedToQueue) { Thread.sleep(60000); retryCount++; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java new file mode 100644 index 00000000..b9b8e87d --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java @@ -0,0 +1,47 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPrevailCloudLog; +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.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("/ocr/prevailCloudLog") +public class OcrPrevailCloudLogController { + + @Resource + private OcrPrevailCloudLogService ocrPrevailCloudLogService; + + /** + * 自定义筛选字段列表查询 + * + * @return + */ + @ApiOperation(value = "根据评审类型查询字段列表", notes = "根据评审类型查询字段列表") + @GetMapping(value = "/page") + public ResultVo> list(@RequestParam(name = "start", defaultValue = "1") Integer start, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "status", required = false) String status, + HttpServletRequest request) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("status", status); + ResultVo> resultVo = new ResultVo<>(); + ParamterPage paramterPage = new ParamterPage(); + paramterPage.setPagesize(pageSize); + paramterPage.setStart(start); + IPage ocrPictureLogIPage = ocrPrevailCloudLogService.selectSearchListPage(paramterPage, queryWrapper); + resultVo.setData(ocrPictureLogIPage); + resultVo.addOK("查询成功"); + return resultVo; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogHtmlController.java new file mode 100644 index 00000000..2e014cd7 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogHtmlController.java @@ -0,0 +1,20 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Controller +@RequestMapping("/backstage/oa/prevailcloudlog") +public class OcrPrevailCloudLogHtmlController { + + @GetMapping("/list") + public String toListOcrConfiguration(HttpServletResponse response, HttpServletRequest request) { + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid", resourceid); + return "/backstage/oa/ocr/prevailcloudlog/list"; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPrevailCloudLog.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPrevailCloudLog.java index d98a16a9..3afcf14d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPrevailCloudLog.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPrevailCloudLog.java @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,6 +26,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "ocr_prevail_cloud_log") +@Builder public class OcrPrevailCloudLog { /** * ID主键自增 @@ -70,6 +74,7 @@ public class OcrPrevailCloudLog { * 创建时间 */ @TableField(value = "create_time") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; /** @@ -82,6 +87,7 @@ public class OcrPrevailCloudLog { * 修改时间 */ @TableField(value = "update_time") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; /** diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java index 3b6cce4e..72fb7f8e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java @@ -69,11 +69,10 @@ public interface IOcrCheckDuplicateService extends IService { /** * 查询相似度列表 * + * @param checkDuplicateNo + * @param tenantId * @param pageNo * @param pageSize - * @param pictureId - * @param orderType - * @param orderValue * @return */ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPrevailCloudLogService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPrevailCloudLogService.java index fb60c5e0..ec2b05af 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPrevailCloudLogService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPrevailCloudLogService.java @@ -1,14 +1,13 @@ package cn.jyjz.xiaoyao.ocr.service; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPrevailCloudLog; -import com.baomidou.mybatisplus.extension.service.IService; - /** + +/** * ClassName： $className$.java - * Description: + * Description: * Author： scl. * Date： 2024/4/25 上午12:52 */ -public interface OcrPrevailCloudLogService extends IService{ - - +public interface OcrPrevailCloudLogService extends BaseService { } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPrevailCloudLogServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPrevailCloudLogServiceImpl.java index f21adb83..2175ebfa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPrevailCloudLogServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPrevailCloudLogServiceImpl.java @@ -1,19 +1,11 @@ package cn.jyjz.xiaoyao.ocr.service.impl; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.jyjz.xiaoyao.ocr.dataobject.OcrPrevailCloudLog; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import cn.jyjz.xiaoyao.ocr.dataDao.OcrPrevailCloudLogMapper; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPrevailCloudLog; import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService; -/** - * ClassName： $className$.java - * Description: - * Author： scl. - * Date： 2024/4/25 上午12:52 - */ -@Service -public class OcrPrevailCloudLogServiceImpl extends ServiceImpl implements OcrPrevailCloudLogService{ +import org.springframework.stereotype.Service; +@Service +public class OcrPrevailCloudLogServiceImpl extends BaseServiceImpl implements OcrPrevailCloudLogService { } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java index e77a750a..2f336f24 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java @@ -1,8 +1,11 @@ package cn.jyjz.xiaoyao.ocr.thread; import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult; +import cn.jyjz.xiaoyao.ocr.common.PrevailCloudConstant; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPrevailCloudLog; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService; import cn.jyjz.xiaoyao.ocr.thread.entity.PictureImgToLocalEntity; import com.google.common.collect.Sets; @@ -37,7 +40,7 @@ public class TaskQueue { * @param pictureSourceResult //三方拉取 获取到的图片对象 * @return */ - public static boolean pictureDisposePushData(PictureSourceResult pictureSourceResult, OcrPictureService ocrPictureService) { + public static boolean pictureDisposePushData(PictureSourceResult pictureSourceResult, OcrPictureService ocrPictureService, OcrPrevailCloudLogService ocrPrevailCloudLogService) { try { Long taskId = pictureSourceResult.getTaskId(); OcrPicture ocrPicture = ocrPictureService.selectByRemark(String.valueOf(taskId)); @@ -45,9 +48,25 @@ public class TaskQueue { return true; } + OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder() + .formId(pictureSourceResult.getTaskId()) + .requestParam(pictureSourceResult.getRequestParam().toString()) + .responseParam(pictureSourceResult.toString()) + .type(PrevailCloudConstant.PULL_PICTURE_SOURCE) + .status(100) + .build(); + ocrPrevailCloudLogService.save(ocrPrevailCloudLog); resultSet.add(String.valueOf(taskId)); pictureDisposeQueue.put(pictureSourceResult); } catch (InterruptedException e) { + OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder() + .formId(pictureSourceResult.getTaskId()) + .requestParam(pictureSourceResult.getRequestParam().toString()) + .responseParam(pictureSourceResult.toString()) + .type(PrevailCloudConstant.PULL_PICTURE_SOURCE) + .status(500) + .build(); + ocrPrevailCloudLogService.save(ocrPrevailCloudLog); return false; } return true; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index 6d40aa3b..d488962a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -1,20 +1,18 @@ package cn.jyjz.xiaoyao.ocr.thread.tasks; -import cn.hutool.core.date.DateUtil; import cn.jyjz.xiaoyao.common.base.util.SpringUtils; import cn.jyjz.xiaoyao.common.base.util.StringUtils; -import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi; import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService; import com.alibaba.fastjson.JSONObject; -//import javafx.scene.input.DataFormat; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * 无量云接口 数据处理队列 @@ -32,9 +30,6 @@ public class PictureDisposeTask implements Runnable{ this.pictureSourceResult = pictureSourceResult; } - @Autowired - private OcrPictureService ocrPictureService; - @Override public void run() { //1.对图片对象进行入库操作 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java index e002f6d2..296c6b57 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java @@ -8,6 +8,7 @@ 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.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService; import cn.jyjz.xiaoyao.ocr.thread.TaskQueue; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Lists; @@ -47,6 +48,9 @@ public class PictureSourceTimerJob { @Resource private OcrPictureService ocrPictureService; + @Resource + private OcrPrevailCloudLogService ocrPrevailCloudLogService; + private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /** @@ -94,8 +98,9 @@ public class PictureSourceTimerJob { for (PictureSourceResult pictureSourceResult : totalList) { if (pictureSourceResult.getLivePhoto() != null) { size++; + pictureSourceResult.setRequestParam(pictureSourceParameter); // 将可以处理数据放入处理队列中 - TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService); + TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService); } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java index f76543f9..9ea6db7e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java @@ -8,6 +8,7 @@ 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.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService; import cn.jyjz.xiaoyao.ocr.thread.TaskQueue; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Maps; @@ -36,6 +37,9 @@ public class PullPictureDataJob { @Resource private OcrPictureService ocrPictureService; + @Resource + private OcrPrevailCloudLogService ocrPrevailCloudLogService; + // @Scheduled(cron = "0 5 0 * * ?") // 每天晚上0点五分执行一次 public void pullPicture() { //配置查询参数信息 @@ -100,7 +104,8 @@ public class PullPictureDataJob { if (pictureSourceResult.getLivePhoto() != null) { size++; // 将可以处理数据放入处理队列中 - TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService); + pictureSourceResult.setRequestParam(pictureSourceParameter); + TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService); } } System.out.println("当前区间内图片总数:" + count + "条，可处理数据:" + size + "条");