From 6a9148db96ae24cb932ee50e9427269569348868 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 28 四月 2025 09:14:53 +0800
Subject: [PATCH] 手册，海康接口调整
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 43 ++++++++++++++++---------------------------
1 files changed, 16 insertions(+), 27 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 a5ecce0..21f06c4 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -78,10 +78,6 @@
private ICheckIndexFaceService faceService;
@Autowired
private CheckIndexFaceMapper faceMapper;
- @Autowired
- private StringHttpMessageConverter stringHttpMessageConverter;
- @Autowired
- private LoadBalancerRequestFactory loadBalancerRequestFactory;
//杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
public void vehicleDeviceInspectionTask() {
@@ -602,6 +598,7 @@
String code = labelJson.getString("code");
if (ApiConstants.HKSuccessCode.equals(code)){
//鑾峰緱label鑰冩牳鏍囩瀵硅薄
+ log.error("labelJson鐨刣ata:{}",labelJson.get("data"));
List<HKResultLabel> hkResultLabels = labelJson.getList("data",HKResultLabel.class);
for (HKResultLabel label : hkResultLabels) {
if ("鐪佸巺浜鸿劯".equals(label.getLabelName())){
@@ -664,6 +661,7 @@
//杩欎竴灞備负鑾峰緱 data -> 涓� 鎵规鏁扮粍涓� -> 鍖哄煙code鏁扮粍鐨刱ey
for (String areaCodeKey : map.get(id).keySet()) {
//瀛樻斁鏈�鏂版壒娆＄殑鍐呭鍒癮llInfo闆嗗悎涓�
+ log.error("鎵撳嵃鍖轰俊鎭�:{}",map.get(id).get(areaCodeKey));
allInfo.addAll(map.get(id).getList(areaCodeKey,HkResultInfo.class));
}
}
@@ -671,8 +669,8 @@
Map<String, List<HkResultInfo>> groupedByAreaName = allInfo.stream()
.collect(Collectors.groupingBy(HkResultInfo::getAreaCode));
for (Map.Entry<String, List<HkResultInfo>> entry : groupedByAreaName.entrySet()) {
- log.error("鏈�鏂版壒娆″唴鏁版嵁:{}",groupedByAreaName.get(entry.getKey()).size());
- log.error("鏈�鏂版壒娆″唴size:{}",groupedByAreaName.get(entry.getKey()));
+ log.error("鏈�鏂版壒娆″唴size:{}",groupedByAreaName.get(entry.getKey()).size());
+ log.error("鏈�鏂版壒娆″唴鏁版嵁:{}",groupedByAreaName.get(entry.getKey()));
CheckIndexCar car = new CheckIndexCar();
CheckIndexFace face = new CheckIndexFace();
score3Index(groupedByAreaName.get(entry.getKey()), car, face,entry.getKey());
@@ -694,27 +692,24 @@
faces.add(face);
}
//璇锋眰鐪佸巺鏁版嵁
-
-
}else {
log.error("璋冪敤娴峰悍鍏ㄩ噺鏁版嵁api澶辫触");
}
}
-
//------------鑾峰彇鐪佸巺鏁版嵁
List<HkResultInfo> provincialList = new ArrayList<>();
-
//鑾峰彇鐪佸巺浜鸿劯鏁版嵁
if (faceLabelId != null){
+ ScoreParam faceParam = new ScoreParam();
log.error("faceLabelId:{}",faceLabelId);
- param.setLabelId(faceLabelId);
- JSONObject faceJson = hkClient.getScoreNew(param);
+ faceParam.setLabelId(faceLabelId);
+ JSONObject faceJson = hkClient.getScoreNew(faceParam);
log.error("鐪佸巺浜鸿劯鏁版嵁");
if (faceJson != null) {
String code = scoreJson.getString("code");
if (ApiConstants.HKSuccessCode.equals(code)){
- JSONObject data = scoreJson.getJSONObject("data");
+ JSONObject data = faceJson.getJSONObject("data");
Map<Integer,JSONObject> map = new HashMap<>();
//鑾峰緱data 涓� batchId 鐨勬壒娆d瀵硅薄 鏀惧叆map涓�
@@ -743,16 +738,15 @@
}
}
-
-
}else {
log.error("faceLabelId:涓虹┖涓嶆墽琛岃幏寰楃渷鍘呮暟鎹�");
}
- //鑾峰彇鐪佸巺杞﹁締鏁版嵁
+ //鑾峰彇鐪佸巺杞﹁締鏁版嵁v.
if (carLabelId != null){
+ ScoreParam carParam = new ScoreParam();
log.error("carLabelId:{}",carLabelId);
- param.setLabelId(carLabelId);
- JSONObject carJson = hkClient.getScoreNew(param);
+ carParam.setLabelId(carLabelId);
+ JSONObject carJson = hkClient.getScoreNew(carParam);
log.error("鐪佸巺杞﹁締鏁版嵁");
if (carJson != null) {
String code = scoreJson.getString("code");
@@ -813,7 +807,8 @@
cars.add(car);
faces.add(face);
}
-
+ log.error("鎵撳嵃鎻掑叆鏁版嵁cars:{}",cars);
+ log.error("鎵撳嵃鎻掑叆鏁版嵁faces:{}",faces);
//瀛樻斁鎴愮哗鍒癿ysql锛屽鏋滃瓨鍦ㄥ垯鏇挎崲涓嶅瓨鍦ㄥ氨鏂板銆�
if (!CollectionUtils.isEmpty(cars)) carService.saveOrUpdateBatch(cars);
if (!CollectionUtils.isEmpty(faces)) faceService.saveOrUpdateBatch(faces);
@@ -911,19 +906,13 @@
face.setFaceInformationCollectionAccuracy(new BigDecimal("1"));
//TODO:娌℃壘鍒拌�冩牳椤� 璁惧鐩綍涓�鑷寸巼
face.setDeviceDirectoryConsistent(new BigDecimal("1"));
+
+
//TODO:娌℃壘鍒拌�冩牳椤� 杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
car.setVehicleInformationCollectionAccuracy(new BigDecimal("1"));
//TODO:娌℃壘鍒拌�冩牳椤� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼
car.setDeviceDirectoryConsistent(new BigDecimal("1"));
-
-
-
}
-
-
-
-
-
//瑙ｆ瀽鏁版嵁
private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
--
Gitblit v1.8.0