bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ah-simple' into ah-simple

This commit is contained in:
jiang 2025-09-22 18:53:35 +08:00
parent 742a8b31c4 27cc4272ea
commit 04d000d0e2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/cityScreen/service/CityScreenServiceImpl.java
View File

@ -255,9 +255,10 @@ public class CityScreenServiceImpl implements CityScreenService {
@Override @Override
public List<ProVO> proList(CityScreenDTO dto) { public List<ProVO> proList(CityScreenDTO dto) {
List<ProVO> list = cityScreenMapper.proList(dto); List<ProVO> list = cityScreenMapper.proList(dto);
return list;
//根据county进行分组 取每组下面useNum最大的那组数据 组成新的集合 //根据county进行分组 取每组下面useNum最大的那组数据 组成新的集合
return list.stream().collect(Collectors.groupingBy(ProVO::getCounty)).values().stream() // return list.stream().collect(Collectors.groupingBy(ProVO::getCounty)).values().stream()
.map(list1 -> list1.stream().max(Comparator.comparing(ProVO::getUseNum)) // .map(list1 -> list1.stream().max(Comparator.comparing(ProVO::getUseNum))
.orElse(null)).collect(Collectors.toList()); // .orElse(null)).collect(Collectors.toList());
} }
} }

13
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/cityScreen/CityScreenMapper.xml
View File

@ -201,14 +201,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
jsp.pro_name as projectName, jsp.pro_name as projectName,
jsp.city as city, jsp.city as city,
jsp.county as county, jsp.county as county,
jsp.lon as lon,
jsp.lat as lat,
sum(mdi.device_count) as useNum sum(mdi.device_count) as useNum
<!-- cp.lon as lon,-->
<!-- cp.lat as lat-->
from jj_sing_project jsp from jj_sing_project jsp
left join ma_dev_info mdi on mdi.on_project = jsp.id left join ma_dev_info mdi on mdi.on_project = jsp.id
left join ma_type_view mtv on mtv.typeId = mdi.type_id left join ma_type_view mtv on mtv.typeId = mdi.type_id
<!-- left join coordinate_point cp on cp.name = jsp.county--> <!-- left join coordinate_point cp on cp.name = jsp.county-->
where mdi.is_active = 1 and mdi.own_co = #{companyId} and mdi.change_status in (2,3) where mdi.is_active = 1
<!-- and mdi.change_status in (2,3)-->
and jsp.city = #{city} and jsp.city = #{city}
group by jsp.id group by jsp.id
</select> </select>
@ -221,7 +222,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from jj_sing_project jsp from jj_sing_project jsp
left join ma_dev_info mdi on mdi.on_project = jsp.id left join ma_dev_info mdi on mdi.on_project = jsp.id
left join ma_type_view mtv on mtv.typeId = mdi.type_id left join ma_type_view mtv on mtv.typeId = mdi.type_id
where mdi.is_active = 1 and mdi.own_co = #{companyId} and mdi.change_status in (1,5) where mdi.is_active = 1
and mdi.change_status in (1,5)
and jsp.city = #{city} and jsp.city = #{city}
)r )r
</select> </select>
@ -233,8 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_dev_info mdi on mdi.on_project = jsp.id left join ma_dev_info mdi on mdi.on_project = jsp.id
left join ma_type_view mtv on mtv.typeId = mdi.type_id left join ma_type_view mtv on mtv.typeId = mdi.type_id
where mdi.is_active = 1 where mdi.is_active = 1
and mdi.own_co = #{companyId} and (mdi.change_status in (2, 3) or mdi.change_status is null)
and mdi.change_status in (2, 3)
and jsp.city != #{city}) r and jsp.city != #{city}) r
</select> </select>
</mapper> </mapper>