* init

src/main/java/com/tdba/cxb/ares/api/config/RedisConfig.java

@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.util.StringUtils;
@@ -59,6 +60,11 @@ public class RedisConfig {
         return redisTemplate;
     }
 
+    @Bean(name = "stringRedisTemplate")
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory){
+        return new StringRedisTemplate(redisConnectionFactory);
+    }
+
     @Bean
     public JedisPool redisPoolFactory() {
         try {

src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -1,10 +1,8 @@
 package com.tdba.cxb.ares.api.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.tdba.cxb.ares.api.model.BaseUser;
-import com.tdba.cxb.ares.api.model.BindUserAdd;
-import com.tdba.cxb.ares.api.model.OperatorLoginReq;
-import com.tdba.cxb.ares.api.model.TDBAResponse;
+import com.tdba.cxb.ares.api.model.*;
 import com.tdba.cxb.ares.api.service.UserService;
 import com.tdba.cxb.ares.api.util.DateUtil;
 import com.tdba.cxb.ares.api.util.TDBAController;
@@ -69,8 +67,9 @@ public class UserController {
      * @return
      */
     @GetMapping("bind_list")
-    public TDBAResponse bind_list(BaseUser baseUser){
+    public TDBAResponse bind_list(PageParam param, BaseUser baseUser){
         Objects.requireNonNull(baseUser, "请登录后操作");
+        PageHelper.startPage(param.getPage(), param.getLimit());
         return buildSuccess(buildByPageInfo(new PageInfo(userService.teamList(baseUser.getId()))));
     }
 

src/main/java/com/tdba/cxb/ares/api/model/PageParam.java

@@ -0,0 +1,32 @@
+package com.tdba.cxb.ares.api.model;
+
+/**
+ * @program: admin-web
+ * @description: 分页请求
+ * @author: libo
+ * @create: 2022-06-01 15:35:47
+ */
+public class PageParam {
+
+    /** 当期页码*/
+    private Integer page = 1;
+
+    /** 每页条数*/
+    private Integer limit = 10;
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+}

src/main/java/com/tdba/cxb/ares/api/model/UserBind.java

@@ -17,13 +17,13 @@ public class UserBind {
     private Integer uid;
 
     /** 添加时间*/
-    private LocalDateTime createTime;
+    private LocalDateTime create_time;
 
     /** 删除标记:0否1是*/
-    private Integer delFlag;
+    private Integer del_flag;
 
     /** 运营商用户ID(sys_user)*/
-    private Integer bindUid;
+    private Integer bind_uid;
 
     /** 类型:0正常统计1统计时过滤*/
     private Integer type;
@@ -44,28 +44,28 @@ public class UserBind {
         this.uid = uid;
     }
 
-    public LocalDateTime getCreateTime() {
-        return createTime;
+    public LocalDateTime getCreate_time() {
+        return create_time;
     }
 
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
+    public void setCreate_time(LocalDateTime create_time) {
+        this.create_time = create_time;
     }
 
-    public Integer getDelFlag() {
-        return delFlag;
+    public Integer getDel_flag() {
+        return del_flag;
     }
 
-    public void setDelFlag(Integer delFlag) {
-        this.delFlag = delFlag;
+    public void setDel_flag(Integer del_flag) {
+        this.del_flag = del_flag;
     }
 
-    public Integer getBindUid() {
-        return bindUid;
+    public Integer getBind_uid() {
+        return bind_uid;
     }
 
-    public void setBindUid(Integer bindUid) {
-        this.bindUid = bindUid;
+    public void setBind_uid(Integer bind_uid) {
+        this.bind_uid = bind_uid;
     }
 
     public Integer getType() {
@@ -79,9 +79,9 @@ public class UserBind {
     public static final class UserBindBuilder {
         private Integer id;
         private Integer uid;
-        private LocalDateTime createTime;
-        private Integer delFlag;
-        private Integer bindUid;
+        private LocalDateTime create_time;
+        private Integer del_flag;
+        private Integer bind_uid;
         private Integer type;
 
         private UserBindBuilder() {
@@ -101,18 +101,18 @@ public class UserBind {
             return this;
         }
 
-        public UserBindBuilder withCreateTime(LocalDateTime createTime) {
-            this.createTime = createTime;
+        public UserBindBuilder withCreate_time(LocalDateTime create_time) {
+            this.create_time = create_time;
             return this;
         }
 
-        public UserBindBuilder withDelFlag(Integer delFlag) {
-            this.delFlag = delFlag;
+        public UserBindBuilder withDel_flag(Integer del_flag) {
+            this.del_flag = del_flag;
             return this;
         }
 
-        public UserBindBuilder withBindUid(Integer bindUid) {
-            this.bindUid = bindUid;
+        public UserBindBuilder withBind_uid(Integer bind_uid) {
+            this.bind_uid = bind_uid;
             return this;
         }
 
@@ -125,9 +125,9 @@ public class UserBind {
             UserBind userBind = new UserBind();
             userBind.setId(id);
             userBind.setUid(uid);
-            userBind.setCreateTime(createTime);
-            userBind.setDelFlag(delFlag);
-            userBind.setBindUid(bindUid);
+            userBind.setCreate_time(create_time);
+            userBind.setDel_flag(del_flag);
+            userBind.setBind_uid(bind_uid);
             userBind.setType(type);
             return userBind;
         }

src/main/java/com/tdba/cxb/ares/api/service/UserService.java

@@ -10,6 +10,7 @@ import com.tdba.cxb.ares.api.util.TDBAException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -320,13 +321,15 @@ public class UserService {
     @Resource
     private RedisTemplate redisTemplate;
 
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
     /**
      * 登录
      * @param param
      * @return
      */
     public UserLoginResp login(OperatorLoginReq param){
-        if(!param.getCode().equals("" + redisTemplate.opsForValue().get("api.auth.sms." + param.getPhone()))){
+        if(!param.getCode().equals("" + stringRedisTemplate.opsForValue().get("api.auth.sms." + param.getPhone()))){
             throw new TDBAException("短信验证码有误");
         }
         redisTemplate.delete("api.auth.sms." + param.getPhone());
@@ -356,20 +359,7 @@ public class UserService {
      * @return
      */
     public List<UserVo> teamList(Integer id){
-        List<UserVo> result = userMapper.selectByBindUid(id);
-        if(result.size() < 20){
-            int length = 20 - result.size();
-            for(int i = 0; i < length; i++){
-                result.add(UserVo.UserVoBuilder.anUserVo()
-                        .withAvatar("")
-                        .withId(0)
-                        .withMobile("")
-                        .withStatus(0)
-                        .withTeamName("")
-                        .build());
-            }
-        }
-        return result;
+        return userMapper.selectByBindUid(id);
     }
 
     /**
@@ -379,7 +369,7 @@ public class UserService {
      */
     @Transactional
     public void teamAdd(BindUserAdd param, BaseUser baseUser){
-        if(!param.getCode().equals(redisTemplate.opsForValue().get("api.auth.sms." + param.getMobile()))){
+        if(!param.getCode().equals("" + stringRedisTemplate.opsForValue().get("api.auth.sms." + param.getMobile()))){
             throw new TDBAException("短信验证码有误");
         }
         redisTemplate.delete("api.auth.sms." + param.getMobile());
@@ -393,7 +383,7 @@ public class UserService {
 
         UserBind oldUserBind = userBindMapper.selectByUid(userVo.getId());
         if(oldUserBind != null){
-            throw new TDBAException((oldUserBind.getBindUid().equals(baseUser.getId()))? "手机号已添加，请勿重复操作": "该手机号已被其他运营商绑定");
+            throw new TDBAException((oldUserBind.getBind_uid().equals(baseUser.getId()))? "手机号已添加，请勿重复操作": "该手机号已被其他运营商绑定");
         }
 
         List<Integer> oldUidList = userBindMapper.selectUid(baseUser.getId());
@@ -404,9 +394,9 @@ public class UserService {
             }
         }
         userBindMapper.insertSelective(UserBind.UserBindBuilder.anUserBind()
-                .withBindUid(baseUser.getId())
+                .withBind_uid(baseUser.getId())
                 .withUid(userVo.getId())
-                .withCreateTime(LocalDateTime.now())
+                .withCreate_time(LocalDateTime.now())
                 .withType(isFilter? 1: 0).build());
     }
 

src/main/resources/application.yml

@@ -7,6 +7,9 @@ spring:
     type: caffeine
     caffeine:
       spec: maximumSize=5000,expireAfterWrite=60s
+  jackson:
+    parser:
+      allow-numeric-leading-zeros: true
 
 mybatis:
 #  configuration: