From fcb45af0eaa0abbce604bddd39fea04f44b7a09f Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Thu, 5 Sep 2024 10:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectDevStatisticsServiceImpl.java | 27 ++++++++++++++++--- .../safetyhat/mapper/SafetyHatDevMapper.java | 3 +++ .../mapper/xml/SafetyHatDevMapper.xml | 10 +++++++ 3 files changed, 37 insertions(+), 3 deletions(-) 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 13d981670..df1ea66f4 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 @@ -15,6 +15,8 @@ import com.zhgd.xmgl.modules.project.entity.ProjectDevStatistics; import com.zhgd.xmgl.modules.project.mapper.ProjectDevStatisticsMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.project.service.IProjectDevStatisticsService; +import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; +import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper; import com.zhgd.xmgl.modules.video.mapper.VideoItemMapper; import com.zhgd.xmgl.modules.worker.mapper.UfaceDevMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerAttendanceMapper; @@ -58,6 +60,8 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl getProjectDevStatisticsCount(Map param) { @@ -69,10 +73,13 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl> ufaceList = projectDevStatisticsMapper.getProjectDevStatisticsCount(map); map.put("devType", "3"); List> environmentList = projectDevStatisticsMapper.getProjectDevStatisticsCount(map); + map.put("devType", "6"); + List> hatList = projectDevStatisticsMapper.getProjectDevStatisticsCount(map); data.put("videoList", videoList); data.put("ufaceList", ufaceList); data.put("environmentList", environmentList); - completionDate(videoList, ufaceList, environmentList); + data.put("hatList", hatList); + completionDate(videoList, ufaceList, environmentList, hatList); return data; } @@ -83,7 +90,7 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl> videoList, List> ufaceList, List> environmentList) { + private void completionDate(List> videoList, List> ufaceList, List> environmentList, List> hatList) { ArrayList dateList = new ArrayList<>(); Date date = new Date(); int ten = 10; @@ -97,9 +104,11 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl> videoMap = videoList.stream().collect(Collectors.toMap(m -> MapUtils.getString(m, queryTime), m -> m)); Map> ufaceMap = ufaceList.stream().collect(Collectors.toMap(m -> MapUtils.getString(m, queryTime), m -> m)); Map> environmentMap = environmentList.stream().collect(Collectors.toMap(m -> MapUtils.getString(m, queryTime), m -> m)); + Map> hatMap = hatList.stream().collect(Collectors.toMap(m -> MapUtils.getString(m, queryTime), m -> m)); videoList.clear(); ufaceList.clear(); environmentList.clear(); + hatList.clear(); for (String dateStr : dateList) { Map map = videoMap.get(dateStr); if (map == null) { @@ -131,10 +140,21 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl map3 = hatMap.get(dateStr); + if (map == null) { + Map m = new HashMap<>(16); + m.put(queryTime, dateStr); + m.put(devNum, 0); + m.put(devOnlineNum, 0); + hatList.add(m); + } else { + hatList.add(map3); + } } Collections.reverse(videoList); Collections.reverse(ufaceList); Collections.reverse(environmentList); + Collections.reverse(hatList); } @Override @@ -144,12 +164,13 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl> ufaceList = ufaceDevMapper.selectAllDevCount(); List> towerList = towerMapper.selectAllDevCount(); List> lifterList = lifterMapper.selectAllDevCount(); + List> hatList = safetyHatDevMapper.selectAllDevCount(); addSpellData(videoList, queryTime, 1); addSpellData(ufaceList, queryTime, 2); addSpellData(environmentList, queryTime, 3); addSpellData(towerList, queryTime, 4); addSpellData(lifterList, queryTime, 5); - + addSpellData(hatList, queryTime, 6); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java index 65f858ce3..ed886370b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 智能安全帽-设备 @@ -49,4 +50,6 @@ public interface SafetyHatDevMapper extends BaseMapper { * @return */ List selectDevListByIdCard(String idCard); + + List> selectAllDevCount(); } 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 85fd6fb03..6a0a4ec43 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 @@ -29,4 +29,14 @@ join worker_info wi on shd.worker_info_id = wi.id where wi.id_card = #{idCard} + +