diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java index b8d1de83..61ae256f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java @@ -40,12 +40,12 @@ public class PictureSourceAllPullMsg { /** * 当前日期任务总数 */ - private Integer timeTaskCount = 0; + private int timeTaskCount = 0; /** * 已拉取任务总数 */ - private Integer pullTaskCount = 0; + private int pullTaskCount = 0; /** * 拉取开始日期 @@ -91,10 +91,10 @@ public class PictureSourceAllPullMsg { this.accountNo = null; this.beginDateTime = null; this.endDateTime = null; - this.pullTaskCount = null; + this.pullTaskCount = 0; this.timeStr = null; this.page = null; - this.timeTaskCount = null; + this.timeTaskCount = 0; this.lock = false; return true; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java index 34ff582a..eaefa460 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java @@ -165,6 +165,7 @@ public class PullAllPictureSourceThread implements Runnable{ logger.debug("全量拉取中...当前日期:{},页码:{},总数:{}", DateFormatUtils.format(startDate,"yyyy-MM-dd"),pageNo,apiPage.getTotal()); } catch (Exception e) { logger.error("无量云全量拉取返回错误,error:",e.getMessage()); + continue; } }