From e6322e76da0b229617403b889c41c0e7d46d4d45 Mon Sep 17 00:00:00 2001 From: fengxiaoyu Date: Mon, 20 Feb 2023 18:30:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=20?= =?UTF-8?q?=E4=B8=80=E7=82=B9=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HiddenDangerServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java index 2d8140a..4d67833 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java @@ -1,5 +1,6 @@ package com.hbt.safety.supervision.service.impl; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -8,6 +9,7 @@ import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject; import com.hbt.safety.supervision.mapper.HiddenDangerMapper; import com.hbt.safety.supervision.pojo.HiddenDanger; +import com.hbt.safety.supervision.pojo.vo.StatisticsVo; import com.hbt.safety.supervision.service.IHiddenDangerService; import com.hbt.safety.supervision.util.YearWeeksUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -109,11 +111,14 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService Map> hiddenDangerMap = list.stream() .collect(Collectors.groupingBy(HiddenDanger::getReformStatus)); // 组装隐患状态统计数据 - Map hiddenDangerList = new HashMap<>(); + List hiddenDangerList = new ArrayList<>(); for(Object key : hiddenDangerMap.keySet()) { - hiddenDangerList.put(key, hiddenDangerMap.get(key).size()); + StatisticsVo statisticsVo = new StatisticsVo(); + statisticsVo.setClassify(Integer.parseInt(key.toString())); + statisticsVo.setCount(hiddenDangerMap.get(key).size()); + hiddenDangerList.add(statisticsVo); } - map.put("hiddenDangerList", hiddenDangerList); + map.put("hiddenDangerList", JSONObject.toJSONString(hiddenDangerList)); return JSONObject.toJSONString(map); } From 3202c458f7ea220e77bb421c19ba6553994ebfb7 Mon Sep 17 00:00:00 2001 From: fengxiaoyu Date: Mon, 20 Feb 2023 18:31:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86=20?= =?UTF-8?q?=E4=B8=80=E7=82=B9=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/service/impl/HiddenDangerServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java index 147c9c1..7c05b15 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java @@ -1,9 +1,6 @@ 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.*; import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject;