From f5e1051a7e6d3ffccc815a631d8be372d772c58f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 11:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index e508811..5220041 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -7,6 +7,7 @@
import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
import com.ycl.platform.mapper.YwThresholdMapper;
+import com.ycl.platform.service.IYwThresholdService;
import com.ycl.web.HKClient;
import enumeration.BusinessType;
import enumeration.general.BusinessTypeEnum;
@@ -30,7 +31,7 @@
@Autowired
private HKClient hkClient;
@Autowired
- private YwThresholdMapper thresholdMapper;
+ private IYwThresholdService ywThresholdService;
private final static Integer pageNo = 1;
private final static Integer pageSize = 5000;
@@ -53,10 +54,11 @@
if (CollectionUtils.isEmpty(list)) {
throw new RuntimeException("杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
}
- //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
- List<YwThreshold> ywThresholds = thresholdMapper.selectByType(BusinessTypeEnum.CAR.name());
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(list);
+ //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
+ ywThresholdService.carCheck(list);
+
} else {
log.error("鍚屾杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
}
@@ -79,10 +81,10 @@
if (CollectionUtils.isEmpty(list)) {
throw new RuntimeException("浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
}
- //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
-
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(list);
+ //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
+
} else {
log.error("鍚屾浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
}
--
Gitblit v1.8.0