From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 14 -
ycl-server/src/main/java/com/ycl/task/ContractTask.java | 4
ycl-server/src/main/java/com/ycl/task/HKTask.java | 3
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 9
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 6
ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java | 1
ycl-server/src/main/resources/application-dev.yml | 10
ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java | 16 +-
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java | 1
ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java | 32 ++--
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 27 ++-
/dev/null | 24 ---
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 1
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 24 ---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 11
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 9 -
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 61 ++++++++
ycl-server/src/main/java/com/ycl/task/UYTask.java | 2
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 26 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 2
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 49 +++---
ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java | 28 +++
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 50 +++---
24 files changed, 231 insertions(+), 184 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
index 90f71f6..982515a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
@@ -65,18 +65,18 @@
private BigDecimal videoAvailable;
/**
- * 鏍囨敞姝ｇ‘鐜�
+ * 閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�
*/
- @Excel(name = "鏍囨敞姝ｇ‘鐜�")
- @TableField("annotation_accuracy")
- private BigDecimal annotationAccuracy;
+ @Excel(name = "閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�")
+ @TableField("ministry_site_online")
+ private BigDecimal ministrySiteOnline;
/**
- * 鏍℃椂鍑嗙‘鐜�
+ * 閮ㄧ骇宸℃褰曞儚鍙敤鐜�
*/
- @Excel(name = "鏍℃椂鍑嗙‘鐜�")
- @TableField("timing_accuracy")
- private BigDecimal timingAccuracy;
+ @Excel(name = "閮ㄧ骇宸℃褰曞儚鍙敤鐜�")
+ @TableField("ministry_video_available")
+ private BigDecimal ministryVideoAvailable;
/**
* 閲嶇偣鐐逛綅鍦ㄧ嚎鐜�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
index 1281e23..99afc2a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
@@ -60,7 +60,6 @@
/**
* 浜鸿劯鍚堟牸鎬х浉鍏虫暟鎹�
*/
- //TODO:鍙傛暟鍚嶄慨鏀圭湅鎺ュ彛鏄惁鏈夊弬鏁�
private FaceEligibility faceEligibility;
// 鍐呭祵瀵硅薄瀹氫箟
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 fac20a8..bd35aec 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -1,19 +1,12 @@
package com.ycl.calculate;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ycl.platform.base.CheckIndex;
import com.ycl.platform.domain.entity.CheckIndexCar;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.result.HK.CrossDetailResult;
import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexCarService;
-import com.ycl.platform.service.ITMonitorService;
-import com.ycl.system.mapper.SysConfigMapper;
import constant.ApiConstants;
-import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -21,7 +14,10 @@
import utils.DateUtils;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -112,7 +108,7 @@
}
/**
- * 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜�
+ * 杞﹁締鏁版嵁瀹屾暣
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index e9e410a..f4b1ed6 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -23,7 +23,7 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻杞﹁締灞炴�ц瘑鍒噯纭巼銆乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 璁＄畻杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
* 杞﹁締鏁版嵁鎶芥鎺ュ彛
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
@@ -131,14 +131,15 @@
}
/**
- * 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜囥�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
if (checkIndexCar == null) {
return null;
}
- //璋冪敤淇℃伅閲囬泦姝ｇ‘鐜囪绠楁柟娉�
+ log.info("key:{},杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬э細totalSites锛歿}锛宨mportantTotalSites:{}锛宎ccuracySites:{}锛宨mportantAccuracySites:{}",key,stats.totalSites,stats.importantTotalSites,stats.accuracySites,stats.importantAccuracySites);
+ //璋冪敤杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬ц绠楁柟娉�
Map<String, Object> accuracyParam = new HashMap<>();
accuracyParam.put("totalSites", stats.totalSites);
accuracyParam.put("importantTotalSites", stats.importantTotalSites);
@@ -146,12 +147,14 @@
accuracyParam.put("importantAccuracySites", stats.importantAccuracySites);
BigDecimal dataAccuracy = dataAccuracy(accuracyParam);
checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy);
+ log.info("url鍙敤鎬�: totalSites:{},urlQualifySites:{}",stats.totalSites,stats.urlUsabilitySites);
//璋冪敤url鍙敤鎬ц绠楁柟娉�
Map<String, Object> urlParam = new HashMap<>();
urlParam.put("totalSites", stats.totalSites);
urlParam.put("urlQualifySites", stats.urlUsabilitySites);
BigDecimal urlUsability = urlUsability(urlParam);
checkIndexCar.setVehicleUrlAvailability(urlUsability);
+ log.info("澶у浘鍙敤鎬�: totalSites:{},picUsabilitySites:{}",stats.totalSites,stats.picUsabilitySites);
//璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
Map<String, Object> usabilityParam = new HashMap<>();
usabilityParam.put("totalSites", stats.totalSites);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index 9ca280e..96de59e 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -36,7 +36,6 @@
*/
@Component
@Slf4j
-//TODD:绯荤粺閰嶇疆閲岀殑鍖哄垎浜鸿劯鍜岃溅杈嗐�佺疮鍔犳鏁扮殑姒傚康銆佸尯鍘夸笉灏戜簬40璺紝涓嶈揪鏍囧競宸炵殑褰撴湀璇ラ」鎴愮哗涓嶈兘寰楀垎銆�
public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index 7655251..5515b18 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -44,7 +44,7 @@
public BigDecimal monitorQualify(Map<String, Object> param) {
BigDecimal totalMonitors = new BigDecimal((Integer) param.get("totalMonitors"));
BigDecimal qualifyMonitor = new BigDecimal((Integer) param.get("qualifyMonitor"));
- return qualifyMonitor.divide(totalMonitors, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalMonitors) == 0 ? BigDecimal.ZERO : qualifyMonitor.divide(totalMonitors, 4, RoundingMode.HALF_UP);
}
//涓�鏈轰竴妗ｆ敞鍐岀巼鐜�
@@ -53,35 +53,35 @@
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
//姝ｅ湪鐢ㄧ殑妗ｆ鏁�
BigDecimal useSites = new BigDecimal((Integer) param.get("totalSites") - (Integer) param.get("newSites"));
- return useSites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : useSites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//妗ｆ鑰冩牳姣�
public BigDecimal archivesRate(Map<String, Object> param) {
BigDecimal allFiles = new BigDecimal((Integer) param.get("allFiles"));
BigDecimal todayFiles = new BigDecimal((Integer) param.get("todayFiles"));
- return todayFiles.divide(allFiles, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(todayFiles) == 0 ? BigDecimal.ZERO : todayFiles.divide(allFiles, 4, RoundingMode.HALF_UP);
}
//鐐逛綅鍦ㄧ嚎鐜�
public BigDecimal siteOnline(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal onlineSites = new BigDecimal((Integer) param.get("onlineSites"));
- return onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//瑙嗛Osd鍑嗙‘鐜�
public BigDecimal osdAccuracy(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal osdAccuracySites = new BigDecimal((Integer) param.get("osdAccuracySites"));
- return osdAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : osdAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//瑙嗛鏃堕棿鍚堟牸鐜�
public BigDecimal osdTimeAccuracy(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal timeAccuracySites = new BigDecimal((Integer) param.get("timeAccuracySites"));
- return timeAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : timeAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//鐩綍涓�鑷寸巼锛屾瘡瓒呰繃鐧惧垎涔�1鎵�10%
@@ -91,6 +91,7 @@
// 璁＄畻newSites鍗爐otalSites鐨勭櫨鍒嗘瘮鍊嶆暟
BigDecimal percentage = newSites.divide(totalSites, 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100));
BigDecimal result = BigDecimal.ONE;
+ //瓒呰繃鐧惧垎涔�1娌★紝瓒呰繃浜嗘墠鎵ｅ垎
if (BigDecimal.ONE.compareTo(percentage) <= 0) {
result = result.subtract(percentage.multiply(new BigDecimal("0.1")));
}
@@ -101,14 +102,14 @@
public BigDecimal viewConnectStability(Map<String, Object> param) {
BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum"));
BigDecimal avgCount = (BigDecimal) param.get("avgCount");
- return avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalDataSum) == 0 ? BigDecimal.ZERO : avgCount.divide(totalDataSum, 4, RoundingMode.HALF_UP);
}
//鏍囨敞姝ｇ‘鐜�
public BigDecimal infoAccuracy(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal qualifySiteCount = new BigDecimal((Integer) param.get("qualifySite"));
- return qualifySiteCount.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : qualifySiteCount.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//鏁版嵁涓婁紶鍙婃椂鎬�
@@ -117,10 +118,9 @@
BigDecimal delayCount1 = new BigDecimal((Integer) param.get("delayCount1"));
BigDecimal delayCount2 = new BigDecimal((Integer) param.get("delayCount2"));
BigDecimal delayCount3 = new BigDecimal((Integer) param.get("delayCount3"));
-
- BigDecimal result = BigDecimal.ONE.subtract(delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
+ BigDecimal result = BigDecimal.ZERO.compareTo(totalCount) == 0 ? BigDecimal.ZERO : delayCount1.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(BigDecimal.ONE)
.add(delayCount2.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.8")))
- .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6"))));
+ .add(delayCount3.divide(totalCount, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
return result.setScale(4, RoundingMode.HALF_UP);
}
@@ -130,9 +130,9 @@
BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites"));
BigDecimal integritySites = new BigDecimal((Integer) param.get("integritySites"));
BigDecimal importantIntegritySites = new BigDecimal((Integer) param.get("importantIntegritySites"));
- BigDecimal result = integritySites.divide(totalSites, 10, RoundingMode.HALF_UP)
- .multiply(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
- return result.setScale(4, RoundingMode.HALF_UP);
+ BigDecimal total = BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : integritySites.divide(totalSites, 10, RoundingMode.HALF_UP);
+ BigDecimal important = BigDecimal.ZERO.compareTo(importantTotalSites) == 0 ? BigDecimal.ZERO : importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP);
+ return total.multiply(important).setScale(4, RoundingMode.HALF_UP);
}
//杞﹁締鏁版嵁瀹屾暣鎬�
@@ -141,44 +141,44 @@
BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites"));
BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites"));
BigDecimal importantAccuracySites = new BigDecimal((Integer) param.get("importantAccuracySites"));
- BigDecimal result = accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP)
- .add(importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP));
- return result.setScale(4, RoundingMode.HALF_UP);
+ BigDecimal total = BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP);
+ BigDecimal important = BigDecimal.ZERO.compareTo(importantTotalSites) == 0 ? BigDecimal.ZERO : importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP);
+ return total.multiply(important).setScale(4, RoundingMode.HALF_UP);
}
//鏃堕挓鍑嗙‘鎬�
public BigDecimal clockAccuracy(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites"));
- return accuracySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : accuracySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//url鍙敤鎬�
public BigDecimal urlUsability(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal urlQualifySites = new BigDecimal((Integer) param.get("urlQualifySites"));
- return urlQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : urlQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//澶у浘鍙敤鎬�
public BigDecimal picUsability(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal picUsabilitySites = new BigDecimal((Integer) param.get("picUsabilitySites"));
- return picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//鍥剧墖鍚堟牸鐜�
public BigDecimal dataQualify(Map<String, Object> param) {
BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal picQualifySites = new BigDecimal((Integer) param.get("picQualifySites"));
- return picQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSitesCount) == 0 ? BigDecimal.ZERO : picQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
//褰曞儚鍙敤鐜�
public BigDecimal videoUsability(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
BigDecimal usabilitySites = new BigDecimal((Integer) param.get("usabilitySites"));
- return usabilitySites.divide(totalSites, 4, RoundingMode.HALF_UP);
+ return BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : usabilitySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
@@ -199,7 +199,7 @@
return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
}
- //杩斿洖閲嶇偣鎸囨尌鍥惧儚闆嗗悎
+ //杩斿洖閮ㄧ骇鐐逛綅闆嗗悎
public List<String> getDeptTag() {
List<YwPoint> commandImages = pointMapper.selectByTag(null, null, null, Boolean.TRUE);
return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
@@ -207,7 +207,8 @@
//杩斿洖monitor
public List<String> getMonitorFromMongo() {
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
return CollectionUtils.isEmpty(oneMachineFileResults) ? new ArrayList<>() : oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
index 5c04496..b192569 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -48,7 +48,7 @@
int newSites = 0;
//鍏ㄥ勾鐣欏瓨鏁�
int allFiles = 0;
- //褰撴棩妗ｆ鏁�
+ //褰撴棩妗ｆ鏁帮紙鍑屾櫒璁＄畻鐨勶紝瀹為檯鍙栧緱鏄槰鏃ョ殑涓�鏈轰竴妗ｆ暟閲忥級
int todayFiles = 0;
}
@@ -110,7 +110,7 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟銆佹寚鎸ュ浘鍍忔暟銆佹寚鎸ュ浘鍍忓湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result, Map<String, TMonitor> newMonitors, List<String> todayMonitor) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result, Map<String, TMonitor> newMonitors, List<String> yesterdayMonitor) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
@@ -118,7 +118,7 @@
if (newMonitors.containsKey(result.getSerialNumber())) {
stats.newSites++;
}
- if (todayMonitor.contains(result.getSerialNumber())) {
+ if (yesterdayMonitor.contains(result.getSerialNumber())) {
stats.todayFiles++;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
index 6f0c037..099bc3b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
@@ -8,6 +8,7 @@
import com.ycl.system.mapper.SysDeptMapper;
import constant.ApiConstants;
import constant.CheckConstants;
+import enumeration.general.AreaDeptEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,24 +38,27 @@
@Override
public void calculate(List<PlatformOnlineVO> list) {
+ Map<String,Double> map = new HashMap<>();
if (!CollectionUtils.isEmpty(list)) {
- //鎬荤绾挎椂闀�
- int time = list.stream().map(PlatformOnlineVO::getTodayOutlineSed).reduce(0, Integer::sum);
- //绂荤嚎鏃堕暱杞崲浣嶅垎閽熺劧鍚庡彇妯�
- int num = (time / 60) % 30;
- double score = Math.max(1 - num * 0.1, 0);
+ for (PlatformOnlineVO platformOnlineVO : list) {
+ String[] areas = platformOnlineVO.getArea().split(",");
+ for (String area : areas) {
+ Integer deptId = AreaDeptEnum.fromCode(area).getDeptId();
+ //绂荤嚎鏃堕暱
+ Integer time = platformOnlineVO.getTodayOutlineSed();
+ //绂荤嚎鏃堕暱杞崲浣嶅垎閽�
+ int num = (time / 60) / 30;
+ double score = Math.max(1 - num * 0.1, 0);
+ map.put(deptId+"",score);
+ map.put(ApiConstants.Province + deptId,score);
+ }
+ }
+
//鏄惁宸茬粡瀛樺湪褰撴棩鏁版嵁
List<CheckIndexVideo> checkIndexVideos = videoMapper.selectToday(DateUtils.getDate());
- //鎵�鏈夊尯鍩熼儴闂�
- List<Long> deptIds = deptMapper.selectByParentId(207L);
- List<String> keys = new ArrayList<>();
- //鍑嗗鍖哄垎鐪佸巺銆佸尯鍩熺殑deptId list
- for (Long deptId : deptIds) {
- keys.add(deptId + "");
- keys.add(ApiConstants.Province + deptId);
- }
+
List<CheckIndexVideo> videos = new ArrayList<>();
- keys.forEach(key -> {
+ map.forEach((key,score) -> {
//濡傛灉涓嶅瓨鍦ㄥ氨鏂板濡傛灉瀛樺湪鍒欏鐢�
CheckIndexVideo checkIndex = getCheckIndex(key, checkIndexVideos, CheckIndexVideo.class);
if (checkIndex != null) {
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
index 1fbc17b..2135fba 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -29,7 +29,7 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻瑙嗛璁惧鐐逛綅鍦ㄧ嚎鐜囥�侀噸鐐圭偣浣嶅湪绾跨巼銆侀噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
+ * 璁＄畻瑙嗛璁惧鐐逛綅鍦ㄧ嚎鐜囥�侀噸鐐圭偣浣嶅湪绾跨巼銆侀噸鐐规寚鎸ュ浘鍍忓湪绾跨巼銆侀儴绾х偣浣嶅湪绾跨巼
* 鍥惧儚鐩戞祴璇婃柇缁撴灉
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鏁版嵁涓婁紶鍙婃椂鎬�
@@ -53,6 +53,8 @@
int importantOnlineSites = 0;
int commandSites = 0;
int commandOnlineSites =0;
+ int deptSites = 0;
+ int deptOnlineSites = 0;
}
@Override
@@ -71,6 +73,8 @@
List<String> important = getImportant();
//閲嶇偣鎸囨尌鍥惧儚闆嗗悎
List<String> commandImage = getCommandImage();
+ //鑾峰彇閮ㄧ骇鐐逛綅闆嗗悎
+ List<String> deptTag = getDeptTag();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (VideoOnlineResult result : list) {
@@ -78,12 +82,12 @@
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, important,commandImage);
+ updateAreaStats(areaStatsMap, deptId, result, important,commandImage,deptTag);
// 澶勭悊鐪佸巺鏁版嵁
if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, important,commandImage);
+ updateAreaStats(areaStatsMap, provinceKey, result, important,commandImage,deptTag);
}
}
@@ -105,7 +109,7 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟銆佹寚鎸ュ浘鍍忔暟銆佹寚鎸ュ浘鍍忓湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VideoOnlineResult result, List<String> important, List<String> commandImage) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VideoOnlineResult result, List<String> important, List<String> commandImage,List<String> deptTag) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
@@ -117,6 +121,9 @@
if(commandImage.contains(result.getDeviceId())){
stats.commandSites++;
}
+ if(deptTag.contains(result.getDeviceId())){
+ stats.deptSites++;
+ }
if (ApiConstants.UY_OnlineSite_Online.equals(result.getStatus())){
stats.onlineSites++;
if(important.contains(result.getDeviceId())){
@@ -124,6 +131,9 @@
}
if(commandImage.contains(result.getDeviceId())){
stats.commandOnlineSites++;
+ }
+ if(deptTag.contains(result.getDeviceId())){
+ stats.deptOnlineSites++;
}
}
}
@@ -172,6 +182,16 @@
}else {
log.info("鎸囨尌鍥惧儚鐐逛綅鏁颁负0");
}
+ //璋冪敤鐐逛綅鍦ㄧ嚎鐜囪绠楁柟娉� 璁＄畻閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�
+ if(stats.deptSites!=0) {
+ Map<String, Object> deptParam = new HashMap<>();
+ deptParam.put("totalSites", stats.deptSites);
+ deptParam.put("onlineSites", stats.deptOnlineSites);
+ BigDecimal deptOnline = siteOnline(deptParam);
+ checkIndexVideo.setMinistrySiteOnline(deptOnline);
+ }else {
+ log.info("閮ㄧ骇鐐逛綅鏁颁负0");
+ }
return checkIndexVideo;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
index b8e8747..62778ca 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
@@ -42,8 +42,6 @@
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
private static class AreaStats {
int totalSites = 0;
- int osdAccuracySites = 0;
- int timeAccuracySites = 0;
int importantTotalSites = 0;
int importantOsdAccuracySites = 0;
@@ -102,14 +100,7 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- //鏍￠獙osd
- if (checkOsd(result)) {
- stats.osdAccuracySites++;
- }
- //鏍￠獙鏃堕棿鍋忓樊
- if (checkTime(result)) {
- stats.timeAccuracySites++;
- }
+
//閲嶇偣鐐逛綅
if (important.contains(result.getDeviceNo())) {
stats.importantTotalSites++;
@@ -142,12 +133,7 @@
if (checkIndexVideo == null) {
return null;
}
- //璋冪敤osd鏍囨敞璁＄畻鏂规硶
- Map<String, Object> param = new HashMap<>();
- param.put("totalSites", stats.totalSites);
- param.put("osdAccuracySites", stats.osdAccuracySites);
- BigDecimal osdAccuracy = osdAccuracy(param);
- checkIndexVideo.setAnnotationAccuracy(osdAccuracy);
+
//璋冪敤osd鏍囨敞璁＄畻鏂规硶 璁＄畻閲嶇偣osd鏍囨敞
Map<String, Object> importantParam = new HashMap<>();
importantParam.put("totalSites", stats.importantTotalSites);
@@ -155,12 +141,6 @@
BigDecimal imOsdAccuracy = osdAccuracy(importantParam);
checkIndexVideo.setKeyAnnotationAccuracy(imOsdAccuracy);
- //璋冪敤osd鏃堕棿鍑嗙‘鐜�
- Map<String, Object> timeParam = new HashMap<>();
- timeParam.put("totalSites", stats.totalSites);
- timeParam.put("timeAccuracySites", stats.timeAccuracySites);
- BigDecimal osdTimeAccuracy = osdTimeAccuracy(timeParam);
- checkIndexVideo.setTimingAccuracy(osdTimeAccuracy);
//璋冪敤osd鏃堕棿鍑嗙‘鐜�,璁＄畻閲嶇偣
Map<String, Object> importantTimeParam = new HashMap<>();
importantTimeParam.put("totalSites", stats.importantTotalSites);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index b169a11..592a0e8 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -49,6 +49,8 @@
int usabilitySites = 0;
int importantSites = 0;
int importantUsabilitySites = 0;
+ int deptSite =0;
+ int depteUsabilitySites = 0;
}
@Override
@@ -65,19 +67,19 @@
List<String> provinceIds = getProvince();
//閲嶇偣鐐逛綅闆嗗悎
List<String> important = getImportant();
-
+ List<String> deptTag = getDeptTag();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (RecordMetaDSumResult result : list) {
TMonitorVO monitor = monitorMap.get(result.getDeviceId());
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, important);
+ updateAreaStats(areaStatsMap, deptId, result, important,deptTag);
// 澶勭悊鐪佸巺鏁版嵁
if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, important);
+ updateAreaStats(areaStatsMap, provinceKey, result, important,deptTag);
}
}
@@ -99,18 +101,23 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important,List<String> deptTag) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- boolean flag = important.contains(result.getDeviceId());
- if(flag){
+ if(important.contains(result.getDeviceId())){
stats.importantSites++;
+ }
+ if(deptTag.contains(result.getDeviceId())){
+ stats.deptSite++;
}
if (ApiConstants.UY_RecordStatus_Integrity.equals(result.getRecordStatus())){
stats.usabilitySites++;
- if(flag){
+ if(important.contains(result.getDeviceId())){
stats.importantUsabilitySites++;
+ }
+ if(deptTag.contains(result.getDeviceId())){
+ stats.depteUsabilitySites++;
}
}
}
@@ -135,6 +142,12 @@
importantParam.put("usabilitySites", stats.importantUsabilitySites);
BigDecimal importantVideoUsability = videoUsability(importantParam);
checkIndexVideo.setKeyVideoAvailable(importantVideoUsability);
+ //璋冪敤褰曞儚鍙敤鐜囪绠楁柟娉� 璁＄畻閮ㄧ骇褰曞儚鍙敤鐜�
+ Map<String, Object> deptParam = new HashMap<>();
+ deptParam.put("totalSites", stats.deptSite);
+ deptParam.put("usabilitySites", stats.depteUsabilitySites);
+ BigDecimal deptUseability = videoUsability(deptParam);
+ checkIndexVideo.setMinistryVideoAvailable(deptUseability);
return checkIndexVideo;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java b/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
index 4c84d34..20beae5 100644
--- a/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
+++ b/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
@@ -56,7 +56,6 @@
// STEP5锛氱粍瑁呰姹傚弬鏁�
String body = JSON.toJSONString(params);
- log.info("璇锋眰鍙傛暟:{}",body);
// STEP6锛氳皟鐢ㄦ帴鍙�
String result = null;// post璇锋眰application/json绫诲瀷鍙傛暟
List<T> dataList = new ArrayList<>();
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index 4758d4d..78a8c6f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -54,17 +54,6 @@
}
/**
- * 瑙嗛锛氱偣浣嶅湪绾跨巼
- *
- * @param query
- * @return
- */
- @GetMapping("/videoPointOnlineRate")
- public Result videoPointOnlineRate(DataCenterQuery query) {
- return dataCenterService.videoPointOnlineRate(query);
- }
-
- /**
* 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
*
* @param query
@@ -98,14 +87,36 @@
}
/**
- * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
+ * 瑙嗛锛氱偣浣嶅湪绾跨巼
*
* @param query
* @return
*/
- @GetMapping("/videoAvailabilityRate")
- public Result videoAvailabilityRate(DataCenterQuery query) {
+ @GetMapping("/videoPointOnlineRate")
+ public Result videoPointOnlineRate(DataCenterQuery query) {
+ return dataCenterService.videoPointOnlineRate(query);
+ }
+
+ /**
+ * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoMinistrySiteOnline")
+ public Result videoMinistrySiteOnline(DataCenterQuery query) {
return dataCenterService.videoAvailabilityRate(query);
+ }
+
+ /**
+ * 瑙嗛锛氶儴绾у贰妫�褰曞儚鍙敤鐜�
+ *
+ * @param query
+ * @return
+ */
+ @GetMapping("/videoMinistryVideoAvailable")
+ public Result videoMinistryVideoAvailable(DataCenterQuery query) {
+ return dataCenterService.videoLabelingAccuracy(query);
}
/**
@@ -117,17 +128,6 @@
@GetMapping("/videoImportantPointAvailabilityRate")
public Result videoImportantPointAvailabilityRate(DataCenterQuery query) {
return dataCenterService.videoImportantPointAvailabilityRate(query);
- }
-
- /**
- * 瑙嗛锛氭爣娉ㄦ纭巼
- *
- * @param query
- * @return
- */
- @GetMapping("/videoLabelingAccuracy")
- public Result videoLabelingAccuracy(DataCenterQuery query) {
- return dataCenterService.videoLabelingAccuracy(query);
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index b236ef2..bc3b335 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -249,7 +249,7 @@
job.setConcurrent("1");
job.setStatus(checkTemplateDTO.getStatus());
job.setJobGroup("CHECK");
- job.setCronExpression("0 0 12 * * ?");
+ job.setCronExpression("0 0 6 * * ?");
job.setJobName(checkTemplateDTO.getTemplateName());
int i = jobService.insertJob(job);
return job;
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 1753fb6..44d37f2 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
@@ -445,8 +445,8 @@
for (CalculateRuleVO calculateRuleVO : ruleList) {
Double max = calculateRuleVO.getMax();
Double min = calculateRuleVO.getMin();
- //鍒ゆ柇鑼冨洿鍦ㄥ摢涓尯闂� //TODO:鍒ゆ柇鍗曚綅
- if (checkRange(min, max, BigDecimal.valueOf(result.getMissDuration()))) {
+ //鍒ゆ柇鑼冨洿鍦ㄥ摢涓尯闂� 鍗曚綅鏄皬鏃惰浆鎹负鍒嗛挓
+ if (checkRange(min, max, BigDecimal.valueOf(result.getMissDuration()*60))) {
if (calculateRuleVO.getNum() == null) {
calculateRuleVO.setNum(1);
} else {
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 34ac13b..d310a07 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -123,13 +123,14 @@
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);
if (!CollectionUtils.isEmpty(faceList)) {
+ log.info("缁撴灉鏁版嵁澶у皬锛歿}",faceList.size());
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
.and("dataType").is(ApiConstants.HK_DataType_FACE));
DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+ faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
mongoTemplate.insertAll(faceList);
}
log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
diff --git a/ycl-server/src/main/java/com/ycl/task/ImageResourceSecurityTask.java b/ycl-server/src/main/java/com/ycl/task/ImageResourceSecurityTask.java
deleted file mode 100644
index 644bf8b..0000000
--- a/ycl-server/src/main/java/com/ycl/task/ImageResourceSecurityTask.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.ycl.task;
-
-import com.ycl.platform.domain.entity.CheckIndexVideo;
-import com.ycl.platform.domain.entity.ImageResourceSecurity;
-import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
-import com.ycl.platform.mapper.CheckIndexVideoMapper;
-import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
-import com.ycl.platform.service.IImageResourceSecurityService;
-import com.ycl.utils.DateUtils;
-import com.ycl.utils.DictUtils;
-import lombok.RequiredArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author gonghl
- * @since 2024/8/26 涓嬪崍 4:43
- */
-@Component("ImageResourceSecurityTask")
-@RequiredArgsConstructor
-public class ImageResourceSecurityTask {
-
- private final IImageResourceSecurityService imageResourceSecurityService;
- private final CheckIndexVideoMapper checkIndexVideoMapper;
- private final ImageResourceSecurityDetailMapper imageResourceSecurityDetailMapper;
-
- private static final BigDecimal NUM = new BigDecimal("0.15");
-
- /**
- * 姣忓ぉ鏅氫笂1鐐规墽琛�
- */
- @Transactional
- @Scheduled(cron = "0 0 1 * * ?")
- public void calc() {
- ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
- List<CheckIndexVideo> list = checkIndexVideoMapper.selectAndDeptName();
- List<ImageResourceSecurityDetail> detail = imageResourceSecurityDetailMapper.getList();
-
- // 姣忎釜閮ㄩ棬寰幆涓�娆¤绠楁暟鎹�
- for (CheckIndexVideo checkIndexVideo : list) {
- ImageResourceSecurity imageResourceSecurity = new ImageResourceSecurity();
- imageResourceSecurity.setDeptId(checkIndexVideo.getDeptId());
- // 鐩存帴鍙栨寚鏍�
- imageResourceSecurity.setPlatformOnline(checkIndexVideo.getPlatformOnline());
- imageResourceSecurity.setPropertyAccuracy(checkIndexVideo.getMonitorQualification());
- // 鑾峰彇褰撳墠閮ㄩ棬鐨刣etail杩涜璁＄畻
- List<ImageResourceSecurityDetail> detailList = detail.stream().filter(imageResourceSecurityDetail -> Objects.equals(imageResourceSecurityDetail.getDeptId(), checkIndexVideo.getDeptId())).toList();
- int score = 100;
- int count = 0;
- // 寰幆detail璁＄畻
- for (ImageResourceSecurityDetail imageResourceSecurityDetail : detailList) {
- // 鎵ｉ櫎鍒嗘暟
- score -= imageResourceSecurityDetail.getAlarmCategory().getScore();
- // 缁熻鏁伴噺
- if (Integer.parseInt(imageResourceSecurityDetail.getAlarmLevel().getValue()) > 1) {
- count++;
- }
- }
- imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score));
- // 鑾峰彇瀛楀吀鍊�-鎬绘暟
- int onlineAssetsTotal = Integer.parseInt(DictUtils.getDictValue("online_assets_total", checkIndexVideo.getDeptName()));
- imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
- imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
- imageResourceSecurities.add(imageResourceSecurity);
- // 鏇存柊鎸囨爣鏁版嵁
- checkIndexVideo.setImageResourceSecurity(imageResourceSecurity.getPlatformOnline().add(imageResourceSecurity.getPropertyAccuracy().add(imageResourceSecurity.getWeakPassword().add(imageResourceSecurity.getRiskProperty()))).multiply(NUM));
- checkIndexVideoMapper.updateById(checkIndexVideo);
- }
- imageResourceSecurityService.saveBatch(imageResourceSecurities);
-
- }
-
-}
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 2da5834..3bde6d8 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -1,14 +1,9 @@
package com.ycl.task;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mongodb.client.result.DeleteResult;
-import com.ycl.api.DH.module.LoginModule;
import com.ycl.api.DH.utils.DHApi;
import com.ycl.api.HK.HKApi;
-import com.ycl.api.YS.YSApi;
-import com.ycl.api.YS.YSInit;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
@@ -70,9 +65,7 @@
*/
public void getOSD() {
log.info("寮�濮嬭幏鍙朞SD");
-// YSApi.getOsd("51.95.66.42",YSUserName,YSPassword);
-
-// DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
+// YSApi.getOsd("51.95.66.42",YSUserName,YSPassword);
//鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎
List<String> hkList = new ArrayList<>();
//鎵归噺淇敼澶у崕鍝佺墝闆嗗悎
diff --git a/ycl-server/src/main/java/com/ycl/task/RyTask.java b/ycl-server/src/main/java/com/ycl/task/RyTask.java
deleted file mode 100644
index 7a4f295..0000000
--- a/ycl-server/src/main/java/com/ycl/task/RyTask.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ycl.task;
-
-import com.ycl.utils.StringUtils;
-import org.springframework.stereotype.Component;
-
-/**
- * 瀹氭椂浠诲姟璋冨害娴嬭瘯
- *
- * @author ruoyi
- */
-@Component("ryTask")
-public class RyTask
-{
- public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
- {
- System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
- }
-
- public void ryParams(String params)
- {
- System.out.println("鎵ц鏈夊弬鏂规硶锛�" + params);
- }
-
- public void ryNoParams()
- {
- System.out.println("鎵ц鏃犲弬鏂规硶");
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/task/TestRequestJob.java b/ycl-server/src/main/java/com/ycl/task/TestRequestJob.java
deleted file mode 100644
index 19ef4c6..0000000
--- a/ycl-server/src/main/java/com/ycl/task/TestRequestJob.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ycl.task;
-
-import com.ycl.platform.domain.entity.WorkOrder;
-import com.ycl.properties.RequestProperties;
-import com.ycl.utils.http.RetryHttpUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-/**
- * @author锛歺p
- * @date锛�2024/4/18 15:26
- */
-@Component("testJob")
-@RequiredArgsConstructor
-public class TestRequestJob {
-
- private final RequestProperties properties;
- private final RetryHttpUtil retryHttpUtil;
-
- public void test() {
- WorkOrder workOrder = retryHttpUtil.get("http://www.baidu.com/aa", "123", WorkOrder.class);
- }
-
-}
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index ab8a75b..0554404 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -222,4 +222,6 @@
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
+
+
}
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index 3aa39a4..b8f8a53 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -3,22 +3,34 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
+import com.ycl.platform.domain.entity.CheckIndexVideo;
+import com.ycl.platform.domain.entity.ImageResourceSecurity;
+import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.domain.vo.PlatformOnlineVO;
import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.mapper.CheckIndexVideoMapper;
+import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
import com.ycl.platform.mapper.PlatformOnlineMapper;
import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.service.IImageResourceSecurityService;
import com.ycl.utils.DateUtils;
+import com.ycl.utils.DictUtils;
import constant.CalculationStrategyConstants;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 瑙嗛璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -26,6 +38,7 @@
*/
@Slf4j
@Component("videoTask")
+@RequiredArgsConstructor
public class VideoTask {
@Autowired
private MongoTemplate mongoTemplate;
@@ -33,6 +46,11 @@
private PlatformOnlineMapper platformOnlineMapper;
@Autowired
private TMonitorMapper monitorMapper;
+
+ private final IImageResourceSecurityService imageResourceSecurityService;
+ private final CheckIndexVideoMapper checkIndexVideoMapper;
+ private final ImageResourceSecurityDetailMapper imageResourceSecurityDetailMapper;
+ private static final BigDecimal NUM = new BigDecimal("0.15");
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -67,7 +85,6 @@
public void oneMonitorQualifyTask(){
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
Date yesterday = DateUtils.addDays(new Date(), -1);
-
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
@@ -92,4 +109,46 @@
calculator.calculate(results);
}
+ /**
+ * 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
+ */
+ @Transactional
+ public void videoSecurity() {
+ ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
+ List<CheckIndexVideo> list = checkIndexVideoMapper.selectAndDeptName();
+ List<ImageResourceSecurityDetail> detail = imageResourceSecurityDetailMapper.getList();
+
+ // 姣忎釜閮ㄩ棬寰幆涓�娆¤绠楁暟鎹�
+ for (CheckIndexVideo checkIndexVideo : list) {
+ ImageResourceSecurity imageResourceSecurity = new ImageResourceSecurity();
+ imageResourceSecurity.setDeptId(checkIndexVideo.getDeptId());
+ // 鐩存帴鍙栨寚鏍�
+ imageResourceSecurity.setPlatformOnline(checkIndexVideo.getPlatformOnline());
+ imageResourceSecurity.setPropertyAccuracy(checkIndexVideo.getMonitorQualification());
+ // 鑾峰彇褰撳墠閮ㄩ棬鐨刣etail杩涜璁＄畻
+ List<ImageResourceSecurityDetail> detailList = detail.stream().filter(imageResourceSecurityDetail -> Objects.equals(imageResourceSecurityDetail.getDeptId(), checkIndexVideo.getDeptId())).toList();
+ int score = 100;
+ int count = 0;
+ // 寰幆detail璁＄畻
+ for (ImageResourceSecurityDetail imageResourceSecurityDetail : detailList) {
+ // 鎵ｉ櫎鍒嗘暟
+ score -= imageResourceSecurityDetail.getAlarmCategory().getScore();
+ // 缁熻鏁伴噺
+ if (Integer.parseInt(imageResourceSecurityDetail.getAlarmLevel().getValue()) > 1) {
+ count++;
+ }
+ }
+ imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score));
+ // 鑾峰彇瀛楀吀鍊�-鎬绘暟
+ int onlineAssetsTotal = Integer.parseInt(DictUtils.getDictValue("online_assets_total", checkIndexVideo.getDeptName()));
+ imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
+ imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
+ imageResourceSecurities.add(imageResourceSecurity);
+ // 鏇存柊鎸囨爣鏁版嵁
+ checkIndexVideo.setImageResourceSecurity(imageResourceSecurity.getPlatformOnline().add(imageResourceSecurity.getPropertyAccuracy().add(imageResourceSecurity.getWeakPassword().add(imageResourceSecurity.getRiskProperty()))).multiply(NUM));
+ checkIndexVideoMapper.updateById(checkIndexVideo);
+ }
+ imageResourceSecurityService.saveBatch(imageResourceSecurities);
+
+ }
}
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 1ca2f17..4bdf70c 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -37,9 +37,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://127.0.0.1/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
username: root
- password: 123456
+ password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -77,11 +77,11 @@
spring.data:
redis:
# 鍦板潃
-# host: 42.193.1.25
- host: 127.0.0.1
+ host: 42.193.1.25
+# host: 127.0.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
-# password: ycl2018
+ password: ycl2018
# password:
# 鏁版嵁搴撶储寮�
database: 0
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 0dbd85f..23921f4 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -15,8 +15,8 @@
<result property="archivesRate" column="archives_rate" />
<result property="siteOnline" column="site_online" />
<result property="videoAvailable" column="video_available" />
- <result property="annotationAccuracy" column="annotation_accuracy" />
- <result property="timingAccuracy" column="timing_accuracy" />
+ <result property="ministrySiteOnline" column="ministry_site_online" />
+ <result property="ministryVideoAvailable" column="ministry_video_available" />
<result property="keySiteOnline" column="key_site_online" />
<result property="keyVideoAvailable" column="key_video_available" />
<result property="keyAnnotationAccuracy" column="key_annotation_accuracy" />
@@ -26,7 +26,7 @@
</resultMap>
<sql id="selectCheckIndexVideoVo">
- select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, annotation_accuracy, timing_accuracy, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_online,image_resource_security from t_check_index_video
+ select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, ministry_site_online, ministry_video_available, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_online,image_resource_security from t_check_index_video
</sql>
<select id="selectCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
@@ -44,8 +44,8 @@
<if test="archivesRate != null "> and archives_rate = #{archivesRate}</if>
<if test="siteOnline != null "> and site_online = #{siteOnline}</if>
<if test="videoAvailable != null "> and video_available = #{videoAvailable}</if>
- <if test="annotationAccuracy != null "> and annotation_accuracy = #{annotationAccuracy}</if>
- <if test="timingAccuracy != null "> and timing_accuracy = #{timingAccuracy}</if>
+ <if test="ministrySiteOnline != null "> and ministry_site_online = #{ministrySiteOnline}</if>
+ <if test="ministryVideoAvailable != null "> and ministry_video_available = #{ministryVideoAvailable}</if>
<if test="keySiteOnline != null "> and key_site_online = #{keySiteOnline}</if>
<if test="keyVideoAvailable != null "> and key_video_available = #{keyVideoAvailable}</if>
<if test="keyAnnotationAccuracy != null "> and key_annotation_accuracy = #{keyAnnotationAccuracy}</if>
@@ -77,8 +77,8 @@
<if test="archivesRate != null">archives_rate,</if>
<if test="siteOnline != null">site_online,</if>
<if test="videoAvailable != null">video_available,</if>
- <if test="annotationAccuracy != null">annotation_accuracy,</if>
- <if test="timingAccuracy != null">timing_accuracy,</if>
+ <if test="ministrySiteOnline != null">ministry_site_online,</if>
+ <if test="ministryVideoAvailable != null">ministry_video_available,</if>
<if test="keySiteOnline != null">key_site_online,</if>
<if test="keyVideoAvailable != null">key_video_available,</if>
<if test="keyAnnotationAccuracy != null">key_annotation_accuracy,</if>
@@ -96,8 +96,8 @@
<if test="archivesRate != null">#{archivesRate},</if>
<if test="siteOnline != null">#{siteOnline},</if>
<if test="videoAvailable != null">#{videoAvailable},</if>
- <if test="annotationAccuracy != null">#{annotationAccuracy},</if>
- <if test="timingAccuracy != null">#{timingAccuracy},</if>
+ <if test="ministrySiteOnline != null">#{ministrySiteOnline},</if>
+ <if test="ministryVideoAvailable != null">#{ministryVideoAvailable},</if>
<if test="keySiteOnline != null">#{keySiteOnline},</if>
<if test="keyVideoAvailable != null">#{keyVideoAvailable},</if>
<if test="keyAnnotationAccuracy != null">#{keyAnnotationAccuracy},</if>
@@ -119,8 +119,8 @@
<if test="archivesRate != null">archives_rate = #{archivesRate},</if>
<if test="siteOnline != null">site_online = #{siteOnline},</if>
<if test="videoAvailable != null">video_available = #{videoAvailable},</if>
- <if test="annotationAccuracy != null">annotation_accuracy = #{annotationAccuracy},</if>
- <if test="timingAccuracy != null">timing_accuracy = #{timingAccuracy},</if>
+ <if test="ministrySiteOnline != null">ministry_site_online = #{ministrySiteOnline},</if>
+ <if test="ministryVideoAvailable != null">ministry_video_available = #{ministryVideoAvailable},</if>
<if test="keySiteOnline != null">key_site_online = #{keySiteOnline},</if>
<if test="keyVideoAvailable != null">key_video_available = #{keyVideoAvailable},</if>
<if test="keyAnnotationAccuracy != null">key_annotation_accuracy = #{keyAnnotationAccuracy},</if>
@@ -154,8 +154,8 @@
IFNULL(ROUND(AVG(archives_rate * 100), 0), 0) AS archives_rate,
IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
IFNULL(ROUND(AVG(video_available * 100), 0), 0) AS video_available,
- IFNULL(ROUND(AVG(annotation_accuracy * 100), 0), 0) AS annotation_accuracy,
- IFNULL(ROUND(AVG(timing_accuracy * 100), 0), 0) AS timing_accuracy,
+ IFNULL(ROUND(AVG(ministry_site_online * 100), 0), 0) AS ministry_site_online,
+ IFNULL(ROUND(AVG(ministry_video_available * 100), 0), 0) AS ministry_video_available,
IFNULL(ROUND(AVG(key_site_online * 100), 0), 0) AS key_site_online,
IFNULL(ROUND(AVG(key_video_available * 100), 0), 0) AS key_video_available,
IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 0), 0) AS key_annotation_accuracy,
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 479d03f..f496d0a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.CheckScoreMapper">
-
+
<resultMap type="com.ycl.platform.domain.entity.CheckScore" id="CheckScoreResult">
<result property="id" column="id" />
<result property="score" column="score" />
@@ -35,13 +35,14 @@
<if test="deptId != null "> and tcs.dept_id = #{deptId}</if>
${params.dataScope}
</where>
+ order by createTime desc;
</select>
-
+
<select id="selectCheckScoreById" parameterType="Long" resultMap="CheckScoreResult">
<include refid="selectCheckScoreVo"/>
where id = #{id}
</select>
-
+
<insert id="insertCheckScore" useGeneratedKeys="true" keyProperty="id">
insert into t_check_score
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,7 +90,7 @@
</delete>
<delete id="deleteCheckScoreByIds" parameterType="String">
- delete from t_check_score where id in
+ delete from t_check_score where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@@ -168,4 +169,4 @@
ORDER BY score DESC, tcs.dept_id
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
index 78a7fab..5b32179 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
@@ -10,6 +10,7 @@
<result column="today_outline_sed" property="todayOutlineSed" />
<result column="update_time" property="updateTime" />
<result column="create_time" property="createTime" />
+ <result column="area" property="area" />
</resultMap>
<select id="getById" resultMap="BaseResultMap">
@@ -52,7 +53,7 @@
<select id="yesterdayData" resultMap="BaseResultMap">
- select * from t_platform_online
- where create_date between #{startDate} and #{endDate}
+ select po.*,p.area from t_platform_online po inner join t_platform p on po.platform_id = p.id
+ where po.create_date between #{startDate} and #{endDate}
</select>
</mapper>
--
Gitblit v1.8.0