From ccba712602ff6eafe0928d79b6d595c140e924af Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 27 四月 2025 17:29:09 +0800
Subject: [PATCH] 海康接口修改
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 20 +++++-----
ycl-server/src/main/java/com/ycl/feign/HKLabelName.java | 38 ++++++++++++-------
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 32 +++++++++++-----
ycl-server/src/main/java/com/ycl/feign/HKResultLabel.java | 4 +-
ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java | 1
5 files changed, 59 insertions(+), 36 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java b/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java
index 3f15ae8..b67b341 100644
--- a/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java
+++ b/ycl-server/src/main/java/com/ycl/feign/HKLabelName.java
@@ -7,21 +7,31 @@
@Getter
public enum HKLabelName {
- faceButtStability2023("faceButtStability2023","浜鸿劯瑙嗗浘搴撳鎺ョǔ瀹氭��"),
- faceDelay("faceDelay","璁惧鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�"),
- faceClockAccuracy("faceClockAccuracy","浜鸿劯璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�"),
- faceOnlineRate("faceOnlineRate","浜鸿劯鐐逛綅鍦ㄧ嚎鐜�"),
- faceCapturedPicturesEligibility("faceCapturedPicturesEligibility","浜鸿劯璁惧鎶撴媿鍥剧墖鍚堟牸鎬�"),
- faceBigPictureAccess("faceBigPictureAccess","浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"),
+ carBigPictureAccess("carBigPictureAccess", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"),
+ carButtStability2023("carButtStability2023", "杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��"),
+ carClockAccuracy("carClockAccuracy", "杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�"),
+ carCorrectRate("carCorrectRate", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�"),
- carDelay("carDelay","杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�"),
- carOnlineRate2023("carOnlineRate2023","杞﹁締鐐逛綅鍦ㄧ嚎鐜�"),
- carButtStability2023("carButtStability2023","杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��"),
- carBigPictureAccess("carBigPictureAccess","杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"),
- carCorrectRate("carCorrectRate","杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�"),
- carClockAccuracy("carClockAccuracy","杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�"),
- carQualifiedRate("carQualifiedRate","杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�"),
- carUrlOkRate("carUrlOkRate","杞﹁締鍗″彛璁惧url鍙敤鎬�");
+
+ carDelay("carDelay", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�"),
+ carOnlineRate2023("carOnlineRate2023", "杞﹁締鐐逛綅鍦ㄧ嚎鐜�"),
+ carQualifiedRate("carQualifiedRate", "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�"),
+ carUrlOkRate("carUrlOkRate", "杞﹁締鍗″彛璁惧url鍙敤鎬�"),
+
+
+ faceBigPictureAccess("faceBigPictureAccess", "浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�"),
+
+
+ faceButtStability2023("faceButtStability2023", "浜鸿劯瑙嗗浘搴撳鎺ョǔ瀹氭��"),
+
+
+ faceCapturedPicturesEligibility("faceCapturedPicturesEligibility", "浜鸿劯璁惧鎶撴媿鍥剧墖鍚堟牸鎬�"),
+ faceClockAccuracy("faceClockAccuracy", "浜鸿劯璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�"),
+
+ faceDelay("faceDelay", "璁惧鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�"),
+
+ faceOnlineRate("faceOnlineRate", "浜鸿劯鐐逛綅鍦ㄧ嚎鐜�"),
+ ;
@EnumValue // 鏍囨槑璇ュ瓧娈靛瓨鍏ユ暟鎹簱
diff --git a/ycl-server/src/main/java/com/ycl/feign/HKResultLabel.java b/ycl-server/src/main/java/com/ycl/feign/HKResultLabel.java
index e1a4c1a..e1448b6 100644
--- a/ycl-server/src/main/java/com/ycl/feign/HKResultLabel.java
+++ b/ycl-server/src/main/java/com/ycl/feign/HKResultLabel.java
@@ -13,10 +13,10 @@
//鏄惁鏄粯璁ゆ爣绛� 1鏄� 0鍚�
private Integer isDefault;
//鏀规爣绛惧叧鑱旂殑鑰冩牳鎸囨爣椤�
- private List<String> relatedIndex;
+ private String relatedIndex;
//鍏宠仈鎸囨爣鐨勫ぇ绫�
- private List<String> relatedIndexCategory;
+ private String relatedIndexCategory;
//鏄惁鑷姩鑰冩牳 1涓鸿嚜鍔� 0涓烘墜鍔�
private Integer isAuto;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 1e02d55..7e514d4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -191,18 +191,30 @@
private List<CheckScore> getCheckScores(Map.Entry<Long, List<CheckScore>> entry) {
List<CheckScore> tempList = new ArrayList<>(); // 涓存椂瀛樺偍闇�瑕佹坊鍔犵殑鍏冪礌
- for (CheckScore listCheckScore : entry.getValue()) {
- if (listCheckScore.getExamineCategory() == 1 && entry.getValue().size() == 1) {
- CheckScore face = new CheckScore();
- face.setExamineCategory((short) 2);
- face.setScore(new BigDecimal("0.0"));
- CheckScore car = new CheckScore();
- car.setExamineCategory((short) 3);
- car.setScore(new BigDecimal("0.0"));
- tempList.add(face);
- tempList.add(car);
+
+ boolean hasFace = false;
+ boolean hasCar = false;
+ for (int i =0;i <entry.getValue().size();i++) {
+ CheckScore checkScore = entry.getValue().get(i);
+ if (checkScore.getExamineCategory() == 2){
+ hasCar = true;
+ }else if (checkScore.getExamineCategory() == 3){
+ hasFace = true;
}
}
+ if (!hasCar){
+ CheckScore car = new CheckScore();
+ car.setExamineCategory((short) 2);
+ car.setScore(new BigDecimal("0.0"));
+ tempList.add(car);
+ }
+ if (!hasFace){
+ CheckScore face = new CheckScore();
+ face.setExamineCategory((short) 3);
+ face.setScore(new BigDecimal("0.0"));
+ tempList.add(face);
+ }
+
return tempList;
}
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 26a12ba..bb9940a 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());
@@ -703,9 +701,10 @@
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");
@@ -744,9 +743,10 @@
}
//鑾峰彇鐪佸巺杞﹁締鏁版嵁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");
diff --git a/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java b/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java
index 6664873..7da632e 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java
@@ -65,6 +65,7 @@
TMonitorResult result = checkPointUtil.check(monitor,times);
if (result.getPingOnline()){
result.setPingOnlineStr("1");
+
}else {
result.setPingOnlineStr("-1");
}
--
Gitblit v1.8.0