From b890afe0d93b9856bcfe6829ec51a69e232ce0d7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 18:01:27 +0800
Subject: [PATCH] 图像安全资源管理整合，车辆抓拍数据完整和准确计算公式修改
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 26 ++---
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 2
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 6
ycl-server/src/main/resources/application-dev.yml | 10 +-
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java | 16 +-
ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java | 1
/dev/null | 24 ----
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 24 ----
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/calculate/IndexCalculationServe.java | 15 +-
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 50 +++++-----
14 files changed, 140 insertions(+), 132 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-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
index fac20a8..5f5eb53 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;
@@ -120,13 +116,13 @@
return null;
}
//璋冪敤璁＄畻鏂规硶
- Map<String, Object> param = new HashMap<>();
- param.put("totalSites", stats.totalSites);
- param.put("importantTotalSites", stats.importantTotalSites);
- param.put("integritySites", stats.integritySites);
- param.put("importantIntegritySites", stats.importantIntegritySites);
- BigDecimal dataIntegrity = dataIntegrity(param);
- checkIndexCar.setVehicleCaptureIntegrity(dataIntegrity);
+ Map<String, Object> param = new HashMap<>();
+ param.put("totalSites", stats.totalSites);
+ param.put("importantTotalSites", stats.importantTotalSites);
+ param.put("integritySites", stats.integritySites);
+ param.put("importantIntegritySites", stats.importantIntegritySites);
+ BigDecimal dataIntegrity = dataIntegrity(param);
+ checkIndexCar.setVehicleCaptureIntegrity(dataIntegrity);
return checkIndexCar;
}
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..7db7ad1 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
* 鏇存柊鎴栨柊澧�
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 80c425b..ccfced7 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -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,9 +141,9 @@
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);
}
//鏃堕挓鍑嗙‘鎬�
@@ -201,7 +201,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..bec968a 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
@@ -36,6 +36,7 @@
private ICheckIndexVideoService checkIndexVideoService;
@Override
+ //TODO:鍒嗗尯鍩�
public void calculate(List<PlatformOnlineVO> list) {
if (!CollectionUtils.isEmpty(list)) {
//鎬荤绾挎椂闀�
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/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/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,
--
Gitblit v1.8.0