ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/task/VideoTask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -9,13 +9,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.*; import java.util.stream.Collectors; /** @@ -127,14 +125,20 @@ //返回省厅国标码集合 public List<String> getProvince() { List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE); return province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE, null); return CollectionUtils.isEmpty(province) ? new ArrayList<>() : province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //返回重点点位集合 public List<String> getImportant() { List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null); return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null, null); return CollectionUtils.isEmpty(important) ? new ArrayList<>() : important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //返回重点指挥图像集合 public List<String> getCommandImage() { List<YwPoint> commandImages = pointMapper.selectByTag(null, null, Boolean.TRUE); return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //检查是否存在当日数据 ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -5,6 +5,7 @@ import com.ycl.platform.domain.entity.TMonitor; import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult; import com.ycl.platform.domain.result.UY.QueryVqdResult; import com.ycl.platform.domain.result.UY.VideoOnlineResult; import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.CheckIndexVideoMapper; import com.ycl.platform.mapper.TMonitorMapper; @@ -26,15 +27,14 @@ import java.util.stream.Collectors; /** * 计算视频设备点位在线率、重点点位在线率 * 计算视频设备点位在线率、重点点位在线率、重点指挥图像在线率 * 图像监测诊断结果 * 获取分省厅、区域的map<k,v> k为deptId或者Province_deptId * 循环map计算数据上传及时性 * 更新或新增 */ @Component //TODO:重点指挥图像在线率 public class VideoOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<QueryVqdResult> { public class VideoOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<VideoOnlineResult> { @Autowired private CheckIndexVideoMapper checkIndexVideoMapper; @Autowired @@ -48,34 +48,38 @@ int onlineSites = 0; int importantSites = 0; int importantOnlineSites = 0; int commandSites = 0; int commandOnlineSites =0; } @Override public void calculate(List<QueryVqdResult> list) { public void calculate(List<VideoOnlineResult> list) { if (CollectionUtils.isEmpty(list)) { return; } //获得国标码为key的设备map Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(QueryVqdResult::getDeviceId).collect(Collectors.toList())) Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(VideoOnlineResult::getDeviceId).collect(Collectors.toList())) .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity())); //获取省厅国标码集合 List<String> provinceIds = getProvince(); //重点点位集合 List<String> important = getImportant(); //重点指挥图像集合 List<String> commandImage = getCommandImage(); Map<String, AreaStats> areaStatsMap = new HashMap<>(); for (QueryVqdResult result : list) { for (VideoOnlineResult 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,commandImage); // 处理省厅数据 if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) { String provinceKey = ApiConstants.Province + deptId; updateAreaStats(areaStatsMap, provinceKey, result, important); updateAreaStats(areaStatsMap, provinceKey, result, important,commandImage); } } @@ -95,19 +99,27 @@ } /** * 累计总点位数、在线点位数、重点点位数、重点点位在线数 * 累计总点位数、在线点位数、重点点位数、重点点位在线数、指挥图像数、指挥图像在线数 */ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, QueryVqdResult result, List<String> important) { private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VideoOnlineResult result, List<String> important, List<String> commandImage) { //返回对象的引用,如果不存在会放入新的key,value AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); stats.totalSites++; //重点点位 if(important.contains(result.getDeviceId())){ stats.importantSites++; } if (ApiConstants.UY_OnlineSite_Online.equals(result.getOnlineStatus())){ //指挥图像点位 if(commandImage.contains(result.getDeviceId())){ stats.commandSites++; } if (ApiConstants.UY_OnlineSite_Online.equals(result.getStatus())){ stats.onlineSites++; if(important.contains(result.getDeviceId())){ stats.importantOnlineSites++; } if(commandImage.contains(result.getDeviceId())){ stats.commandOnlineSites++; } } } @@ -132,6 +144,12 @@ param.put("onlineSites", stats.importantOnlineSites); BigDecimal importantSiteOnline = siteOnline(importantParam); checkIndexVideo.setKeySiteOnline(importantSiteOnline); //调用点位在线率计算方法 计算指挥图像在线率 Map<String, Object> commandParam = new HashMap<>(); param.put("totalSites", stats.commandSites); param.put("onlineSites", stats.commandOnlineSites); BigDecimal commandSiteOnline = siteOnline(importantParam); checkIndexVideo.setKeyCommandImageOnline(commandSiteOnline); return checkIndexVideo; } } ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -38,9 +38,9 @@ List<YwPoint> home(); /** * 通过标签查重点点位或省厅点位 * 通过标签查重点点位或省厅点位或重点指挥图像 */ List<YwPoint> selectByTag(@Param("important")Boolean important, @Param("province")Boolean province); List<YwPoint> selectByTag(@Param("important")Boolean important, @Param("province")Boolean province, @Param("commandImage")Boolean commandImage); /** * 导出数据 ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -8,6 +8,7 @@ import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; import com.ycl.platform.domain.result.UY.MonitorQualifyResult; import com.ycl.platform.domain.result.UY.QueryVqdResult; import com.ycl.platform.domain.result.UY.VideoOnlineResult; import com.ycl.platform.domain.vo.PlatformOnlineVO; import com.ycl.platform.mapper.CheckIndexVideoMapper; import com.ycl.platform.mapper.PlatformOnlineMapper; @@ -46,12 +47,12 @@ public void siteOnlineTask() { Date yesterday = DateUtils.addDays(new Date(), -1); //TODO:计算点位在线率和重点点位在线率 //计算点位在线率和重点点位在线率和指挥图像在线率 Query query = new Query(); query.addCriteria(Criteria .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))); List<QueryVqdResult> results = mongoTemplate.find(query, QueryVqdResult.class); List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class); CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline); calculator.calculate(results); } ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -59,7 +59,9 @@ FROM t_yw_point LEFT JOIN t_yw_unit ON t_yw_unit.id = t_yw_point.unit_id AND t_yw_point.deleted = 0 WHERE t_yw_point.deleted = 0 AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value FROM sys_config WHERE config_key = 'operation.and.maintenance.expiration.warning.time') AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value FROM sys_config WHERE config_key = 'operation.and.maintenance.expiration.warning.time') ORDER BY end_time ]]> </select> @@ -73,6 +75,9 @@ <if test="province!=null and province == true "> and province_tag = #{province} </if> <if test="commandImage!=null and commandImage == true "> and important_command_image_tag = #{commandImage} </if> </where> </select>