From b85542765637358cb1473629d0ea767ac076aec3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 23 九月 2025 13:36:26 +0800
Subject: [PATCH] 图片压缩
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 21f06c4..b9388dd 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -9,13 +9,11 @@
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.param.HK.*;
import com.ycl.platform.domain.result.HK.*;
-import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.domain.vo.UpdateOnlineVO;
import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
import com.ycl.platform.mapper.TMonitorMapper;
-import com.ycl.platform.mapper.WorkOrderMapper;
import com.ycl.platform.service.*;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
@@ -594,6 +592,7 @@
JSONObject labelJson = hkClient.getGetLabel();
Integer faceLabelId = null;
Integer carLabelId = null;
+ Integer allLabelId = null;
if (labelJson != null) {
String code = labelJson.getString("code");
if (ApiConstants.HKSuccessCode.equals(code)){
@@ -605,10 +604,11 @@
faceLabelId = label.getId();
}else if ("鐪佸巺杞﹁締".equals(label.getLabelName())){
carLabelId = label.getId();
+ }else if ("鍏ㄩ噺".equals(label.getLabelName())){
+ allLabelId = label.getId();
}
}
log.error("鎵撳嵃hkResultLabels锛歿}",hkResultLabels);
-
}
}
if (faceLabelId == null || carLabelId == null){
@@ -635,6 +635,10 @@
// param.setLabelId();
//------------榛樿鍙傛暟涓簄ull璇锋眰鍏ㄩ噺鏁版嵁
+ if (allLabelId == null){
+ allLabelId = -1;
+ }
+ param.setLabelId(allLabelId);
JSONObject scoreJson = hkClient.getScoreNew(param);
log.error("鍏ㄩ噺鏁版嵁");
if (scoreJson != null) {
@@ -650,7 +654,6 @@
//浠ユ壒娆d涓簁ey 鏀惧叆 JSONObject瀵硅薄
map.put(Integer.valueOf(batchIdKey),batch);
//鎵规id 涓� 鍚勫尯淇℃伅闆嗗悎
- log.error("鎵撳嵃鍑篸ata鍐呭涓壒娆d锛歿}锛屼互鍙婂搴旂殑缁撴灉info:{}",batchIdKey,batch);
}
//鑾峰緱鏈�澶х殑閿��
Optional<Integer> maxKey = map.keySet().stream()
@@ -691,7 +694,6 @@
cars.add(car);
faces.add(face);
}
- //璇锋眰鐪佸巺鏁版嵁
}else {
log.error("璋冪敤娴峰悍鍏ㄩ噺鏁版嵁api澶辫触");
}
@@ -707,7 +709,7 @@
JSONObject faceJson = hkClient.getScoreNew(faceParam);
log.error("鐪佸巺浜鸿劯鏁版嵁");
if (faceJson != null) {
- String code = scoreJson.getString("code");
+ String code = faceJson.getString("code");
if (ApiConstants.HKSuccessCode.equals(code)){
JSONObject data = faceJson.getJSONObject("data");
@@ -720,7 +722,7 @@
//鎵规id 涓� 鍚勫尯淇℃伅闆嗗悎
log.error("鎵撳嵃鍑虹渷鍘呬汉鑴竏ata鍐呭涓壒娆d锛歿}锛屼互鍙婂搴旂殑缁撴灉info:{}",batchIdKey,batch);
}
- //鑾峰緱鏈�澶х殑閿��
+ //鑾峰緱鏈�澶х殑閿��
Optional<Integer> maxKey = map.keySet().stream()
.max(Integer::compareTo);
if (maxKey.isPresent()) {
@@ -749,9 +751,9 @@
JSONObject carJson = hkClient.getScoreNew(carParam);
log.error("鐪佸巺杞﹁締鏁版嵁");
if (carJson != null) {
- String code = scoreJson.getString("code");
+ String code = carJson.getString("code");
if (ApiConstants.HKSuccessCode.equals(code)){
- JSONObject data = scoreJson.getJSONObject("data");
+ JSONObject data = carJson.getJSONObject("data");
Map<Integer,JSONObject> map = new HashMap<>();
//鑾峰緱data 涓� batchId 鐨勬壒娆d瀵硅薄 鏀惧叆map涓�
@@ -785,8 +787,6 @@
Map<String,List<HkResultInfo>> provincialGroupedByAreaName = provincialList.stream()
.collect(Collectors.groupingBy(HkResultInfo::getAreaCode));
for (Map.Entry<String, List<HkResultInfo>> entry : provincialGroupedByAreaName.entrySet()) {
- log.error("鏈�鏂版壒娆″唴鐪佸巺鏁版嵁:{}",provincialGroupedByAreaName.get(entry.getKey()).size());
- log.error("鏈�鏂版壒娆″唴鐪佸巺size:{}",provincialGroupedByAreaName.get(entry.getKey()));
CheckIndexCar car = new CheckIndexCar();
CheckIndexFace face = new CheckIndexFace();
score3Index(provincialGroupedByAreaName.get(entry.getKey()), car, face,entry.getKey());
--
Gitblit v1.8.0