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..becb8466 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 @@ -56,6 +56,28 @@ public class ApiTestController { @Resource private OcrPictureService ocrPictureService; + /** + * 拉取无量云全量任务数据,根据业务主体 + * @param request + * @return + */ + @GetMapping("pullPictureAllByAccountNo") + public String pullPictureAllByAccountNo(HttpServletRequest request){ + String beginStr = request.getParameter("beginStr"); + String endStr = request.getParameter("endStr"); + String tenantNoStr = request.getParameter("tenantNo"); + if(StringUtils.isBlank(tenantNoStr)){ + return "租户不能为空"; + } + String accountNoStr = request.getParameter("accountNo"); + if(StringUtils.isBlank(accountNoStr)){ + return "业务主体不能为空"; + } + Long tenantNo = Long.parseLong(request.getParameter("tenantNo")); + Long accountNo = Long.parseLong(request.getParameter("accountNo")); + return ""; + } + /** * 拉取无量云任务数据,根据单租户、业务主体拉取 * pull wyl task data @@ -83,7 +105,7 @@ public class ApiTestController { 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+" 23:59:59","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)); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java index bfcaf6c6..ff000713 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrFrontConf.java @@ -63,4 +63,9 @@ public class OcrFrontConf implements java.io.Serializable { * 默认图片 */ private String defaultPictureImg; + + /** + * 拉取全量接口数据 + */ + private String pictureSourceAllUrl; }