1. 新增回传日志

2. 新增凌晨2点统一执行当前回传失败的数据

src/main/java/com/pavis/ai/kwp/ioc/client/CallbackClient.java

@@ -7,15 +7,16 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "ioc-callback", url = "${ioc.callback-url}", configuration = CallbackClient.CallbackConfig.class)
+// @FeignClient(name = "ioc-callback", url = "https://baidu-agency.ddp.demo.aks.chilunyc.com", configuration = CallbackClient.CallbackConfig.class)
+@FeignClient(name = "ioc-callback", url = "https://gateway.app.dandanpai.cn/services/audit-service", configuration = CallbackClient.CallbackConfig.class)
 public interface CallbackClient {
 
-    // @PostMapping(value = "/api/receive-result", consumes = MediaType.APPLICATION_JSON_VALUE)
-    // String callback(@RequestBody String callbackDetails);
-
-    @PostMapping(value = "/api/ai/callback", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/api/receive-result", consumes = MediaType.APPLICATION_JSON_VALUE)
     String callback(@RequestBody String callbackDetails);
 
+    // @PostMapping(value = "/api/ai/callback", consumes = MediaType.APPLICATION_JSON_VALUE)
+    // String callback(@RequestBody String callbackDetails);
+
     class CallbackConfig {
         @Bean
         public Logger.Level logger() {

src/main/java/com/pavis/ai/kwp/ioc/common/jobs/CallbackJob.java

@@ -1,21 +1,25 @@
 package com.pavis.ai.kwp.ioc.common.jobs;
 
+import com.pavis.ai.kwp.ioc.common.utils.DateTimeUtils;
 import com.pavis.ai.kwp.ioc.service.CallbackService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
 
 @Slf4j
-// @Component
+@Component
 public class CallbackJob extends QuartzJobBean {
 
-    // @Autowired
+    @Autowired
     private CallbackService callbackService;
 
     @Override
     @SuppressWarnings("NullableProblems")
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
-        // callbackService.callback();
+        log.info("时间:{}, 执行回传失败的数据", DateTimeUtils.dateTimeNow());
+        callbackService.callback();
     }
 }

src/main/java/com/pavis/ai/kwp/ioc/common/jobs/CallbackJobConfig.java

@@ -1,11 +1,13 @@
 package com.pavis.ai.kwp.ioc.common.jobs;
 
 import org.quartz.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
-// @Configuration
+@Configuration
 public class CallbackJobConfig {
 
-    // @Bean
+    @Bean
     public JobDetail callbackJobDetail() {
         return JobBuilder
                 .newJob(CallbackJob.class)
@@ -14,14 +16,14 @@ public class CallbackJobConfig {
                 .build();
     }
 
-    // @Bean
+    @Bean
     public Trigger callbackJobTrigger() {
         return TriggerBuilder
                 .newTrigger()
                 .forJob(callbackJobDetail())
                 .withIdentity("callbackJobTrigger")
-                // 每20秒执行一次 */20 * * * * ?
-                .withSchedule(CronScheduleBuilder.cronSchedule("20 * * * * ?"))
+                // 每20秒执行一次 */20 * * * * ?   0 0 2 * * ? 每天凌晨两点执行
+                .withSchedule(CronScheduleBuilder.cronSchedule("0 0 2 * * ?"))
                 .build();
     }
 }

src/main/java/com/pavis/ai/kwp/ioc/common/listener/OcrListener.java

@@ -31,13 +31,13 @@ public class OcrListener {
 
     @EventListener
     public void callback(OcrEvent event) {
-        log.info("ocr type:{}", event.getOcrType());
+        log.info("upload_id:{}, ocr type:{}", event.getUploadId(), event.getOcrType());
         if (properties.getCallback()) {
             if (StringUtils.equals(event.getOcrType(), GOODS_OCR_TYPE)) {
                 // 查询小票是否识别完成
                 TripLog tripLog = tripLogMapper.selectById(event.getUploadId());
                 if (tripLog.getTDone()) {
-                    log.info("小票已识别,开始回传");
+                    log.info("小票已识别,开始回传,{}", event.getUploadId());
                     callbackService.callback(event.getUploadId());
                 }
             }
@@ -46,7 +46,7 @@ public class OcrListener {
                 // 查询商品是否识别完成
                 GoodsLog goodsLog = goodsLogMapper.selectById(event.getUploadId());
                 if (goodsLog.getGDone()) {
-                    log.info("商品已识别,开始回传");
+                    log.info("商品已识别,开始回传,{}", event.getUploadId());
                     callbackService.callback(event.getUploadId());
                 }
             }