From 461ec2d155d8dd35d8f73c35e7c2a33e040bf862 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 03 九月 2024 21:09:56 +0800 Subject: [PATCH] 同期抓拍量从字典获取 --- ycl-common/src/main/java/constant/ApiConstants.java | 2 ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 44 ++++++-------- ycl-common/src/main/java/constant/CheckConstants.java | 12 ++++ ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java | 9 ++ ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 43 ++++++++----- ycl-server/src/main/java/com/ycl/task/VideoTask.java | 3 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 1 ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 3 ycl-common/src/main/java/constant/CheckSnapCountConstants.java | 25 -------- 9 files changed, 69 insertions(+), 73 deletions(-) diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java index ea06696..7ecdf3f 100644 --- a/ycl-common/src/main/java/constant/ApiConstants.java +++ b/ycl-common/src/main/java/constant/ApiConstants.java @@ -69,7 +69,7 @@ //鐪佸巺鍓嶇紑 public final static String Province = "Province_"; - + public final static String County = "County_"; //娴峰悍璁块棶OSD璺緞 public final static String HK_OSD_PATH = "/ISAPI/System/Video/inputs/channels/1/overlays"; //娴峰悍璁块棶鏃堕棿璺緞 diff --git a/ycl-common/src/main/java/constant/CheckConstants.java b/ycl-common/src/main/java/constant/CheckConstants.java index dc6ddd3..3b4ab05 100644 --- a/ycl-common/src/main/java/constant/CheckConstants.java +++ b/ycl-common/src/main/java/constant/CheckConstants.java @@ -25,4 +25,16 @@ public static final String Status_Use = "0"; public static final String Status_Stop = "1"; + /** + * 杞﹁締鍚屾湡鎶撴媿閲忓瓧鍏歌〃 + */ + public final static String DICT_CAR_SNAP = "check_car_snap"; + /** + * 浜鸿劯鍚屾湡鎶撴媿閲忓瓧鍏歌〃 + */ + public final static String DICT_FACE_SNAP = "check_face_snap"; + /** + * 2022鎶撴媿鏁拌绠楀�嶇巼 + */ + public final static String MultiplyNum = "1.2"; } diff --git a/ycl-common/src/main/java/constant/CheckSnapCountConstants.java b/ycl-common/src/main/java/constant/CheckSnapCountConstants.java index dee9d2c..b5bb828 100644 --- a/ycl-common/src/main/java/constant/CheckSnapCountConstants.java +++ b/ycl-common/src/main/java/constant/CheckSnapCountConstants.java @@ -2,32 +2,7 @@ public class CheckSnapCountConstants { - /** - * 2022骞村悓鏈熻溅杈嗘姄鎷嶉噺(鐪佸巺) - */ - public final static String Car_City = "check.snapCount.car.city"; - /** - * 2022骞村悓鏈熻溅杈嗘姄鎷嶉噺(鍖哄幙) - */ - public final static String Car_County = "check.snapCount.car.county"; - - /** - * 2022骞村悓鏈熶汉鑴告姄鎷嶉噺(鐪佸巺) - */ - public final static String Face_City = "check.snapCount.face.city"; - /** - * 2022骞村悓鏈熶汉鑴告姄鎷嶉噺(鍖哄幙) - */ - public final static String Face_County = "check.snapCount.face.city"; - /** - * 2022鎶撴媿鏁拌绠楀�嶇巼 - */ - public final static String Multiply = "1.2"; - /** - * 鍖哄煙涓暟 - */ - public final static Integer CountyNum = 7; } diff --git a/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java b/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java index 4e8d169..d507114 100644 --- a/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java +++ b/ycl-common/src/main/java/enumeration/general/AreaDeptEnum.java @@ -36,5 +36,12 @@ } return null; } - + public static AreaDeptEnum fromDept(Integer deptId) { + for (AreaDeptEnum type : AreaDeptEnum.values()) { + if (type.getDeptId().equals(deptId) ) { + return type; + } + } + return null; + } } diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java index 3da6fba..d455e9e 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java @@ -6,12 +6,14 @@ import com.ycl.platform.mapper.CheckIndexCarMapper; import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.service.ICheckIndexCarService; +import com.ycl.system.entity.SysDictData; import com.ycl.system.mapper.SysConfigMapper; +import com.ycl.system.mapper.SysDeptMapper; +import com.ycl.system.mapper.SysDictDataMapper; +import com.ycl.system.mapper.SysDictTypeMapper; import com.ycl.utils.DateUtils; -import constant.ApiConstants; -import constant.CheckSnapCountConstants; -import constant.CheckThreadConstants; -import constant.RedisConstant; +import constant.*; +import enumeration.general.AreaDeptEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -49,7 +51,8 @@ private ICheckIndexCarService checkIndexCarService; @Autowired private RedisTemplate redisTemplate; - + @Autowired + private SysDictDataMapper dictDataMapper; //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被 private static class AreaStats { int totalSites = 0; @@ -94,16 +97,17 @@ } } - //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞� - BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City); - BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County); - +// //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞� +// BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City); +// BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County); + //浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺 + List<SysDictData> carSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_CAR_SNAP); // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate()); List<CheckIndexCar> checkIndexCars = new ArrayList<>(); areaStatsMap.forEach((key, stats) -> { if (stats.totalSites > 0) { - CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, cityCountAvg, countyCountAvg, checkIndexCarList); + CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, checkIndexCarList,carSnap); if (checkIndexCar != null) { checkIndexCars.add(checkIndexCar); } @@ -129,20 +133,9 @@ } /** - * 鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� - */ - private BigDecimal getAverageCount(String configKey) { - String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue(); - return new BigDecimal(count) - .multiply(new BigDecimal(CheckSnapCountConstants.Multiply)) - .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 10, RoundingMode.HALF_UP) - .divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP); - } - - /** * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� */ - private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexCar> checkIndexCarList) { + private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList,List<SysDictData> carSnap) { CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class); if (checkIndexCar == null) { return null; @@ -168,10 +161,13 @@ Double deductScore = 0.1 * noDateCount; if (stats.totalDataSum != 0) { - BigDecimal avgCount = key.startsWith(ApiConstants.Province) ? cityCountAvg : countyCountAvg; + Integer deptId = key.startsWith(ApiConstants.Province) ? Integer.parseInt(key.split("_")[1]) : Integer.parseInt(key); + String dictKey = key.startsWith(ApiConstants.Province) ? ApiConstants.Province+AreaDeptEnum.fromDept(deptId).getCode() : ApiConstants.County+AreaDeptEnum.fromDept(deptId).getCode(); + String value = carSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst().get().getDictValue(); + Map<String, Object> viewConnectParam = new HashMap<>(); viewConnectParam.put("totalDataSum", stats.totalDataSum); - viewConnectParam.put("avgCount", avgCount); + viewConnectParam.put("avgCount", new BigDecimal(value).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP)); BigDecimal viewConnectStability = viewConnectStability(viewConnectParam); viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE); checkIndexCar.setViewConnectStability(viewConnectStability); 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 d1685a6..743c65a 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java @@ -10,8 +10,11 @@ import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.service.ICheckIndexFaceService; import com.ycl.platform.service.ITMonitorService; +import com.ycl.system.entity.SysDictData; import com.ycl.system.mapper.SysConfigMapper; +import com.ycl.system.mapper.SysDictDataMapper; import constant.*; +import enumeration.general.AreaDeptEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -47,7 +50,8 @@ private TMonitorMapper monitorMapper; @Autowired private RedisTemplate redisTemplate; - + @Autowired + private SysDictDataMapper dictDataMapper; //鍖哄煙浜鸿劯鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被 private static class AreaStats { int totalSites = 0; @@ -91,16 +95,17 @@ } } - //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞� - BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City); - BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County); - +// //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞� +// BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City); +// BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County); + //浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺 + List<SysDictData> faceSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_FACE_SNAP); // 鏌ヨ浠婃棩鏁版嵁 List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate()); List<CheckIndexFace> checkIndexFaces = new ArrayList<>(); areaStatsMap.forEach((deptId, stats) -> { if (stats.totalSites > 0) { - CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, cityCountAvg, countyCountAvg, checkIndexFaceList); + CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList,faceSnap); if (checkIndexFace != null) { checkIndexFaces.add(checkIndexFace); } @@ -121,17 +126,17 @@ } } - //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� - private BigDecimal getAverageCount(String configKey) { - String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue(); - return new BigDecimal(count) - .multiply(new BigDecimal(CheckSnapCountConstants.Multiply)) - .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 10, RoundingMode.HALF_UP) - .divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP); - } +// //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� +// private BigDecimal getAverageCount(String configKey) { +// String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue(); +// return new BigDecimal(count) +// .multiply(new BigDecimal(CheckSnapCountConstants.Multiply)) +// .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 10, RoundingMode.HALF_UP) +// .divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP); +// } //杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� - private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexFace> checkIndexFaceList) { + private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList,List<SysDictData> faceSnap) { CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class); if (checkIndexFace == null) { return null; @@ -156,10 +161,14 @@ Double deductScore = 0.1 * noDateCount; log.info("鎬婚噺锛歿}",stats.totalDataSum); if (stats.totalDataSum != 0) { - BigDecimal avgCount = key.startsWith(ApiConstants.Province) ? cityCountAvg : countyCountAvg; + Integer deptId = key.startsWith(ApiConstants.Province) ? Integer.parseInt(key.split("_")[1]) : Integer.parseInt(key); + String dictKey = key.startsWith(ApiConstants.Province) ? ApiConstants.Province+ AreaDeptEnum.fromDept(deptId).getCode() : ApiConstants.County+AreaDeptEnum.fromDept(deptId).getCode(); + String value = faceSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst().get().getDictValue(); + + Map<String, Object> viewConnectParam = new HashMap<>(); viewConnectParam.put("totalDataSum", stats.totalDataSum); - viewConnectParam.put("avgCount", avgCount); + viewConnectParam.put("avgCount", new BigDecimal(value).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP)); BigDecimal viewConnectStability = viewConnectStability(viewConnectParam); viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE); checkIndexFace.setViewConnectStability(viewConnectStability); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java index 1c70ede..0137fda 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java @@ -307,7 +307,6 @@ SysUser user = SecurityUtils.getLoginUser().getUser(); if (!user.isAdmin()) { for (SysRole role : roles) { - //TODO锛氭湰鍦板簱淇敼 if (role.getPermissions().contains("check:score:role:publish")) { Map<String, Object> params = checkScore.getParams(); params.put("publish", PublishType.PUBLISHED.getCode()); diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java index f7a9515..51ea36f 100644 --- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java +++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java @@ -64,8 +64,7 @@ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))); List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class); //mongo鍝佺墝鏁版嵁 - //TODO:娴嬭瘯鏀逛负浠婂ぉ - Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)))); Map<String, OsdCheckResult> osdMap = mongoTemplate.find(query, OsdCheckResult.class).stream().collect(Collectors.toMap(OsdCheckResult::getDeviceNo, Function.identity())); //鏁版嵁搴搈onitor琛ㄦ暟鎹� Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity())); 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 6443d2f..3a277bd 100644 --- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java +++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java @@ -114,11 +114,10 @@ public void osdTask() { log.info("寮�濮嬭绠桹sd鏍囨敞銆佹椂闂村噯纭巼"); //璁$畻Osd鏍囨敞銆佹椂闂村噯纭巼 - //TODO娴嬭瘯鏀逛负浠婂ぉ Date yesterday = DateUtils.addDays(new Date(), -1); Query query = new Query(); query.addCriteria(Criteria - .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))); List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class); CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime); calculator.calculate(results); -- Gitblit v1.8.0