chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug

Browse Source
This commit is contained in:
墨大叔 2024-05-20 17:59:12 +08:00
parent 7590c5db9c
commit cd0c2c0a93
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.xml
View File

@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sm.model_name as model, sm.model_name as model,
sm.picture as picture, sm.picture as picture,
sm.tags as model_tags, sm.tags as model_tags,
ss.user_id as user_id,
ss.name as store_name, ss.name as store_name,
su.user_name as user_name su.user_name as user_name
from sm_device sd from sm_device sd
@ -296,8 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="unbindStore"> <update id="unbindStore">
update sm_device update sm_device
set user_id = null, set store_id = null
store_id = null
where device_id = #{deviceId} where device_id = #{deviceId}
</update> </update>

12
smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java
View File

@ -135,19 +135,21 @@ public class StoreServiceImpl implements IStoreService
public List<StoreVo> listCount(StoreQuery query) { public List<StoreVo> listCount(StoreQuery query) {
List<StoreVo> list = new ArrayList<>(); List<StoreVo> list = new ArrayList<>();
// 查询各各店铺的设备数据
List<StoreVo> storeList = storeMapper.selectSmStoreList(query);
storeAssembler.assembleDeviceCount(storeList);
// 查询全部设备数据 // 查询全部设备数据
SmDeviceQuery deviceDto = new SmDeviceQuery(); SmDeviceQuery deviceDto = new SmDeviceQuery();
deviceDto.setUserId(query.getUserId()); deviceDto.setStoreIds(storeList.stream().map(StoreVo::getStoreId).collect(Collectors.toList()));
int count = smDeviceService.selectCount(deviceDto); int count = smDeviceService.selectCount(deviceDto);
StoreVo all = new StoreVo(); StoreVo all = new StoreVo();
all.setDeviceCount(count); all.setDeviceCount(count);
all.setName("全部"); all.setName("全部");
list.add(all);
// 查询各各店铺的设备数据 list.add(all);
List<StoreVo> storeList = storeMapper.selectSmStoreList(query);
storeAssembler.assembleDeviceCount(storeList);
list.addAll(storeList); list.addAll(storeList);
return list; return list;
} }