obj数量

src/main/java/com/fdkankan/manage/mapper/IScenePlusMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
 
-    List<GroupByCount> getCountGroupByUserId(List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList, @Param("isObj") Integer isObj);
 
     List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 }

src/main/java/com/fdkankan/manage/mapper/ISceneProMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Mapper
 public interface ISceneProMapper extends BaseMapper<ScenePro> {
 
-    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList,@Param("isObj") Integer isObj);
 
     List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 

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

@@ -22,7 +22,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     void unbindCamera(Long cameraId);
 
-    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj);
 
     HashMap<Long, Long> getCountGroupByCameraId(ArrayList<Long> longs);
 }

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

@@ -25,7 +25,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     List<ScenePro> getListByCameraId(Long cameraId);
 
-    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj);
 
     HashMap<Long, Long>  getCountGroupByCameraId(List<Long> cameraIds);
 
@@ -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 userId);
+    Long getSsObjCount(List<String> asList, String startTime);
 }

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,null);
+            ssObjCount = sceneProService.getSsObjCount(Arrays.asList("4"),startTime);
         }
         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/ScenePlusServiceImpl.java

@@ -53,9 +53,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
+    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj) {
         HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList,isObj);
         result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
         return map;
     }

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

@@ -93,9 +93,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
+    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj) {
         HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList,isObj);
         result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
         return map;
     }
@@ -468,25 +468,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return this.count(wrapper) + count;
     }
     @Override
-    public Long getSsObjCount(List<String> asList, String startTime,Long userId) {
+    public Long getSsObjCount(List<String> asList, String startTime) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(ScenePro::getSceneSource,asList);
         wrapper.eq(ScenePro::getIsUpgrade,0);
         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);
         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

@@ -95,17 +95,19 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             HashMap<Long,Long> incrementCountMap = userIncrementService.getValidCountGroupByUserId(userIdList);
             HashMap<Long,Long> cameraCountMap = cameraDetailService.getCountGroupByUserId(userIdList);
             HashMap<Long,Long> sceneCountMap = sceneService.getCountGroupByUserId(userIdList);
-            HashMap<Long,Long> sceneProCountMap = sceneProService.getCountGroupByUserId(userIdList);
-            HashMap<Long,Long> scenePlusCountMap = scenePlusService.getCountGroupByUserId(userIdList);
-
+            HashMap<Long,Long> sceneProCountMap = sceneProService.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);
 
             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 sceneProObjCount = sceneProCountObjMap.get(user.getId()) == null ? 0 : sceneProCountObjMap.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());
+                long scenePlusObjCount = scenePlusCountObjMap.get(user.getId()) == null ? 0 : scenePlusCountObjMap.get(user.getId());
                 SceneParam param = new SceneParam();
                 param.setUserName(user.getUserName());
                 PageInfo pageInfo = laserService.pageList(param);
@@ -116,7 +118,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 + ssObjCount + pageInfo.getTotal());
+                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + sceneProObjCount +scenePlusObjCount+ pageInfo.getTotal());
                 voList.add(vo);
             }
         }

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -3,13 +3,20 @@
 <mapper namespace="com.fdkankan.manage.mapper.IScenePlusMapper">
 
     <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
-        SELECT user_id as id, count(id) as count FROM t_scene_plus  WHERE  rec_status = 'A'
-        and scene_source in (1,2,3,12,13,14)
-        and  user_id in
+        SELECT user_id as id, count(id) as count FROM t_scene_plus p
+        <if test="isObj != null and isObj = 1">
+            left join t_scene_plus_ext e
+        </if>
+        WHERE  p.rec_status = 'A'
+        and p.scene_source in (1,2,3,12,13,14)
+        and  p.user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>
-        GROUP BY user_id
+        <if test="isObj != null and isObj = 1">
+            e.is_obj = 1
+        </if>
+        GROUP BY p.user_id
     </select>
 
     <select id="getCountGroupByCameraId" resultType="com.fdkankan.manage.vo.response.GroupByCount">

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -9,6 +9,9 @@
          <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>
+        <if test="isObj !=null and isObj = 1">
+            is_obj = 1
+        </if>
         GROUP BY user_id
     </select>
     <select id="getCountGroupByCameraId" resultType="com.fdkankan.manage.vo.response.GroupByCount">