1. 修改g_done的触发规则

src/main/java/com/pavis/ai/kwp/ioc/service/impl/OcrGoodsServiceImpl.java

@@ -56,6 +56,9 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
                 startOcr(ocrGoods.getUploadId(), ug, goodsLog);
                 log.info("finish ir,upload_id:{},goods_id:{}", ug.getUploadId(), ug.getId());
             }
+            if (goodsLog.getGDone() == null) {
+                goodsLog.setGDone(!goodsLog.getGError());
+            }
             if (goodsLog.getGDone()) {
                 // 通知监听器
                 applicationEventPublisher.publishEvent(new OcrEvent(this, "G", ocrGoods.getUploadId()));
@@ -91,6 +94,9 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
                 for (UpGoods ug : upGoods) {
                     startOcr(goodsLog.getUploadId(), ug, goodsLog);
                 }
+                if (goodsLog.getGDone() == null) {
+                    goodsLog.setGDone(!goodsLog.getGError());
+                }
                 // 设置结束时间
                 goodsLog.setGFinishTime(DateTimeUtils.dateTimeNow());
                 goodsLog.setGTimeConsume(DateTimeUtils.calculateTimeConsume(goodsLog.getGStartTime(), goodsLog.getGFinishTime()));
@@ -118,7 +124,6 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
             try {
                 res = ctrService.startRequest(uploadId, ug.getGoodsImg());
             } catch (Exception e) {
-                goodsLog.setGDone(false);
                 goodsLog.setGError(true);
                 ErrGoods err = ErrGoods.builder()
                         .uploadId(uploadId)
@@ -134,12 +139,10 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
                     IrRet result = res.getResult();
                     if (result.getSubnumber() > 0) {
                         goodsLog.setGError(false);
-                        goodsLog.setGDone(true);
                         res.setGoodsId(ug.getId());
                         saveOcrResult(res);
                     } else {
                         goodsLog.setGError(true);
-                        goodsLog.setGDone(true);
                         ErrGoods err = ErrGoods.builder()
                                 .uploadId(ug.getUploadId())
                                 .goodsImg(ug.getGoodsImg())
@@ -148,8 +151,8 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
                                 .build();
                         errGoodsMapper.insert(err);
                     }
+                    goodsLog.setGDone(true);
                 } else {
-                    goodsLog.setGDone(false);
                     goodsLog.setGError(true);
                     ErrGoods err = ErrGoods.builder()
                             .uploadId(uploadId)
@@ -160,7 +163,6 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
                     errGoodsMapper.insert(err);
                 }
             } else {
-                goodsLog.setGDone(false);
                 goodsLog.setGError(true);
                 ErrGoods err = ErrGoods.builder()
                         .uploadId(uploadId)