diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java index a1fcfa80e..d012c12e3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java @@ -180,6 +180,7 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl> environmentList = environmentDevMapper.selectCompanyDevCountStatistics(map); List> videoList = videoItemMapper.selectCompanyVideoCountStatistics(map); List> ufaceDevList = ufaceDevMapper.selectCompanyUfaceDevCountStatistics(map); + List> hatDevList = safetyHatDevMapper.selectCompanyUfaceDevCountStatistics(map); Integer totalEnvironmentNum = 0; Integer totalEnvOnlineNum = 0; if (environmentList != null && environmentList.size() > 0) { @@ -204,8 +205,16 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl 0) { + for (Map dev : hatDevList) { + totalHatDevNum = totalHatDevNum + MapUtils.getInteger(dev, "totalDev"); + totalHatDevOnlineNum = totalHatDevOnlineNum + MapUtils.getInteger(dev, "devOnline"); + } + } + Integer totalDevNum = totalEnvironmentNum + totalVideoNum + totalufaceDevNum + totalHatDevNum; + Integer totalOnlineNum = totalEnvOnlineNum + totalVideoOnlineNum + totalufaceDevOnlineNum + totalHatDevOnlineNum; if (towerAndLifterType == 1) { //判断是否统计塔吊和升降机 List> devList = towerMapper.selectTowerAndLifterStatisticsCount(map); @@ -235,6 +244,7 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl { List selectDevListByIdCard(String idCard); List> selectAllDevCount(); + + + List> selectCompanyUfaceDevCountStatistics(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml index 6a0a4ec43..f9d057382 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml @@ -39,4 +39,58 @@ FROM safety_hat_dev GROUP BY project_sn + + diff --git a/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java b/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java index c68318105..b7180e947 100644 --- a/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java @@ -61,7 +61,7 @@ public class HikVideoUtil { } paramMap.put("streamType", streamType); paramMap.put("protocol", StringUtils.isNotEmpty(type) ? type : "hls"); - paramMap.put("expand", "streamform=rtp"); + paramMap.put("expand", "streamform=rtp&standard=rtsp"); } String body = JSON.toJSON(paramMap).toString(); log.info("callPostApiGetPreviewURL body:{}", body);