1

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.CameraTypeEnum;
@@ -13,6 +14,7 @@ import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.ICameraDetailMapper;
 import com.fdkankan.manage.service.*;
+import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     LaserService fdkkLaserService;
     @Autowired
     IUserService userService;
+    @Autowired
+    LaserService laserService;
 
 
     @Override
@@ -138,6 +142,13 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             Long sceneCount = sceneMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneMap.get(cameraDetail.getCameraId());
             Long scenePlusCount = scenePlusMap.get(cameraDetail.getCameraId()) == null ? 0L : scenePlusMap.get(cameraDetail.getCameraId());
             Long count =  sceneProCount + sceneCount + scenePlusCount;
+
+            SceneParam param = new SceneParam();
+            Camera camera = cameraService.getById(cameraDetail.getCameraId());
+            param.setSnCode(camera.getSnCode());
+            PageInfo pageInfo = laserService.pageList(param);
+            count += pageInfo.getTotal();
+
             resultMap.merge(cameraDetail.getCompanyId(), count, Long::sum);
         }
 

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

@@ -4,7 +4,7 @@
 
     <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,4,12,13,14)
+        and scene_source in (1,2,3,12,13,14)
         and  user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
@@ -14,7 +14,7 @@
 
     <select id="getCountGroupByCameraId" resultType="com.fdkankan.manage.vo.response.GroupByCount">
         SELECT camera_id as id,count(id)  as count  FROM t_scene_plus WHERE rec_status = 'A' AND camera_id is not null
-        and scene_source in (1,2,3,4,12,13,14)
+        and scene_source in (1,2,3,12,13,14)
         and camera_id in
         <foreach item="cameraId" collection="cameraIds" open="(" separator="," close=")">
             #{cameraId}

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

@@ -4,7 +4,7 @@
 
     <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 scene_source in (1,2,3,4,12,13,14)
+        and scene_source in (1,2,3,12,13,14)
         and  user_id in
          <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
@@ -13,7 +13,7 @@
     </select>
     <select id="getCountGroupByCameraId" resultType="com.fdkankan.manage.vo.response.GroupByCount">
         SELECT camera_id as id,count(id)  as count  FROM t_scene_pro WHERE rec_status = 'A' and is_upgrade = 0  AND camera_id is not null
-        and scene_source in (1,2,3,4,12,13,14)
+        and scene_source in (1,2,3,12,13,14)
         and camera_id in
         <foreach item="cameraId" collection="cameraIds" open="(" separator="," close=")">
             #{cameraId}