Browse Source

1. 去除网购小票默认购买日期功能
2. 移除商品识别并发功能

semi 4 years ago
parent
commit
f953d20ed6

+ 7 - 7
src/main/java/com/pavis/ai/kwp/ioc/common/config/AsyncConfig.java

@@ -10,17 +10,17 @@ import java.util.concurrent.Executor;
 public class AsyncConfig {
 
     // 声明一个线程池(并指定线程池的名字)
-    @Bean("recAndSaveExecutor")
+    @Bean("irRequest")
     public Executor recAndSaveExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         //核心线程数2:线程池创建时候初始化的线程数
         executor.setCorePoolSize(2);
-        //最大线程数5:线程池最大的线程数,只有在缓冲队列满了之后才会申请超过核心线程数的线程
-        executor.setMaxPoolSize(4);
-        //缓冲队列180:用来缓冲执行任务的队列
-        executor.setQueueCapacity(180);
-        //允许线程的空闲时间60秒:当超过了核心线程出之外的线程在空闲时间到达之后会被销毁
-        executor.setKeepAliveSeconds(60);
+        //最大线程数3:线程池最大的线程数,只有在缓冲队列满了之后才会申请超过核心线程数的线程
+        executor.setMaxPoolSize(3);
+        //缓冲队列5000:用来缓冲执行任务的队列
+        executor.setQueueCapacity(10000);
+        //允许线程的空闲时间180秒:当超过了核心线程出之外的线程在空闲时间到达之后会被销毁
+        executor.setKeepAliveSeconds(180);
         //线程池名的前缀:设置好了之后可以方便我们定位处理任务所在的线程池
         executor.setThreadNamePrefix("OcrGoodsAsync-");
         executor.initialize();

+ 2 - 1
src/main/java/com/pavis/ai/kwp/ioc/service/impl/OcrGoodsServiceImpl.java

@@ -43,7 +43,8 @@ public class OcrGoodsServiceImpl implements OcrGoodsService {
     @Autowired
     private SubImgRetMapper subImgRetMapper;
 
-    // @Async("recAndSaveExecutor")
+
+    // @Async("irRequest")
     @Override
     public void recAndSave(OcrGoods ocrGoods) {
         log.info("start rec and save");

+ 9 - 9
src/main/java/com/pavis/ai/kwp/ioc/service/impl/OcrTripServiceImpl.java

@@ -32,8 +32,8 @@ public class OcrTripServiceImpl extends ServiceImpl<OcrTripMapper, OcrTrip> impl
     private OcrTripDetMapper ocrTripDetMapper;
     @Autowired
     private OcrTripProbMapper ocrTripProbMapper;
-    @Autowired
-    private UpMainMapper upMainMapper;
+    // @Autowired
+    // private UpMainMapper upMainMapper;
 
     @Override
     public void saveOcrRet(OcrRetDto ret) {
@@ -48,13 +48,13 @@ public class OcrTripServiceImpl extends ServiceImpl<OcrTripMapper, OcrTrip> impl
                     ocrTrip.setGlobalProb("1");
                 }
                 // 处理网购小票日期
-                if (StringUtils.isBlank(ocrTrip.getPurchaseDate())) {
-                    // 查小票类型
-                    UpMain upMain = upMainMapper.selectById(ocrTrip.getUploadId());
-                    if (upMain.getTripType().equals(Constants.TRIP_TYPE_ET)) {
-                        ocrTrip.setPurchaseDate(DateTimeUtils.nonEtDatetime(upMain.getUploadTime()));
-                    }
-                }
+                // if (StringUtils.isBlank(ocrTrip.getPurchaseDate())) {
+                //     // 查小票类型
+                //     UpMain upMain = upMainMapper.selectById(ocrTrip.getUploadId());
+                //     if (upMain.getTripType().equals(Constants.TRIP_TYPE_ET)) {
+                //         ocrTrip.setPurchaseDate(DateTimeUtils.nonEtDatetime(upMain.getUploadTime()));
+                //     }
+                // }
                 baseMapper.insert(ocrTrip);
             }
             List<OcrTripDet> dets = dto.adapteDetails(ret.getUploadId());