From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 14 二月 2025 10:03:17 +0800 Subject: [PATCH] Merge branch 'dev' --- ycl-server/src/main/java/com/ycl/task/UYTask.java | 383 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 291 insertions(+), 92 deletions(-) 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 fcae41b..81fc81c 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -3,51 +3,66 @@ import com.alibaba.fastjson2.JSONObject; import com.mongodb.client.result.DeleteResult; import com.ycl.feign.UYClient; -import com.ycl.platform.domain.param.UY.*; -import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult; -import com.ycl.platform.domain.result.UY.OneMachineFileResult; -import com.ycl.platform.domain.result.UY.OsdMonitorResult; +import com.ycl.platform.domain.entity.TMonitor; +import com.ycl.platform.domain.entity.WorkOrder; +import com.ycl.platform.domain.param.UY.ImageDetectionParam; +import com.ycl.platform.domain.param.UY.MonitorQualifyParam; +import com.ycl.platform.domain.param.UY.RecordMetaDSumParam; +import com.ycl.platform.domain.param.UY.VideoOnlineParam; +import com.ycl.platform.domain.result.SYS.TMonitorResult; +import com.ycl.platform.domain.result.UY.ImageDetectionResult; +import com.ycl.platform.domain.result.UY.MonitorQualifyResult; import com.ycl.platform.domain.result.UY.RecordMetaDSumResult; -import com.ycl.platform.domain.result.UY.*; -import com.ycl.platform.service.ITMonitorService; -import com.ycl.platform.service.IYwThresholdService; +import com.ycl.platform.domain.result.UY.VideoOnlineResult; +import com.ycl.platform.domain.vo.UpdateOnlineVO; +import com.ycl.platform.mapper.TMonitorMapper; +import com.ycl.platform.mapper.WorkOrderMapper; import com.ycl.platform.service.UYErrorTypeCheckService; +import com.ycl.platform.service.WorkOrderService; +import com.ycl.platform.service.YwPointService; +import com.ycl.system.domain.SysConfig; +import com.ycl.system.mapper.SysConfigMapper; +import com.ycl.thread.OnlineCheckThread; +import com.ycl.utils.CheckPointUtil; import com.ycl.utils.DateUtils; import constant.ApiConstants; +import constant.CheckConstants; +import constant.RedisConstant; +import enumeration.ErrorType; +import enumeration.general.WorkOrderStatusEnum; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; 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.format.annotation.DateTimeFormat; -import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.concurrent.*; +import java.util.function.Function; +import java.util.stream.Collectors; //浼樹簯瀵规帴鏁版嵁浠诲姟 @Slf4j @Component("UYTask") +@RequiredArgsConstructor public class UYTask { - - @Autowired - private MongoTemplate mongoTemplate; - @Autowired - private UYClient uyClient; - @Autowired - private IYwThresholdService ywThresholdService; - @Autowired - private ITMonitorService monitorService; - @Autowired - private UYErrorTypeCheckService uyErrorTypeCheckService; - + private final RedisTemplate redisTemplate; + private final MongoTemplate mongoTemplate; + private final UYClient uyClient; + private final UYErrorTypeCheckService uyErrorTypeCheckService; + private final YwPointService pointService; + private final TMonitorMapper monitorMapper; + private final WorkOrderService workOrderService; + private final WorkOrderMapper workOrderMapper; + private final SysConfigMapper sysConfigMapper; + private final CheckPointUtil checkPointUtil; @Value("${youYun.tenantId}") private String tenantId; @Value("${youYun.apikey}") @@ -59,45 +74,59 @@ @Value("${youYun.passwd}") private String passwd; + private static final ExecutorService executorService = new ThreadPoolExecutor(16, + 64, + 5000, + TimeUnit.SECONDS, + new ArrayBlockingQueue<>(1000), + new ThreadPoolExecutor.CallerRunsPolicy() + ); + // 鍥惧儚妫�娴� public void imageDetection() { log.info("寮�濮嬫墽琛屽浘鍍忔娴嬫暟鎹悓姝�"); -// ImageDetectionParam param = new ImageDetectionParam(); -// param.setPageNum(ApiConstants.PageNo); -// param.setPageSize(ApiConstants.PageSize); -// param.setArealayerno(ApiConstants.AreaNo); -// JSONObject jsonObject = uyClient.imageDetection(param); -// if (jsonObject != null) { -// log.info("鏁版嵁鏍煎紡" + jsonObject); -// Integer statusCode = jsonObject.getInteger("statusCode"); -// if (ApiConstants.UYSuccessCode.equals(statusCode)) { -// JSONObject data = jsonObject.getJSONObject("data"); -// if (data != null) { -// List<ImageDetectionResult> records = data.getList("records", ImageDetectionResult.class); -// if (!CollectionUtils.isEmpty(records)) { -// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 -// Query query = new Query(Criteria -// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); -// DeleteResult result = mongoTemplate.remove(query, ImageDetectionResult.class); -// //瀛樻斁鍦╩ongo涓� -// mongoTemplate.insertAll(records); -// // 宸ュ崟鐢熸垚 -// uyErrorTypeCheckService.imageDetectionCheck(records); -// } else { -// log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", data); -// } -// } else { -// log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", jsonObject); -// } -// } else { -// log.error("鍥惧儚鐩戞祴璇锋眰澶辫触{}", jsonObject); -// } -// } else { -// log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖"); -// } + ImageDetectionParam param = new ImageDetectionParam(); + param.setPageNum(ApiConstants.PageNo); + param.setPageSize(ApiConstants.PageSize); + param.setArealayerno(ApiConstants.AreaNo); + JSONObject jsonObject = uyClient.imageDetection(param); + if (jsonObject != null) { + log.info("鏁版嵁鏍煎紡" + jsonObject); + Integer statusCode = jsonObject.getInteger("statusCode"); + if (ApiConstants.UYSuccessCode.equals(statusCode)) { + JSONObject data = jsonObject.getJSONObject("data"); + if (data != null) { + List<ImageDetectionResult> records = data.getList("records", ImageDetectionResult.class); + if (!CollectionUtils.isEmpty(records)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, ImageDetectionResult.class); + records.stream().forEach(item -> { + if (Objects.nonNull(item.getDeviceId())) { + item.setNo(item.getDeviceId()); + } + }); + pointService.setDeviceTagByGB(records, CheckConstants.Rule_Category_Video); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insertAll(records); + // 宸ュ崟鐢熸垚 + uyErrorTypeCheckService.imageDetectionCheck(records); + } else { + log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", data); + } + } else { + log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", jsonObject); + } + } else { + log.error("鍥惧儚鐩戞祴璇锋眰澶辫触{}", jsonObject); + } + } else { + log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖"); + } // 鏈湴娴嬭瘯 - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class)); +// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); +// uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class)); log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾"); } @@ -122,6 +151,13 @@ Query query = new Query(Criteria .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class); + records.stream().forEach(item -> { + if (Objects.nonNull(item.getSerialNumber())) { + item.setNo(item.getSerialNumber().getShowValue()); + } + }); + pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Or); + pointService.setNew(records); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); // 宸ュ崟鐢熸垚 @@ -142,7 +178,140 @@ log.info("缁撴潫涓�鏈轰竴妗e悎鏍肩巼鏁版嵁鍚屾"); } - //鐐逛綅鍦ㄧ嚎鐜� + /** + * 鐐逛綅鍦ㄧ嚎PING妫�娴� + * 浠诲姟浼氬厛鎵ц涓�娆′紭浜戝悓姝ワ紝鐒跺悗鎵цping妫�娴� + * online瀛楁鏉ヨ嚜浜庝紭浜戯紝pingOnline涓轰富鍔╬ing妫�娴嬬殑銆傚瓨鍏ongo缁欐暟鎹腑蹇冩煡闃� + */ + public void pointOnline() throws ExecutionException, InterruptedException { + log.info("寮�濮嬫娴嬬偣浣嶅湪绾�"); + Integer times = 2; + SysConfig config = new SysConfig(); + config.setConfigKey("DAY_OF_POINT_OUTLINE_TIMES"); + SysConfig sysConfig = sysConfigMapper.selectConfig(config); + if (Objects.nonNull(sysConfig)) { + times = Integer.valueOf(sysConfig.getConfigValue()); + } else { + log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2"); + } + // 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗� + List<TMonitorResult> monitorList = monitorMapper.getDistinctIP(); + //琛ュ厖閿欒鏃堕棿鐐� + Query onlineQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + Map<String, TMonitorResult> mongoMap = mongoTemplate.find(onlineQuery, TMonitorResult.class) + .stream() + .collect(Collectors.toMap(TMonitorResult::getNo, Function.identity(), (existing, replacement) -> replacement)); + for (TMonitorResult result : monitorList) { + TMonitorResult mongoData = mongoMap.get(result.getNo()); + if(mongoData!=null){ + result.setOffLineTimeStr(mongoData.getOffLineTimeStr()); + } + } + List<TMonitorResult> dataList = new ArrayList<>(48); + Integer time = times; + List<CompletableFuture<TMonitorResult>> futureList = monitorList.stream() + .map(monitor -> CompletableFuture.supplyAsync(() -> { + OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time); + return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛 + }, executorService) + .orTimeout(180, TimeUnit.SECONDS) + .exceptionally(ex -> { + if (ex instanceof TimeoutException) { + log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp()); + } else { + log.error("浠诲姟鎵ц寮傚父:"+monitor.getIp() +ex); + ex.printStackTrace(); + } + return null; + })) + .collect(Collectors.toList()); + + // 绛夊緟鎵�鏈変换鍔″畬鎴愶紝浣嗕笉浼氭棤闄愭湡绛夊緟 + CompletableFuture<Void> allOf = CompletableFuture.allOf( + futureList.toArray(new CompletableFuture[0]) + ); + try { + allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉 + } catch (TimeoutException e) { + log.error("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�"); + } catch (Exception e2){ + log.error("鏁版嵁鏀堕泦寮傚父"+e2); + } + + dataList = futureList.stream() + .map(CompletableFuture::join) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + Date now = new Date(); + List<String> offLineList = new ArrayList<>(); + List<String> onLineList = new ArrayList<>(); + //鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧 +// List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList()); + dataList.forEach(item->{ + if(item.getPingOnline()) { + onLineList.add(item.getIp()); + } else if(!item.getPingOnline()) { + //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎 + offLineList.add(item.getIp()); + } + }); + if(!CollectionUtils.isEmpty(offLineList)) { + monitorMapper.batchUpdateOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline); + } + if(!CollectionUtils.isEmpty(onLineList)) { + monitorMapper.batchUpdateOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online); + } + //瀛樻斁鍒癿ongo + if (!CollectionUtils.isEmpty(dataList)) { + List<TMonitorResult> mongoList = new ArrayList<>(); + dataList.forEach(item->{ + String monitorType = item.getMonitorType(); + //鍚屼竴涓澶囧涓被鍨嬫瘡涓被鍨嬪瓨涓�鏉℃暟鎹紝浠ユ鍦ㄤ繚鐣欐暟鎹殑鎯呭喌涓嬪尯鍒嗙渷鍘呮爣绛� + if(StringUtils.isNotEmpty(monitorType)){ + String[] monitors = monitorType.split("/"); + for (String type : monitors) { + TMonitorResult mongoData = new TMonitorResult(); + BeanUtils.copyProperties(item,mongoData); + mongoData.setMonitorType(type); + if("1".equals(type)){ + mongoData.setProvinceTag(mongoData.getProvinceTagVideo()); + }else if("2".equals(type)){ + mongoData.setProvinceTag(mongoData.getProvinceTagCar()); + }else if("3".equals(type)){ + mongoData.setProvinceTag(mongoData.getProvinceTagFace()); + } + mongoList.add(mongoData); + } + } + }); + //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insertAll(mongoList); + } + //宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級 + //鏌ヨ鏁版嵁搴撳凡瀛樺湪鐨勭绾垮伐鍗曡幏鍙杋p闆嗗悎锛屽墧闄� + List<String> ips = workOrderMapper.getOfflineWorkOrder(); + List<WorkOrder> workOrderList = dataList.stream() + .filter(item -> Objects.nonNull(item.getWorkOrder()) && (CollectionUtils.isEmpty(ips) || !ips.contains(item.getIp()))) + .collect(Collectors.toMap( + TMonitorResult::getIp, + Function.identity(), + (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓� TMonitorResult 瀵硅薄 + )) + .values() + .stream() + .map(TMonitorResult::getWorkOrder) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(workOrderList)) { + workOrderService.innerAddWorkOrder(workOrderList); + } + log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚"); + } + + //鐐逛綅鍦ㄧ嚎鐜囷紙浼樹簯锛� public void videoOnlineTask() { //瑙嗛鍥惧儚璐ㄩ噺 log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�"); @@ -164,10 +333,34 @@ Query query = new Query(Criteria .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class); + //鎵撴爣绛� + records.forEach(item -> { + if (Objects.nonNull(item.getDeviceId())) { + item.setNo(item.getDeviceId()); + } + }); + pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); - // 宸ュ崟鐢熸垚 - uyErrorTypeCheckService.videoOnlineCheck(records); + //鏇存柊point琛ㄥ湪绾跨姸鎬� + Date now = new Date(); + List<UpdateOnlineVO> willUpdateList = records.stream().map(item -> { + UpdateOnlineVO vo = new UpdateOnlineVO(); + vo.setOnline(item.getStatus()); + vo.setIp(item.getIpAddr()); + vo.setUpdateTime(now); + return vo; + }).collect(Collectors.toList()); + monitorMapper.updateOnlineFromUyOrHk(willUpdateList); + //绂荤嚎鐢熸垚宸ュ崟,涓�涓猧p鍙敓鎴愪竴涓伐鍗� + List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream() + .filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus())) + .collect(Collectors.toMap( + VideoOnlineResult::getIpAddr, + Function.identity(), + (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓紙existing锛� + )).values()); + uyErrorTypeCheckService.videoOnlineCheck(workOrders); } else { log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data); } @@ -190,38 +383,44 @@ public void recordMetaDSumTask() { //褰曞儚鍙敤鐜� log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�"); -// RecordMetaDSumParam param = new RecordMetaDSumParam(); -// param.setTenantId(tenantId); -// Calendar instance = Calendar.getInstance(); -// instance.setTime(new Date()); -// instance.add(Calendar.DAY_OF_MONTH, -1); -// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); -// String yesterday = format.format(instance.getTime()); -// param.setStatTime(yesterday); -// JSONObject jsonObject = uyClient.recordMetaDSumList(param); -// if (jsonObject != null) { -// if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) { -// List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class); -// if (!CollectionUtils.isEmpty(records)) { -// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 -// Query query = new Query(Criteria -// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); -// DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class); -// //瀛樻斁鍦╩ongo涓� -// mongoTemplate.insertAll(records); + RecordMetaDSumParam param = new RecordMetaDSumParam(); + param.setTenantId(tenantId); + Calendar instance = Calendar.getInstance(); + instance.setTime(new Date()); + instance.add(Calendar.DAY_OF_MONTH, -1); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String yesterday = format.format(instance.getTime()); + param.setStatTime(yesterday); + JSONObject jsonObject = uyClient.recordMetaDSumList(param); + if (jsonObject != null) { + if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) { + List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class); + if (!CollectionUtils.isEmpty(records)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class); + records.stream().forEach(item -> { + if (Objects.nonNull(item.getDeviceId())) { + item.setNo(item.getDeviceId()); + } + }); + //鎵撴爣绛� + pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insertAll(records); // // 宸ュ崟鐢熸垚 // uyErrorTypeCheckService.recordMetaDSumCheck(records); -// } -// } else { -// log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject); -// } -// } + } + } else { + log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject); + } + } // 鏈湴娴嬭瘯 - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class)); +// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); +// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class)); log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾"); } - } -- Gitblit v1.8.0