客户管理

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CompanyController.java

@@ -1,8 +1,13 @@
 package com.fdkankan.manage.controller;
 
 
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.service.ICompanyService;
+import com.fdkankan.manage.vo.request.CompanyParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -14,8 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-20
  */
 @RestController
-@RequestMapping("/manage/company")
+@RequestMapping("/service/manage/company")
 public class CompanyController {
 
+    @Autowired
+    ICompanyService companyService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody CompanyParam param){
+        return ResultData.ok(companyService.pageList(param));
+    }
+
 }
 

4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/ICameraDetailMapper.java

@@ -2,7 +2,7 @@ package com.fdkankan.manage.mapper;
 
 import com.fdkankan.manage.entity.CameraDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,5 +19,7 @@ import java.util.List;
 @Mapper
 public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {
 
-    List<GroupByUserIdCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+
+    List<GroupByCount> getCountGroupByCompanyId();
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/ICompanyMapper.java

@@ -1,7 +1,10 @@
 package com.fdkankan.manage.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.Company;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.request.CompanyParam;
+import com.fdkankan.manage.vo.response.CompanyVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ICompanyMapper extends BaseMapper<Company> {
 
+    Page<CompanyVo> pageList(Page<CompanyVo> page, CompanyParam param);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/ISceneMapper.java

@@ -2,7 +2,7 @@ package com.fdkankan.manage.mapper;
 
 import com.fdkankan.manage.entity.Scene;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,5 +19,7 @@ import java.util.List;
 @Mapper
 public interface ISceneMapper extends BaseMapper<Scene> {
 
-    List<GroupByUserIdCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+
+    List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/ISceneProMapper.java

@@ -2,7 +2,7 @@ package com.fdkankan.manage.mapper;
 
 import com.fdkankan.manage.entity.ScenePro;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,5 +19,7 @@ import java.util.List;
 @Mapper
 public interface ISceneProMapper extends BaseMapper<ScenePro> {
 
-    List<GroupByUserIdCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+
+    List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/mapper/IUserIncrementMapper.java

@@ -2,7 +2,7 @@ package com.fdkankan.manage.mapper;
 
 import com.fdkankan.manage.entity.UserIncrement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {
 
-    List<GroupByUserIdCount> getValidCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+    List<GroupByCount> getValidCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/ICameraDetailService.java

@@ -17,8 +17,6 @@ import java.util.List;
  */
 public interface ICameraDetailService extends IService<CameraDetail> {
 
-    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
-
     void unbindCamera(Long cameraId, User user);
 
     CameraDetail getByCameraId(Long cameraId);
@@ -26,4 +24,10 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     List<CameraDetail> getByCameraIds(List<Long> cameraIds);
 
     void deleteByCameraId(Long cameraId);
+
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
+
+    HashMap<Long, Long> getCountGroupByCompanyId();
+
+    HashMap<Long, Long>  getSceneCountGroupByCameraId();
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/ICompanyService.java

@@ -1,7 +1,9 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.CompanyParam;
 
 import java.util.List;
 
@@ -18,4 +20,6 @@ public interface ICompanyService extends IService<Company> {
     List<Company> getCompanyName(String content);
 
     Company getCompanyByName(String companyName);
+
+    PageInfo pageList(CompanyParam param);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/ISceneProService.java

@@ -17,11 +17,13 @@ import java.util.List;
  */
 public interface ISceneProService extends IService<ScenePro> {
 
-    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
-
     void unbindCamera(Long cameraId);
 
     void lockBySpace(CameraDetail cameraDetail,Long cameraId);
 
     List<ScenePro> getListByCameraId(Long cameraId);
+
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
+
+    HashMap<Long, Long>  getCountGroupByCameraId(List<Long> cameraIds);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/ISceneService.java

@@ -16,7 +16,9 @@ import java.util.List;
  */
 public interface ISceneService extends IService<Scene> {
 
+    void unbindCamera(Long cameraId);
+
     HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
 
-    void unbindCamera(Long cameraId);
+    HashMap<Long, Long> getCountGroupByCameraId(List<Long> cameraIds);
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -11,12 +11,13 @@ import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.mapper.ICameraDetailMapper;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -36,15 +37,11 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Autowired
     ISceneProService sceneProService;
     @Autowired
+    ISceneService sceneService;
+    @Autowired
     IFdkkLaserService fdkkLaserService;
 
-    @Override
-    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
-        HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByUserIdCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
-        result.forEach(entity ->map.put(entity.getUserId(),entity.getCount()));
-        return map;
-    }
+
 
     @Override
     public void unbindCamera(Long cameraId, User user) {
@@ -94,4 +91,41 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         wrapper.eq(CameraDetail::getCameraId,cameraId);
         this.remove(wrapper);
     }
+
+    @Override
+    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
+        HashMap<Long,Long> map = new HashMap<>();
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        return map;
+    }
+
+    @Override
+    public HashMap<Long, Long> getCountGroupByCompanyId() {
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByCompanyId();
+        HashMap<Long,Long> map = new HashMap<>();
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        return map;
+    }
+
+    @Override
+    public HashMap<Long, Long> getSceneCountGroupByCameraId() {
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.isNotNull(CameraDetail::getCompanyId);
+        wrapper.groupBy(CameraDetail::getCameraId);
+        List<CameraDetail> list = this.list(wrapper);
+        List<Long> cameraIds = list.parallelStream().map(CameraDetail::getCameraId).collect(Collectors.toList());
+        HashMap<Long, Long> resultMap = new HashMap<>();
+        HashMap<Long, Long> sceneProMap = sceneProService.getCountGroupByCameraId(cameraIds);
+        HashMap<Long, Long> sceneMap = sceneService.getCountGroupByCameraId(cameraIds);
+
+        for (CameraDetail cameraDetail : list) {
+            Long sceneProCount = sceneProMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneProMap.get(cameraDetail.getCameraId());
+            Long sceneCount = sceneMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneMap.get(cameraDetail.getCameraId());
+            Long count =  sceneProCount + sceneCount;
+            resultMap.merge(cameraDetail.getCompanyId(), count, Long::sum);
+        }
+
+        return resultMap;
+    }
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/CompanyServiceImpl.java

@@ -1,12 +1,19 @@
 package com.fdkankan.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.mapper.ICompanyMapper;
+import com.fdkankan.manage.service.ICameraDetailService;
 import com.fdkankan.manage.service.ICompanyService;
+import com.fdkankan.manage.vo.request.CompanyParam;
+import com.fdkankan.manage.vo.response.CompanyVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -20,6 +27,9 @@ import java.util.List;
 @Service
 public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> implements ICompanyService {
 
+    @Autowired
+    ICameraDetailService cameraDetailService;
+
     @Override
     public List<Company> getCompanyName(String content) {
         LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
@@ -37,4 +47,16 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
         }
         return null;
     }
+
+    @Override
+    public PageInfo pageList(CompanyParam param) {
+        Page<CompanyVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        HashMap<Long, Long> cameraMap = cameraDetailService.getCountGroupByCompanyId();
+        HashMap<Long, Long> sceneMap = cameraDetailService.getSceneCountGroupByCameraId();
+        for (CompanyVo record : page.getRecords()) {
+            record.setCameraCount(cameraMap.get(record.getId()));
+            record.setSceneCount(sceneMap.get(record.getId()));
+        }
+        return PageInfo.PageInfo(page);
+    }
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -12,7 +12,7 @@ import com.fdkankan.manage.entity.ScenePro;
 import com.fdkankan.manage.mapper.ISceneProMapper;
 import com.fdkankan.manage.service.ICameraDetailService;
 import com.fdkankan.manage.service.ISceneProService;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,8 +41,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
         HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByUserIdCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
-        result.forEach(entity ->map.put(entity.getUserId(),entity.getCount()));
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        return map;
+    }
+
+    @Override
+    public HashMap<Long, Long> getCountGroupByCameraId(List<Long> cameraIds) {
+        HashMap<Long,Long> map = new HashMap<>();
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByCameraId(cameraIds);
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
         return map;
     }
 

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/SceneServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.entity.Scene;
 import com.fdkankan.manage.mapper.ISceneMapper;
 import com.fdkankan.manage.service.ISceneService;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -22,13 +22,6 @@ import java.util.List;
 @Service
 public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
 
-    @Override
-    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
-        HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByUserIdCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
-        result.forEach(entity ->map.put(entity.getUserId(),entity.getCount()));
-        return map;
-    }
 
     @Override
     public void unbindCamera(Long cameraId) {
@@ -37,4 +30,20 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
                 .eq(Scene::getCameraId,cameraId);
         this.update(wrapper);
     }
+
+    @Override
+    public HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList) {
+        HashMap<Long,Long> map = new HashMap<>();
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByUserId(userIdList);
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        return map;
+    }
+
+    @Override
+    public HashMap<Long, Long> getCountGroupByCameraId(List<Long> cameraIds) {
+        HashMap<Long,Long> map = new HashMap<>();
+        List<GroupByCount> result = this.getBaseMapper().getCountGroupByCameraId(cameraIds);
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
+        return map;
+    }
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -13,7 +13,7 @@ import com.fdkankan.manage.mapper.IUserIncrementMapper;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IUserIncrementService;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
-import com.fdkankan.manage.vo.response.GroupByUserIdCount;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import com.fdkankan.manage.vo.response.UserIncrementVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +47,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public HashMap<Long, Long> getValidCountGroupByUserId(List<Long> userIdList) {
         HashMap<Long,Long> map = new HashMap<>();
-        List<GroupByUserIdCount> result = this.getBaseMapper().getValidCountGroupByUserId(userIdList);
-        result.forEach(entity ->map.put(entity.getUserId(),entity.getCount()));
+        List<GroupByCount> result = this.getBaseMapper().getValidCountGroupByUserId(userIdList);
+        result.forEach(entity ->map.put(entity.getId(),entity.getCount()));
         return map;
     }
 

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/request/CompanyParam.java

@@ -1,2 +1,9 @@
-package com.fdkankan.manage.vo.request;public class CompanyParam {
+package com.fdkankan.manage.vo.request;
+
+import com.fdkankan.common.request.RequestBase;
+import lombok.Data;
+
+@Data
+public class CompanyParam extends RequestBase {
+    private String companyName;
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/CompanyVo.java

@@ -1,2 +1,15 @@
-package com.fdkankan.manage.vo.response;public class CompanyVo {
+package com.fdkankan.manage.vo.response;
+
+import lombok.Data;
+
+@Data
+public class CompanyVo {
+    private Long id;
+    private String companyName;
+    private String companyDesc;
+    private Long cameraCount;
+    private Long sceneCount;
+    private Long createUserId;
+    private String createUserName;
+    private String createTime;
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/GroupByCount.java

@@ -3,7 +3,7 @@ package com.fdkankan.manage.vo.response;
 import lombok.Data;
 
 @Data
-public class GroupByUserIdCount {
-    private Long userId;
+public class GroupByCount {
+    private Long id;
     private Long count;
 }

4dkankan-center-manage/src/main/resources/mapper/manage/CameraDetailMapper.xml

@@ -2,11 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.ICameraDetailMapper">
 
-    <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByUserIdCount" >
-        SELECT user_id as userId, count(id) as count FROM t_camera_detail  WHERE rec_status = 'A' and    user_id in
+    <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
+        SELECT user_id as id, count(id) as count FROM t_camera_detail  WHERE rec_status = 'A' and    user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>
         GROUP BY user_id
     </select>
+
+    <select id="getCountGroupByCompanyId" resultType="com.fdkankan.manage.vo.response.GroupByCount">
+        SELECT company_id as id,count(id) as count FROM t_camera_detail WHERE rec_status = 'A' and company_id is not null GROUP BY company_id
+    </select>
+
+
 </mapper>

4dkankan-center-manage/src/main/resources/mapper/manage/CompanyMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.ICompanyMapper">
 
+    <select id="pageList" resultType="com.fdkankan.manage.vo.response.CompanyVo">
+        select c.id,c.company_name,c.company_name as companyDesc ,c.manager_id as createUserId, u.user_name as createUserName,c.create_time
+        from  t_company c
+        left join sys_user u on c.manager_id = u.id
+        where c.rec_status = 'A'
+        <if test="param.companyName != null and param.companyName != '' ">
+            and c.company_name like concat ('%',#{param.companyName},'%')
+        </if>
+    </select>
 </mapper>

4dkankan-center-manage/src/main/resources/mapper/manage/SceneMapper.xml

@@ -2,11 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.ISceneMapper">
 
-    <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByUserIdCount" >
-        SELECT user_id as userId, count(id) as count  FROM t_scene  WHERE rec_status = 'A' and    user_id in
+    <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
+        SELECT user_id as id, count(id) as count  FROM t_scene  WHERE rec_status = 'A' and    user_id in
          <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>
         GROUP BY user_id
     </select>
+    <select id="getCountGroupByCameraId" resultType="com.fdkankan.manage.vo.response.GroupByCount">
+        SELECT camera_id as id,count(id)  as count  FROM t_scene WHERE rec_status = 'A' AND camera_id is not null
+        and camera_id in
+        <foreach item="cameraId" collection="cameraIds" open="(" separator="," close=")">
+            #{cameraId}
+        </foreach>
+        GROUP BY camera_id
+    </select>
 </mapper>

4dkankan-center-manage/src/main/resources/mapper/manage/SceneProMapper.xml

@@ -2,11 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.ISceneProMapper">
 
-    <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByUserIdCount" >
-        SELECT user_id as userId, count(id) as count FROM t_scene_pro  WHERE  rec_status = 'A' and  user_id in
+    <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  user_id in
          <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>
         GROUP BY user_id
     </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 camera_id is not null
+        and camera_id in
+        <foreach item="cameraId" collection="cameraIds" open="(" separator="," close=")">
+            #{cameraId}
+        </foreach>
+        GROUP BY camera_id
+    </select>
 </mapper>

4dkankan-center-manage/src/main/resources/mapper/manage/UserIncrementMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage.mapper.IUserIncrementMapper">
 
-    <select id="getValidCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByUserIdCount" >
-        SELECT user_id as userId, count(id) as count  FROM t_user_increment
+    <select id="getValidCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
+        SELECT user_id as id, count(id) as count  FROM t_user_increment
         WHERE rec_status = 'A' and is_expired = 0 and increment_end_time &gt; now() and user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}