数据不对

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -1,6 +1,9 @@
 package com.fdkankan.manage.common;
 
 
+import cn.hutool.jwt.JWT;
+import com.fdkankan.common.util.JwtUtil;
+
 public enum ResultCode  {
     SYSTEM_ERROR(500, "系统异常"),
 
@@ -10,10 +13,10 @@ public enum ResultCode  {
     USER_EXIST(4004, "用户已存在"),
     PASSWORD_ERROR(4005, "账号密码错误，请重新登录!"),
     USERNAME_ERROR(4006, "该账号已停止使用"),
-    MISSING_REQUIRED_PARAMETERS(4007, "缺少必要参数"),
+    MISSING_REQUIRED_PARAMETERS(4007, "必填项不能为空"),
     USER_NOT_LOGIN(4008, "用户未登录"),
 
-    VISION_EXIST(50001, "版本号已存在!"),
+    VISION_EXIST(50001, "版本号不能重复!"),
     LOGIN_NUM_MUCH(50003, "频繁登录失败，请五分钟后再次尝试登录!"),
     UPLOAD_ERROR(50004, "上传失败"),
     SDK_DEL_ERROR(50005, "删除失败，请先下架在删除"),

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

@@ -2,8 +2,11 @@ package com.fdkankan.manage.mapper;
 
 import com.fdkankan.manage.entity.ScenePlus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 场景主表 Mapper 接口
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
 
+    List<GroupByCount> getCountGroupByUserId(List<Long> userIdList);
 }

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

@@ -4,6 +4,9 @@ import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 场景主表 服务类
@@ -17,4 +20,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     ScenePlus getByNum(String sceneNum);
 
     void unbindCamera(Long cameraId);
+
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
 }

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

@@ -9,10 +9,12 @@ import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.IScenePlusMapper;
 import com.fdkankan.manage.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.response.GroupByCount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -52,4 +54,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         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;
+    }
 }

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

@@ -42,6 +42,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     private ISceneService sceneService;
     @Autowired
     private ISceneProService sceneProService;
+    @Autowired
+    private IScenePlusService scenePlusService;
 
     @Override
     public PageInfo pageList(UserParam param) {
@@ -90,11 +92,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             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);
             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 scenePlusCount = scenePlusCountMap.get(user.getId()) == null ? 0 : scenePlusCountMap.get(user.getId());
 
                 UserVo vo = new UserVo();
                 BeanUtils.copyProperties(user,vo);
@@ -102,7 +106,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);
+                vo.setSceneNum(sceneCount + sceneProCount + scenePlusCount);
                 voList.add(vo);
             }
         }

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

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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
+        <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+        GROUP BY user_id
+    </select>
 </mapper>

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

@@ -4,7 +4,7 @@
 
     <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
+        WHERE rec_status = 'A' and is_expired = 0  and user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}
         </foreach>