1

src/main/java/com/fdkankan/manage/service/ISceneProService.java

@@ -41,5 +41,5 @@ public interface ISceneProService extends IService<ScenePro> {
 
     Long getKkCount(List<String> asList, String startTime);
     Long getSsCount(List<String> asList, String startTime);
-    Long getSsObjCount(List<String> asList, String startTime);
+    Long getSsObjCount(List<String> asList, String startTime,Long userId);
 }

src/main/java/com/fdkankan/manage/service/impl/DataService.java

@@ -318,7 +318,7 @@ public class DataService implements IDataService {
             kkCount = sceneProService.getKkCount(Arrays.asList("1","2","12","13","14"),startTime);
             KjCount = sceneProService.getKkCount(Arrays.asList("3"),startTime);
             ssCount = sceneProService.getSsCount(Arrays.asList("4"),startTime);
-            ssObjCount = sceneProService.getSsObjCount(Arrays.asList("4"),startTime);
+            ssObjCount = sceneProService.getSsObjCount(Arrays.asList("4"),startTime,null);
         }
         List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
         setListData(kkList,kkMap,dates,dataType,kkCount);

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -468,15 +468,25 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return this.count(wrapper) + count;
     }
     @Override
-    public Long getSsObjCount(List<String> asList, String startTime) {
+    public Long getSsObjCount(List<String> asList, String startTime,Long userId) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(ScenePro::getSceneSource,asList);
         wrapper.eq(ScenePro::getIsUpgrade,0);
-        wrapper.lt(ScenePro::getCreateTime,startTime);
+        if(StringUtils.isNotBlank(startTime)){
+            wrapper.lt(ScenePro::getCreateTime,startTime);
+        }
+        if(userId != null){
+            wrapper.eq(ScenePro::getUserId,userId);
+        }
         wrapper.eq(ScenePro::getIsObj,1);
         LambdaQueryWrapper<ScenePlus> wrapper2 = new LambdaQueryWrapper<>();
         wrapper2.in(ScenePlus::getSceneSource,asList);
-        wrapper2.lt(ScenePlus::getCreateTime,startTime);
+        if(StringUtils.isNotBlank(startTime)){
+            wrapper2.lt(ScenePlus::getCreateTime,startTime);
+        }
+        if(userId != null){
+            wrapper2.eq(ScenePlus::getUserId,userId);
+        }
         List<ScenePlus> list = scenePlusService.list(wrapper2);
         List<Long> plusIds = list.stream().map(ScenePlus::getId).collect(Collectors.toList());
         long count = 0L;

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -97,12 +97,15 @@ 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);
+
+
             for (User user :userList) {
                 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 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 ssObjCount = sceneProService.getSsObjCount(Arrays.asList("4"), null, user.getId());
                 SceneParam param = new SceneParam();
                 param.setUserName(user.getUserName());
                 PageInfo pageInfo = laserService.pageList(param);
@@ -113,7 +116,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 vo.setIncrementCount(incrementCount);
                 vo.setSurDownNum(user.getDownloadNumTotal() - user.getDownloadNum());
                 vo.setCameraCount(cameraCount);
-                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + pageInfo.getTotal());
+                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + ssObjCount + pageInfo.getTotal());
                 voList.add(vo);
             }
         }