From 7f855e50ebe5d98712429641eebc7cfca51cabfd Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 20 Feb 2023 09:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safety/supervision/pojo/vo/StatisticsVo.java | 14 ++++++++++++++ .../service/impl/EscalateRiskServiceImpl.java | 3 +-- .../impl/HazardousOperationServiceImpl.java | 8 ++++++-- .../impl/MajorHazardSourcesServiceImpl.java | 12 ++++++++++-- 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java new file mode 100644 index 0000000..308f0d4 --- /dev/null +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/vo/StatisticsVo.java @@ -0,0 +1,14 @@ +package com.hbt.safety.supervision.pojo.vo; + +import lombok.Data; + +/** + * 统计数据vo + */ +@Data +public class StatisticsVo { + + private int classify; // 分类 + + private int count; // 数量 +} diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateRiskServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateRiskServiceImpl.java index ee168e1..8c96de1 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateRiskServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateRiskServiceImpl.java @@ -34,8 +34,7 @@ public class EscalateRiskServiceImpl implements IEscalateRiskService /** * 查询上报风险列表 - * - * @param escalateRisk 上报风险 + * * @return 上报风险 */ @Override diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java index ad71ae1..5a4237e 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject; import com.hbt.safety.supervision.pojo.HazardousOperation; +import com.hbt.safety.supervision.pojo.vo.StatisticsVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hbt.safety.supervision.mapper.HazardousOperationMapper; @@ -114,9 +115,12 @@ public class HazardousOperationServiceImpl implements IHazardousOperationService Map> typeList = list.stream() .collect(Collectors.groupingBy(HazardousOperation::getOperationType)); // 组装类型统计数据 - Map operationTypeList = new HashMap<>(); + List operationTypeList = new ArrayList<>(); for(Object key : typeList.keySet()) { - operationTypeList.put(key, typeList.get(key).size()); + StatisticsVo statisticsVo = new StatisticsVo(); + statisticsVo.setClassify(Integer.parseInt(key.toString())); + statisticsVo.setCount(typeList.get(key).size()); + operationTypeList.add(statisticsVo); } map.put("operationTypeList", operationTypeList); diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java index dceacd0..3e733b4 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java @@ -1,11 +1,15 @@ package com.hbt.safety.supervision.service.impl; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.hbt.safety.supervision.pojo.vo.StatisticsVo; import com.hbt.safety.supervision.service.IMajorHazardSourcesService; import com.hbt.safety.supervision.pojo.MajorHazardSources; import org.springframework.beans.factory.annotation.Autowired; @@ -108,10 +112,14 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService // 根据风险等级分组 Map> typeList = list.stream() .collect(Collectors.groupingBy(MajorHazardSources::getDangerLevel)); + // 组装风险等级统计数据 - Map dangerLevelList = new HashMap<>(); + List dangerLevelList = new ArrayList<>(); for(Object key : typeList.keySet()) { - dangerLevelList.put(key, typeList.get(key).size()); + StatisticsVo statisticsVo = new StatisticsVo(); + statisticsVo.setClassify(Integer.parseInt(key.toString())); + statisticsVo.setCount(typeList.get(key).size()); + dangerLevelList.add(statisticsVo); } map.put("dangerLevelList", dangerLevelList);