From 71e6dc7824780c223e594add97c09773335e8af1 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 31 七月 2024 18:20:27 +0800 Subject: [PATCH] 车辆、人脸 点位在线率、视图库对接稳定性 任务 --- ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java | 15 ++- ycl-server/src/main/java/com/ycl/task/FaceTask.java | 42 ++++++++++ ycl-common/src/main/java/constant/CalculationStrategyConstants.java | 16 ++++ ycl-server/src/main/java/com/ycl/task/HKTask.java | 36 ++++---- ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java | 39 +++------ ycl-server/src/main/java/com/ycl/task/CarTask.java | 43 ++++++++++ ycl-server/src/main/java/com/ycl/task/VideoTask.java | 18 ++++ ycl-server/src/main/java/com/ycl/task/UYTask.java | 8 +- 8 files changed, 164 insertions(+), 53 deletions(-) diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java new file mode 100644 index 0000000..c749b7e --- /dev/null +++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java @@ -0,0 +1,16 @@ +package constant; + +/** + * 鑰冩牳璁$畻绛栫暐甯搁噺 + */ +public class CalculationStrategyConstants { + + /** + * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + */ + public static final String CAR_SiteOnline_ViewStability = "carSiteOnlineViewStability"; + /** + * 浜鸿劯鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + */ + public static final String Face_SiteOnline_ViewStability = "faceSiteOnlineViewStability"; +} diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java index 9cf047a..fa6cffc 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java @@ -18,6 +18,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDate; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -77,7 +78,7 @@ BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City); BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County); - // 鏌ヨ浠婃棩鏁版嵁 + // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate()); List<CheckIndexCar> checkIndexCars = new ArrayList<>(); areaStatsMap.forEach((deptId, stats) -> { @@ -90,7 +91,7 @@ checkIndexCarService.saveOrUpdateBatch(checkIndexCars); } - //绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺 + /** 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺 */ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) { //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); @@ -102,14 +103,16 @@ } } - //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� + /** 鑾峰彇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), 0, RoundingMode.HALF_UP); + 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) { CheckIndexCar checkIndexCar; diff --git a/ycl-server/src/main/java/com/ycl/task/CarTask.java b/ycl-server/src/main/java/com/ycl/task/CarTask.java new file mode 100644 index 0000000..0834c2b --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java @@ -0,0 +1,43 @@ +package com.ycl.task; + + +import com.ycl.calculate.CalculationStrategy; +import com.ycl.factory.IndexCalculationFactory; +import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; +import com.ycl.utils.DateUtils; +import constant.ApiConstants; +import constant.CalculationStrategyConstants; +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 java.util.Date; +import java.util.List; + +/** + * 杞﹁締璁$畻鑰冩牳鎸囨爣浠诲姟 + * 鍑屾櫒鎵ц璁$畻鏄ㄥぉ鏁版嵁 + */ +@Slf4j +@Component("carTask") +public class CarTask { + @Autowired + private MongoTemplate mongoTemplate; + + public void siteOnlineTask() { + Date yesterday = DateUtils.addDays(new Date(), -1); + //鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + Query query = new Query(); + query.addCriteria(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)) + .and("dataType").is(ApiConstants.HK_DATATYPE_CAR)); + List<SnapshotDataMonitorResult> snapshotDataMonitorResults = mongoTemplate.find(query, SnapshotDataMonitorResult.class); + CalculationStrategy<SnapshotDataMonitorResult> siteOnlineCalculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.CAR_SiteOnline_ViewStability); + siteOnlineCalculator.calculate(snapshotDataMonitorResults); + } + + +} diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java index 85ab0ec..12f0be7 100644 --- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java +++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java @@ -33,14 +33,13 @@ @Autowired private CheckScoreMapper scoreMapper; @Autowired - private MongoTemplate mongoTemplate; - @Autowired private ICheckIndexVideoService videoService; @Autowired private ICheckIndexFaceService faceService; @Autowired private ICheckIndexCarService carService; + //TODO锛氱粺涓�浠诲姟鏃堕棿 public void executeTemplate(Integer templateId) { CheckTemplate checkTemplate = templateMapper.selectCheckTemplateById(templateId); if (checkTemplate != null) { @@ -66,7 +65,7 @@ //鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�瑙嗛鏁版嵁 List<CheckIndexVideo> checkIndexVideos = videoService.selectCheckIndexVideoList(checkIndexVideo); for (CheckIndexVideo indexVideo : checkIndexVideos) { - addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexVideo,CheckConstants.Rule_Category_Video); + addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexVideo, CheckConstants.Rule_Category_Video); } } else if (CheckConstants.Rule_Category_Car.equals(examineCategory)) { CheckIndexCar checkIndexCar = new CheckIndexCar(); @@ -76,7 +75,7 @@ //鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�杞﹁締鏁版嵁 List<CheckIndexCar> checkIndexCars = carService.selectCheckIndexCarList(checkIndexCar); for (CheckIndexCar indexCar : checkIndexCars) { - addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexCar,CheckConstants.Rule_Category_Car); + addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexCar, CheckConstants.Rule_Category_Car); } } else if (CheckConstants.Rule_Category_Face.equals(examineCategory)) { CheckIndexFace checkIndexFace = new CheckIndexFace(); @@ -86,7 +85,7 @@ //鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�浜鸿劯鏁版嵁 List<CheckIndexFace> checkIndexFaces = faceService.selectCheckIndexFaceList(checkIndexFace); for (CheckIndexFace indexFace : checkIndexFaces) { - addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace,CheckConstants.Rule_Category_Face); + addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace, CheckConstants.Rule_Category_Face); } } @@ -97,7 +96,7 @@ } } - private <T extends CheckIndex>void addToList(Integer templateId, CheckTemplate checkTemplate, Short examineTag, List<CheckTemplateRule> templateRuleList, List<CheckScore> scoreList, T indexObject,Short checkCategory) { + private <T extends CheckIndex> void addToList(Integer templateId, CheckTemplate checkTemplate, Short examineTag, List<CheckTemplateRule> templateRuleList, List<CheckScore> scoreList, T indexObject, Short checkCategory) { CheckScore checkScore = new CheckScore(); BigDecimal scoreFinal = BigDecimal.ZERO; for (CheckTemplateRule templateRule : templateRuleList) { @@ -105,12 +104,12 @@ scoreFinal = getScoreFinal(indexObject, scoreFinal, templateRule); } //琛ュ厖checkScore - fillCheckScore(templateId, checkTemplate, examineTag, indexObject, checkScore, scoreFinal,checkCategory); + fillCheckScore(templateId, checkTemplate, examineTag, indexObject, checkScore, scoreFinal, checkCategory); scoreList.add(checkScore); } //閫氱敤鏂规硶璁$畻鍒嗘暟 - private <T>BigDecimal getScoreFinal(T object, BigDecimal scoreFinal, CheckTemplateRule templateRule) { + private <T> BigDecimal getScoreFinal(T object, BigDecimal scoreFinal, CheckTemplateRule templateRule) { String ruleIndex = templateRule.getRuleIndex(); //灏哸_b_c杞崲涓篴BC String camelRuleIndex = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, ruleIndex); @@ -123,37 +122,27 @@ BigDecimal score = index.multiply(templateRule.getWeight()); scoreFinal = scoreFinal.add(score); } catch (Exception e) { - log.info("鍙嶅皠寮傚父",e); + log.info("鍙嶅皠寮傚父", e); } return scoreFinal; } + //璁剧疆checkScore瀵硅薄 - private void fillCheckScore(Integer templateId, CheckTemplate checkTemplate, Short examineTag, CheckIndex checkIndex, CheckScore checkScore, BigDecimal scoreFinal,Short checkCategory) { + private void fillCheckScore(Integer templateId, CheckTemplate checkTemplate, Short examineTag, CheckIndex checkIndex, CheckScore checkScore, BigDecimal scoreFinal, Short checkCategory) { //鏍规嵁璋冩暣绯绘暟璋冩暣鏈�缁堝垎鏁板ぇ灏� String adjustWay = checkTemplate.getAdjustWay(); BigDecimal adjustCoefficient = checkTemplate.getAdjustCoefficient(); - if(CheckConstants.Multiply.equals(adjustWay)){ + if (CheckConstants.Multiply.equals(adjustWay)) { scoreFinal = adjustCoefficient.multiply(scoreFinal).multiply(new BigDecimal(100)); - }else if(CheckConstants.Divided.equals(adjustWay)){ + } else if (CheckConstants.Divided.equals(adjustWay)) { //鍥涜垗浜斿叆淇濈暀灏忔暟鍚庡洓浣� - scoreFinal = scoreFinal.divide(adjustCoefficient,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + scoreFinal = scoreFinal.divide(adjustCoefficient, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); } checkScore.setCreateTime(new Date()); - checkScore.setExamineTag(Integer.parseInt(examineTag +"")); + checkScore.setExamineTag(Integer.parseInt(examineTag + "")); checkScore.setExamineCategory(checkCategory); checkScore.setDeptId(checkIndex.getDeptId()); checkScore.setTemplateId(templateId); checkScore.setScore(scoreFinal); - } - - //鏌ongo鏁版嵁褰掓。鍒癿ysql - public void dataArchiving() { - //TODO:褰掓。check_index_car,鍖哄垎鐪佸巺甯傚眬锛屾瘡涓尯鍘夸竴鏉℃暟鎹� - CheckIndexCar checkIndexCar = new CheckIndexCar(); - //TODO:褰掓。check_index_face - CheckIndexFace checkIndexFace = new CheckIndexFace(); - //TODO:褰掓。check_index_video - CheckIndexVideo checkIndexVideo = new CheckIndexVideo(); - } } diff --git a/ycl-server/src/main/java/com/ycl/task/FaceTask.java b/ycl-server/src/main/java/com/ycl/task/FaceTask.java new file mode 100644 index 0000000..aa29496 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java @@ -0,0 +1,42 @@ +package com.ycl.task; + + +import com.ycl.calculate.CalculationStrategy; +import com.ycl.factory.IndexCalculationFactory; +import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; +import com.ycl.utils.DateUtils; +import constant.ApiConstants; +import constant.CalculationStrategyConstants; +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 java.util.Date; +import java.util.List; + +/** + * 浜鸿劯璁$畻鑰冩牳鎸囨爣浠诲姟 + * 鍑屾櫒鎵ц璁$畻鏄ㄥぉ鏁版嵁 + * */ +@Slf4j +@Component("faceTask") +public class FaceTask { + @Autowired + private MongoTemplate mongoTemplate; + + public void siteOnlineTask() { + Date yesterday = DateUtils.addDays(new Date(), -1); + //鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + Query query = new Query(); + query.addCriteria(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)) + .and("dataType").is(ApiConstants.HK_DATATYPE_FACE)); + List<SnapshotDataMonitorResult> snapshotDataMonitorResults = mongoTemplate.find(query, SnapshotDataMonitorResult.class); + CalculationStrategy<SnapshotDataMonitorResult> siteOnlineCalculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_SiteOnline_ViewStability); + siteOnlineCalculator.calculate(snapshotDataMonitorResults); + } + +} 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 fccbe9f..dd81b77 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; - +//娴峰悍瀵规帴鏁版嵁浠诲姟 @Slf4j @Component("HKTask") public class HKTask { @@ -50,7 +50,7 @@ List<VehicleDeviceInspectionResult> list = getDataList(jsonObject, VehicleDeviceInspectionResult.class, "杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖"); if (!CollectionUtils.isEmpty(list)) { //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 - Query query = new Query(Criteria.where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(list); @@ -69,7 +69,7 @@ List<FaceDeviceInspectionResult> list = getDataList(jsonObject, FaceDeviceInspectionResult.class, "浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖"); if (!CollectionUtils.isEmpty(list)) { //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 - Query query = new Query(Criteria.where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(list); @@ -92,7 +92,7 @@ if (!CollectionUtils.isEmpty(carList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) .and("dataType").is(ApiConstants.HK_DATATYPE_CAR)); DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class); //瀛樻斁鍦╩ongo涓� @@ -108,7 +108,7 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) + .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涓� @@ -130,7 +130,7 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, MonitoringDetailResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); @@ -150,7 +150,7 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, CrossDetailResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); @@ -170,7 +170,7 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, DataIntegrityMonitoringResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); @@ -190,7 +190,7 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, AttrRecognitionMonitorResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); @@ -212,9 +212,9 @@ if (!CollectionUtils.isEmpty(carList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) .and("dataType").is(ApiConstants.HK_DATATYPE_CAR)); - DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class); + DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class); //瀛樻斁鍦╩ongo涓� carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_CAR)); mongoTemplate.insert(carList); @@ -228,9 +228,9 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) + .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); + DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class); //瀛樻斁鍦╩ongo涓� carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_FACE)); mongoTemplate.insert(faceList); @@ -250,7 +250,7 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); @@ -270,8 +270,8 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); - DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, FaceDeviceSamplingResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); } @@ -290,8 +290,8 @@ if (!CollectionUtils.isEmpty(faceList)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); - DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, FaceDeviceSamplingResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(faceList); } 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 3d2f545..f529f48 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.List; - +//浼樹簯瀵规帴鏁版嵁浠诲姟 @Slf4j @Component("UYTask") public class UYTask { @@ -54,7 +54,7 @@ if (!CollectionUtils.isEmpty(data)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(data); @@ -87,7 +87,7 @@ if (!CollectionUtils.isEmpty(records)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(records); @@ -120,7 +120,7 @@ if (!CollectionUtils.isEmpty(records)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(records); diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java new file mode 100644 index 0000000..0746c25 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java @@ -0,0 +1,18 @@ +package com.ycl.task; + + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.stereotype.Component; + +/** + * 瑙嗛璁$畻鑰冩牳鎸囨爣浠诲姟 + * 鍑屾櫒鎵ц璁$畻鏄ㄥぉ鏁版嵁 + * */ +@Slf4j +@Component("videoTask") +public class VideoTask { + @Autowired + private MongoTemplate mongoTemplate; +} -- Gitblit v1.8.0