From 40ab33e2f20233d1d30571247c33465ad9afc534 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 09 十二月 2024 09:47:21 +0800
Subject: [PATCH] 一些bug，非空判断、日志路径
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 6 +-
ycl-server/src/main/resources/logback.xml | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/HKScoreResult.java | 32 ++++++++++++++++
ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml | 5 +-
ycl-server/src/main/java/com/ycl/task/ContractTask.java | 1
ycl-server/src/main/java/com/ycl/task/HKTask.java | 24 ++++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/ScoreParam.java | 16 ++++++++
ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 2
ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java | 2
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 2
10 files changed, 83 insertions(+), 9 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/ScoreParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/ScoreParam.java
new file mode 100644
index 0000000..befd0e7
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/ScoreParam.java
@@ -0,0 +1,16 @@
+package com.ycl.platform.domain.param.HK;
+
+import lombok.Data;
+
+@Data
+public class ScoreParam extends BaseParam{
+ //yyyy-MM-dd
+ private String startDate;
+ private String endDate;
+ //閲嶇偣鐐逛綅鏍囨敞 闈炲繀濉� 1閲嶇偣 0鍏ㄩ噺 榛樿鍏ㄩ噺
+ private Integer focusFlag;
+ //浜鸿劯涓氬姟鏍戠紪鐮�
+ private String faceTree;
+ //杞﹁締涓氬姟鏍戠紪鐮�
+ private String carTree;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/HKScoreResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/HKScoreResult.java
new file mode 100644
index 0000000..0a610da
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/HKScoreResult.java
@@ -0,0 +1,32 @@
+package com.ycl.platform.domain.result.HK;
+
+import com.ycl.platform.domain.result.BaseResult;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+//鑰冩牳鎴愮哗
+@Data
+public class HKScoreResult extends BaseResult {
+ private List<HkScore> list;
+
+ /**
+ * 鑰冩牳鎴愮哗
+ */
+ @Data
+ public static class HkScore {
+ //鍖哄煙鍚�
+ private String areaName;
+ //鍖哄煙缂栫爜
+ private String areaCode;
+ //鎺掑悕
+ private Integer ranking;
+ //鎬诲垎
+ private String totalScore;
+ //focusFlag涓�0娑夊強鍒扮殑鍏ㄩ噺鎸囨爣
+ private String downCarDataUploadScoreString;
+ private Date dCreateTime;
+
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
index 01dfdd3..8c2dd89 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
@@ -73,7 +73,7 @@
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
//鏃堕挓鍑嗙‘鐜囧ぇ浜�90%涓哄悎鏍艰澶�
- if (result.getSnapClock().getClockPercent() >= 0.9) {
+ if (result.getSnapClock()!=null && result.getSnapClock().getClockPercent()!=null && result.getSnapClock().getClockPercent() >= 0.9) {
stats.accuracySites++;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
index 667faa0..3935371 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -48,7 +48,7 @@
@Override
public void calculate(List<DataIntegrityMonitoringResult> list) {
//鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
- Map<String, CarDataIntegrityCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
+ Map<String, CarDataIntegrityCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list, Boolean.FALSE);
if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
@@ -75,11 +75,11 @@
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
//90%鍙婁互涓婃暟鎹悎鏍煎垯姝よ溅杈嗗崱鍙ｈ澶囪瑙嗕负鎶撴媿鏁版嵁瀹屾暣
- if (result.getMainNoIntegrityPercent() <= 0.1) {
+ if (result.getMainNoIntegrityPercent() != null && result.getMainNoIntegrityPercent() <= 0.1) {
stats.integritySites++;
}
//閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬у畬鏁�
- if (result.getImportantTag()!=null && result.getImportantTag()) {
+ if (result.getImportantTag() != null && result.getImportantTag()) {
stats.importantTotalSites++;
if (result.getNoIntegrityPercent() <= 0.1) {
stats.importantIntegritySites++;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
index 4e030ee..dbd6824 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
@@ -77,7 +77,7 @@
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
//鏃堕挓鍑嗙‘鐜囧ぇ浜�90%涓哄悎鏍艰澶�
- if (result.getSnapClock().getClockPercent() >= 0.9) {
+ if (result.getSnapClock()!=null && result.getSnapClock().getClockPercent()!=null && result.getSnapClock().getClockPercent() >= 0.9) {
stats.accuracySites++;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractTask.java b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
index 8886cef..a62d7d1 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
@@ -201,6 +201,7 @@
if (!CollectionUtils.isEmpty(reportNumbers)) {
if (reportNumbers.contains(workOrder.getSerialNumber())) continue;
}
+ if(!WorkOrderStatusEnum.AUDITING_SUCCESS.equals(workOrder.getStatus())) continue;
String errorType = workOrder.getErrorType();
//瀛樺偍鏁呴殰 褰曞儚鎴栧浘鐗囪闂紓甯� 锛堟敼鎴愭墜鍔ㄦ墦鍒嗕簡锛�
// if (ErrorType.VIDEO_NONE.getValue().equals(errorType) || ErrorType.PIC_URLABNORMAL.getValue().equals(errorType)) {
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 86ca9cd..0ff1351 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -465,6 +465,30 @@
log.info("缁撴潫涓氬姟鏍戞暟鎹�");
}
+ //鑰冩牳鎴愮哗
+ public void HkScoreTask() {
+ log.info("寮�濮嬫墽琛屾捣搴疯�冩牳鎴愮哗鏁版嵁");
+ ScoreParam param = new ScoreParam();
+ param.setStartDate("2024-12-06");
+ param.setEndDate("2024-12-06");
+ List<HKScoreResult> dataList = HkApiUtil.sendGetAPI(host,appKey,appSecret,"/api/third/score/get", param, HKScoreResult.class);
+// if (!CollectionUtils.isEmpty(faceList)) {
+// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria
+// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, FaceDeviceSamplingResult.class);
+// faceList.stream().forEach(item -> {
+// if (Objects.nonNull(item.getExternalIndexCode())) {
+// item.setNo(item.getExternalIndexCode());
+// }
+// });
+// pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(faceList);
+// }
+ log.info("缁撴潫娴峰悍鑰冩牳鎴愮哗鏁版嵁");
+ }
+
//瑙ｆ瀽鏁版嵁
private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
diff --git a/ycl-server/src/main/resources/logback.xml b/ycl-server/src/main/resources/logback.xml
index 0b59320..2a25189 100644
--- a/ycl-server/src/main/resources/logback.xml
+++ b/ycl-server/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="/home/java/logs" />
+ <property name="log.path" value="/opt/zgyw/logs" />
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
index 1b67217..550bc1a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ImageResourceSecurityMapper.xml
@@ -102,8 +102,9 @@
</foreach>
</delete>
<select id="getLatest" resultType="com.ycl.platform.domain.entity.ImageResourceSecurity">
- select * from t_image_resource_security where dept_id = #{deptId}
- where date_format(create_time,'%Y-%m') = date_format(#{date}, '%Y-%m')
+ select * from t_image_resource_security
+ where dept_id = #{deptId}
+ and date_format(create_time,'%Y-%m') = date_format(#{date}, '%Y-%m')
order by create_time desc
limit 1
</select>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index d522659..37b54c3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -210,7 +210,7 @@
, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format,
camera_dept, hybm, lxbm,d.dept_id, d.dept_name,
CASE
- WHEN p.provnce_tag_video = 1 OR p.provnce_tag_car = 1 OR p.provnce_tag_face = 1 THEN 1
+ WHEN p.province_tag_video = 1 OR p.province_tag_car = 1 OR p.province_tag_face = 1 THEN 1
ELSE 0
END AS province_tag,p.dept_tag
from t_monitor m
--
Gitblit v1.8.0