21

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

@@ -7,8 +7,10 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.User;
+import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.IUserMapper;
 import com.fdkankan.manage.service.*;
+import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
 import com.fdkankan.manage.vo.response.UserVo;
@@ -44,6 +46,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     private ISceneProService sceneProService;
     @Autowired
     private IScenePlusService scenePlusService;
+    @Autowired
+    private LaserService laserService;
 
     @Override
     public PageInfo pageList(UserParam param) {
@@ -99,6 +103,9 @@ 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());
+                SceneParam param = new SceneParam();
+                param.setUserName(user.getUserName());
+                PageInfo pageInfo = laserService.pageList(param);
 
                 UserVo vo = new UserVo();
                 BeanUtils.copyProperties(user,vo);
@@ -106,7 +113,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);
+                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount + pageInfo.getTotal());
                 voList.add(vo);
             }
         }

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

@@ -3,7 +3,9 @@
 <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  user_id in
+        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
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>

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

@@ -3,7 +3,9 @@
 <mapper namespace="com.fdkankan.manage.mapper.ISceneProMapper">
 
     <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
-        SELECT user_id as id, count(id) as count FROM t_scene_pro  WHERE  rec_status = 'A' and is_upgrade = 0 and  user_id in
+        SELECT user_id as id, count(id) as count FROM t_scene_pro  WHERE  rec_status = 'A' and is_upgrade = 0
+        and scene_source in (1,2,3,12,13,14)
+        and  user_id in
          <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>