zhangyu
/
wit-park-backend
forked from xxhjsb/wit-park-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

main
zhangyu 2023-02-21 10:06:19 +08:00
parent 067431c254 3202c458f7
commit b397c6f313
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.hbt.safety.supervision.mapper.HiddenDangerMapper; import com.hbt.safety.supervision.mapper.HiddenDangerMapper;
import com.hbt.safety.supervision.pojo.HiddenDanger; 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.service.IHiddenDangerService;
import com.hbt.safety.supervision.util.YearWeeksUtil; import com.hbt.safety.supervision.util.YearWeeksUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -107,11 +108,14 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService
Map<Object, List<HiddenDanger>> hiddenDangerMap = list.stream() Map<Object, List<HiddenDanger>> hiddenDangerMap = list.stream()
.collect(Collectors.groupingBy(HiddenDanger::getReformStatus)); .collect(Collectors.groupingBy(HiddenDanger::getReformStatus));
// 组装隐患状态统计数据 // 组装隐患状态统计数据
Map<Object, Integer> hiddenDangerList = new HashMap<>(); List<StatisticsVo> hiddenDangerList = new ArrayList<>();
for(Object key : hiddenDangerMap.keySet()) { 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); return JSONObject.toJSONString(map);
} }