1

src/main/java/com/fdkankan/ucenter/mapper/IUserIncrementMapper.java

@@ -16,5 +16,4 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {
 
-    Long getCount(@Param("userId") Long userId, @Param("cameraType") Integer cameraType, @Param("isBind") Integer isBind);
 }

src/main/java/com/fdkankan/ucenter/service/IUserIncrementService.java

@@ -28,8 +28,6 @@ public interface IUserIncrementService extends IService<UserIncrement> {
 
     void unbindCamera(List<Long> cameraIds);
 
-    Long getCount(Long userId, Integer cameraType, int isBind);
-
     UserIncrement getByCameraId(Long cameraId);
 
     void bindCamera(IncrementParam param);

src/main/java/com/fdkankan/ucenter/service/impl/AppUserService.java

@@ -42,11 +42,13 @@ public class AppUserService {
         Long proCount = sceneProService.getCountByUserId(user.getId(), cameraType);
         Long plusCount = scenePlusService.getCountByUserId(user.getId(), cameraType);
         Long expansionCount = expansionOrderService.getCount(user.getId(),cameraType);
-        Long incrementBindNum = userIncrementService.getCount(user.getId(),cameraType,1);
+        Long incrementNum = userIncrementService.getCountByUserId(user.getId(),0);
+        Long incrementBindNum = userIncrementService.getCountByUserId(user.getId(),1);
 
         userVo.setCameraCount(cameraCount);
         userVo.setSceneCount(plusCount + proCount);
         userVo.setExpansionTotal(expansionCount);
+        userVo.setIncrementNum(incrementNum);
         userVo.setIncrementBindNum(incrementBindNum);
         userVo.setPassword(SecurityUtil.MD5(userVo.getPassword()));
 

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -137,10 +137,6 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         this.update(wrapper);
     }
 
-    @Override
-    public Long getCount(Long userId, Integer cameraType, int isBind) {
-        return this.getBaseMapper().getCount(userId,cameraType,isBind);
-    }
 
     @Override
     public UserIncrement getByCameraId(Long cameraId) {

src/main/resources/mapper/ucenter/UserIncrementMapper.xml

@@ -2,16 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.ucenter.mapper.IUserIncrementMapper">
 
-    <select id="getCount" resultType="java.lang.Long">
-        select count(*) from t_user_increment i left join t_camera_detail d on i.camera_id = d.camera_id
-        where i.rec_status = 'A'  and i.user_id = #{userId}
-        <if test="isBind == 1">
-            and d.goods_id = #{cameraType}
-        </if>
-        <if test="isBind == 0">
-            and i.camera_id is null
-        </if>
-
-    </select>
 
 </mapper>