|
@@ -119,8 +119,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
HashMap<Long,Long> sceneCountMap = sceneService.getCountGroupByUserId(userIdList);
|
|
|
HashMap<Long,Long> sceneProCountMap = sceneProService.getCountGroupByUserId(userIdList);
|
|
|
HashMap<Long,Long> scenePlusCountMap = scenePlusService.getCountGroupByUserId(userIdList);
|
|
|
- // HashMap<Long,Long> sceneProCountObjMap = sceneProService.getCountGroupByUserId(userIdList,1);
|
|
|
- // HashMap<Long,Long> scenePlusCountObjMap = scenePlusService.getCountGroupByUserId(userIdList,1);
|
|
|
|
|
|
for (User user :userList) {
|
|
|
long incrementCount = incrementCountMap.get(user.getId()) == null ? 0 : incrementCountMap.get(user.getId());
|
|
@@ -128,16 +126,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
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 scenePlusCount = scenePlusCountMap.get(user.getId()) == null ? 0 : scenePlusCountMap.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());
|
|
|
-
|
|
|
- Long ssNum = 0L;
|
|
|
- if(!CacheUtil.uploadType.equals("local")){
|
|
|
- SceneParam param = new SceneParam();
|
|
|
- param.setUserName(user.getUserName());
|
|
|
- PageInfo pageInfo = laserService.pageList(param);
|
|
|
- ssNum = pageInfo.getTotal();
|
|
|
- }
|
|
|
|
|
|
UserVo vo = new UserVo();
|
|
|
BeanUtils.copyProperties(user,vo);
|
|
@@ -146,7 +134,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
|
vo.setSurDownNum(user.getDownloadNumTotal() - user.getDownloadNum());
|
|
|
vo.setSurSSDownNum(user.getSsDownloadNumTotal() - user.getSsDownloadNum());
|
|
|
vo.setCameraCount(cameraCount);
|
|
|
- vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + ssNum);
|
|
|
+ vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount );
|
|
|
if(user.getSysUserId() != null){
|
|
|
SysUser sysUser = sysMap.get(user.getSysUserId());
|
|
|
if(sysUser != null){
|