|
@@ -97,17 +97,17 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
HashMap<Long,Long> sceneCountMap = sceneService.getCountGroupByUserId(userIdList);
|
|
HashMap<Long,Long> sceneCountMap = sceneService.getCountGroupByUserId(userIdList);
|
|
HashMap<Long,Long> sceneProCountMap = sceneProService.getCountGroupByUserId(userIdList,0);
|
|
HashMap<Long,Long> sceneProCountMap = sceneProService.getCountGroupByUserId(userIdList,0);
|
|
HashMap<Long,Long> scenePlusCountMap = scenePlusService.getCountGroupByUserId(userIdList,0);
|
|
HashMap<Long,Long> scenePlusCountMap = scenePlusService.getCountGroupByUserId(userIdList,0);
|
|
- HashMap<Long,Long> sceneProCountObjMap = sceneProService.getCountGroupByUserId(userIdList,1);
|
|
|
|
- HashMap<Long,Long> scenePlusCountObjMap = scenePlusService.getCountGroupByUserId(userIdList,1);
|
|
|
|
|
|
+ // HashMap<Long,Long> sceneProCountObjMap = sceneProService.getCountGroupByUserId(userIdList,1);
|
|
|
|
+ // HashMap<Long,Long> scenePlusCountObjMap = scenePlusService.getCountGroupByUserId(userIdList,1);
|
|
|
|
|
|
for (User user :userList) {
|
|
for (User user :userList) {
|
|
long incrementCount = incrementCountMap.get(user.getId()) == null ? 0 : incrementCountMap.get(user.getId());
|
|
long incrementCount = incrementCountMap.get(user.getId()) == null ? 0 : incrementCountMap.get(user.getId());
|
|
long cameraCount = cameraCountMap.get(user.getId()) == null ? 0 : cameraCountMap.get(user.getId());
|
|
long cameraCount = cameraCountMap.get(user.getId()) == null ? 0 : cameraCountMap.get(user.getId());
|
|
long sceneCount = sceneCountMap.get(user.getId()) == null ? 0 : sceneCountMap.get(user.getId());
|
|
long sceneCount = sceneCountMap.get(user.getId()) == null ? 0 : sceneCountMap.get(user.getId());
|
|
long sceneProCount = sceneProCountMap.get(user.getId()) == null ? 0 : sceneProCountMap.get(user.getId());
|
|
long sceneProCount = sceneProCountMap.get(user.getId()) == null ? 0 : sceneProCountMap.get(user.getId());
|
|
- long sceneProObjCount = sceneProCountObjMap.get(user.getId()) == null ? 0 : sceneProCountObjMap.get(user.getId());
|
|
|
|
long scenePlusCount = scenePlusCountMap.get(user.getId()) == null ? 0 : scenePlusCountMap.get(user.getId());
|
|
long scenePlusCount = scenePlusCountMap.get(user.getId()) == null ? 0 : scenePlusCountMap.get(user.getId());
|
|
- long scenePlusObjCount = scenePlusCountObjMap.get(user.getId()) == null ? 0 : scenePlusCountObjMap.get(user.getId());
|
|
|
|
|
|
+ // long sceneProObjCount = sceneProCountObjMap.get(user.getId()) == null ? 0 : sceneProCountObjMap.get(user.getId());
|
|
|
|
+ // long scenePlusObjCount = scenePlusCountObjMap.get(user.getId()) == null ? 0 : scenePlusCountObjMap.get(user.getId());
|
|
SceneParam param = new SceneParam();
|
|
SceneParam param = new SceneParam();
|
|
param.setUserName(user.getUserName());
|
|
param.setUserName(user.getUserName());
|
|
PageInfo pageInfo = laserService.pageList(param);
|
|
PageInfo pageInfo = laserService.pageList(param);
|
|
@@ -118,7 +118,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
vo.setIncrementCount(incrementCount);
|
|
vo.setIncrementCount(incrementCount);
|
|
vo.setSurDownNum(user.getDownloadNumTotal() - user.getDownloadNum());
|
|
vo.setSurDownNum(user.getDownloadNumTotal() - user.getDownloadNum());
|
|
vo.setCameraCount(cameraCount);
|
|
vo.setCameraCount(cameraCount);
|
|
- vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + sceneProObjCount +scenePlusObjCount+ pageInfo.getTotal());
|
|
|
|
|
|
+ vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + pageInfo.getTotal());
|
|
voList.add(vo);
|
|
voList.add(vo);
|
|
}
|
|
}
|
|
}
|
|
}
|