From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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 26a12ba..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;
@@ -78,10 +76,6 @@
private ICheckIndexFaceService faceService;
@Autowired
private CheckIndexFaceMapper faceMapper;
- @Autowired
- private StringHttpMessageConverter stringHttpMessageConverter;
- @Autowired
- private LoadBalancerRequestFactory loadBalancerRequestFactory;
//杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
public void vehicleDeviceInspectionTask() {
@@ -598,20 +592,23 @@
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)){
//鑾峰緱label鑰冩牳鏍囩瀵硅薄
+ log.error("labelJson鐨刣ata:{}",labelJson.get("data"));
List<HKResultLabel> hkResultLabels = labelJson.getList("data",HKResultLabel.class);
for (HKResultLabel label : hkResultLabels) {
if ("鐪佸巺浜鸿劯".equals(label.getLabelName())){
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){
@@ -638,6 +635,10 @@
// param.setLabelId();
//------------榛樿鍙傛暟涓簄ull璇锋眰鍏ㄩ噺鏁版嵁
+ if (allLabelId == null){
+ allLabelId = -1;
+ }
+ param.setLabelId(allLabelId);
JSONObject scoreJson = hkClient.getScoreNew(param);
log.error("鍏ㄩ噺鏁版嵁");
if (scoreJson != null) {
@@ -653,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()
@@ -664,6 +664,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 +672,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());
@@ -693,7 +694,6 @@
cars.add(car);
faces.add(face);
}
- //璇锋眰鐪佸巺鏁版嵁
}else {
log.error("璋冪敤娴峰悍鍏ㄩ噺鏁版嵁api澶辫触");
}
@@ -703,14 +703,15 @@
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");
+ String code = faceJson.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涓�
@@ -721,7 +722,7 @@
//鎵规id 涓� 鍚勫尯淇℃伅闆嗗悎
log.error("鎵撳嵃鍑虹渷鍘呬汉鑴竏ata鍐呭涓壒娆d锛歿}锛屼互鍙婂搴旂殑缁撴灉info:{}",batchIdKey,batch);
}
- //鑾峰緱鏈�澶х殑閿��
+ //鑾峰緱鏈�澶х殑閿��
Optional<Integer> maxKey = map.keySet().stream()
.max(Integer::compareTo);
if (maxKey.isPresent()) {
@@ -744,14 +745,15 @@
}
//鑾峰彇鐪佸巺杞﹁締鏁版嵁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");
+ 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());
@@ -906,6 +906,8 @@
face.setFaceInformationCollectionAccuracy(new BigDecimal("1"));
//TODO:娌℃壘鍒拌�冩牳椤� 璁惧鐩綍涓�鑷寸巼
face.setDeviceDirectoryConsistent(new BigDecimal("1"));
+
+
//TODO:娌℃壘鍒拌�冩牳椤� 杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
car.setVehicleInformationCollectionAccuracy(new BigDecimal("1"));
//TODO:娌℃壘鍒拌�冩牳椤� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼
--
Gitblit v1.8.0