From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 2c5b495..f43b1e2 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -77,7 +77,7 @@
@Autowired
private CheckIndexFaceMapper faceMapper;
- //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
+ //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉 杞﹁締锛堣溅杈嗗崱鍙ｈ澶囨椂閽熷噯纭�с�侊級
public void vehicleDeviceInspectionTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
@@ -107,7 +107,7 @@
log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
- //浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
+ //浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉 浜鸿劯锛堣澶囨姄鎷嶅浘鐗囨椂閽熷噯纭�э級
public void faceDeviceInspectionTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
@@ -136,7 +136,7 @@
}
- // 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
+ // 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� 杞﹁締浜鸿劯锛堣鍥惧簱瀵规帴绋冲畾鎬с�佺偣浣嶅湪绾跨巼锛�
public void snapshotDataMonitorTask() {
log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
/** 杞﹁締鏁版嵁 */
@@ -170,7 +170,9 @@
faceParam.setDate(DateUtils.getDate());
faceParam.setDataType(ApiConstants.HK_DataType_FACE);
List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI(host, appKey, appSecret, "/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
+ log.info("鎵撳嵃浜鸿劯锛堣鍥惧簱瀵规帴绋冲畾鎬с�佺偣浣嶅湪绾跨巼锛塇K鎺ュ彛鑾峰緱浠诲姟淇℃伅:{}",faceList);
if (!CollectionUtils.isEmpty(faceList)) {
+
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
@@ -184,6 +186,7 @@
pointService.setDeviceTagByGB(faceList, CheckConstants.Rule_Category_Face);
//瀛樻斁鍦╩ongo涓�
faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+ log.info("鎵撳嵃浜鸿劯锛堣鍥惧簱瀵规帴绋冲畾鎬с�佺偣浣嶅湪绾跨巼锛夎缃畉ag骞舵彃鍏ongodb鏁版嵁:{}",faceList);
mongoTemplate.insertAll(faceList);
}
//淇敼online鐘舵��
@@ -217,6 +220,7 @@
willUpdateList.add(vo);
}
});
+ log.info("淇敼璁惧灏嗚鏇存柊鍏ql涓暟鎹細{}",willUpdateList);
if(!CollectionUtils.isEmpty(willUpdateList)) monitorMapper.updateOnlineFromHk(willUpdateList);
// List<UpdateOnlineVO> willUpdateList = totalResult.stream().map(item -> {
// UpdateOnlineVO vo = new UpdateOnlineVO();
@@ -240,7 +244,7 @@
log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
}
- //閲囬泦璁惧灞炴�х洃娴嬬粨鏋�(浜鸿劯)
+ //閲囬泦璁惧灞炴�х洃娴嬬粨鏋�(浜鸿劯) 浜鸿劯锛堜汉鑴稿崱鍙ｄ俊鎭噰闆嗗噯纭巼锛�
public void monitorDetailTask() {
log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
@@ -266,7 +270,7 @@
log.info("缁撴潫閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
}
- //鍗″彛灞炴�х洃娴嬬粨鏋�
+ //鍗″彛灞炴�х洃娴嬬粨鏋� 杞﹁締锛堣溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼銆侊級
public void crossDetailTask() {
log.info("寮�濮嬫墽琛屽崱鍙ｅ睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
@@ -292,7 +296,7 @@
log.info("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
}
- //鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
+ //鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋� 杞﹂噺锛堣溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹畬鏁存�с�侊級
public void dataIntegrityMonitoringTask() {
log.info("寮�濮嬫墽琛屾暟鎹畬鏁存�х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�
@@ -320,7 +324,7 @@
log.info("缁撴潫鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
}
- //灞炴�ц瘑鍒噯纭洃娴嬬粨鏋�
+ //灞炴�ц瘑鍒噯纭洃娴嬬粨鏋� 杞﹁締锛堣溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹噯纭�с�侊級
public void attrRecognitionMonitorTask() {
log.info("寮�濮嬫墽琛屽睘鎬ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�
@@ -349,7 +353,7 @@
}
- //鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉
+ //鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鍖呭惈 杞﹁締浜鸿劯锛堟姄鎷嶆暟鎹笂浼犲強鏃舵�э級
public void snapshopDelayMonitorTask() {
log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹椂寤剁洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
@@ -405,7 +409,7 @@
log.info("缁撴潫鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鏁版嵁鍚屾");
}
- //鍥剧墖璁块棶鐩戞祴缁撴灉
+ //鍥剧墖璁块棶鐩戞祴缁撴灉 杞﹁締锛堣溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼銆佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬э級
public void picAccessTask() {
log.info("寮�濮嬫墽琛屽浘鐗囪闂洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
@@ -433,7 +437,7 @@
log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
}
- //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+ //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉 杞﹁締锛堣溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼銆佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬э級
public void vehicleDeviceSamplingTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
@@ -462,7 +466,7 @@
}
- //浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+ //浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉 浜鸿劯锛堟姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��,淇℃伅閲囬泦姝ｇ‘鐜囷級
public void faceDeviceSamplingTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
@@ -592,6 +596,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)){
@@ -603,6 +608,8 @@
faceLabelId = label.getId();
}else if ("鐪佸巺杞﹁締".equals(label.getLabelName())){
carLabelId = label.getId();
+ }else if ("鍏ㄩ噺".equals(label.getLabelName())){
+ allLabelId = label.getId();
}
}
log.error("鎵撳嵃hkResultLabels锛歿}",hkResultLabels);
@@ -632,6 +639,10 @@
// param.setLabelId();
//------------榛樿鍙傛暟涓簄ull璇锋眰鍏ㄩ噺鏁版嵁
+ if (allLabelId == null){
+ allLabelId = -1;
+ }
+ param.setLabelId(allLabelId);
JSONObject scoreJson = hkClient.getScoreNew(param);
log.error("鍏ㄩ噺鏁版嵁");
if (scoreJson != null) {
@@ -687,7 +698,6 @@
cars.add(car);
faces.add(face);
}
- //璇锋眰鐪佸巺鏁版嵁
}else {
log.error("璋冪敤娴峰悍鍏ㄩ噺鏁版嵁api澶辫触");
}
--
Gitblit v1.8.0