完成用户对用户登录和发布动态的数据分析

# Conflicts:
#	src/main/java/com/bao/dating/config/WebConfig.java
#	src/main/java/com/bao/dating/controller/UserController.java
#	src/main/java/com/bao/dating/mapper/UserMapper.java
#	src/main/java/com/bao/dating/service/UserService.java
#	src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
#	src/main/resources/com/bao/dating/mapper/UserMapper.xml

src/main/java/com/bao/dating/common/aliyun/SmsUtil.java

@@ -75,6 +75,8 @@ public class SmsUtil {
                     .setTemplateCode(templateCode != null ? templateCode : this.templateCode)
                     .setTemplateParam(templateParam);
 
+            log.error("TemplateParam 实际值 = {}", templateParam);
+
             SendSmsResponse response = client.sendSms(sendSmsRequest);
             
             if ("OK".equals(response.getBody().getCode())) {
@@ -145,6 +147,7 @@ public class SmsUtil {
         jsonBuilder.append("}");
         return sendSms(phoneNumber, templateCode, jsonBuilder.toString());
     }
+
 }
 
 

src/main/java/com/bao/dating/config/WebConfig.java

@@ -33,7 +33,9 @@ public class WebConfig implements WebMvcConfigurer {
                         "/user/register",
                         "/user/emailLogin",
                         "/api/verification/send-email-code",
-                        "/ip/location"
+                        "/ip/location",
+                        "/user/login",
+                        "/user/sendCode"
                 );
     }
 }

src/main/java/com/bao/dating/controller/DataAnalysisController.java

@@ -0,0 +1,66 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.pojo.vo.DataAnalysisVO;
+import com.bao.dating.util.DataAnalysisRedisService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+@RestController
+@RequestMapping("/dataAnalysis")
+public class DataAnalysisController {
+    @Resource
+    private DataAnalysisRedisService dataAnalysisRedisService;
+
+    /**
+     * 统计动态
+     * @param days 统计时常
+     * @return result
+     */
+    @GetMapping("/postTotal")
+    public Result<DataAnalysisVO> postDataAnalysis(@RequestParam Integer days){
+        if (checkParam(days)){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long count = dataAnalysisRedisService.countPostTotalByDays(days);
+        String timePeriod = dataAnalysisRedisService.calculateTimeRanges(LocalDateTime.now(), days);
+        DataAnalysisVO dataAnalysisVO = new DataAnalysisVO();
+        dataAnalysisVO.setTotal(count);
+        dataAnalysisVO.setTimePeriod(timePeriod);
+        return Result.success(ResultCode.SUCCESS,dataAnalysisVO);
+    }
+
+    @GetMapping("/loginUserTotal")
+    public Result<DataAnalysisVO> loginUserDataAnalysis(@RequestParam Integer days){
+        if (checkParam(days)){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long count = dataAnalysisRedisService.countLoginUserTotalByDays(days);
+        String timePeriod = dataAnalysisRedisService.calculateTimeRanges(LocalDateTime.now(), days);
+        DataAnalysisVO dataAnalysisVO = new DataAnalysisVO();
+        dataAnalysisVO.setTotal(count);
+        dataAnalysisVO.setTimePeriod(timePeriod);
+        return Result.success(ResultCode.SUCCESS,dataAnalysisVO);
+    }
+
+    /**
+     * 检验参数
+     * @param days 查询天数
+     * @return 参数是否合法
+     */
+    public Boolean checkParam(Integer days){
+        ArrayList<Integer> day = new ArrayList<>();
+        day.add(7);
+        day.add(15);
+        day.add(30);
+        day.add(365);
+        return days != null && day.contains(days);
+    }
+}

src/main/java/com/bao/dating/controller/PostController.java

@@ -1,17 +1,17 @@
 package com.bao.dating.controller;
 
-
-import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.service.PostService;
+import com.bao.dating.util.DataAnalysisRedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -26,6 +26,9 @@ public class PostController {
     @Autowired
     private PostService postService;
 
+    @Resource
+    private DataAnalysisRedisService dataAnalysisRedisService;
+
     /**
      * 上传媒体文件接口 like
      * @param files 媒体文件数组
@@ -46,6 +49,9 @@ public class PostController {
     public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
         Post result = postService.createPost(postDTO);
+        //这里将发布动态操作记录到redis中
+        Long postId = result.getPostId();
+        dataAnalysisRedisService.recordPostData(postId);
         return Result.success(ResultCode.SUCCESS, "动态发布成功，等待审核。", result);
     }
 

src/main/java/com/bao/dating/controller/UserController.java

@@ -9,11 +9,15 @@ import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
+import com.bao.dating.util.DataAnalysisRedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * 用户接口
@@ -27,6 +31,9 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    @Resource
+    private DataAnalysisRedisService dataAnalysisRedisService;
+
     /**
      * 登录
      * @param userLoginDTO 登录参数
@@ -34,6 +41,12 @@ public class UserController {
     @PostMapping("/login")
     public Result<UserLoginVO> login(@RequestBody UserLoginDTO userLoginDTO) {
         UserLoginVO userloginVO = userService.userLogin(userLoginDTO);
+        //将用户登录记录到redis中
+        if (userloginVO != null){
+            Long userId = userloginVO.getUserId();
+            dataAnalysisRedisService.recordLoginUserData(userId);
+        }
+
         return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
     }
 
@@ -64,6 +77,7 @@ public class UserController {
      * @param file 头像文件
      * @return 上传后的文件URL列表
      */
+    @Log
     @PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
     public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadAvatar(file);
@@ -75,6 +89,7 @@ public class UserController {
      * @param file 背景文件
      * @return 上传后的文件URL列表
      */
+    @Log
     @PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
     public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadBackground(file);
@@ -86,6 +101,7 @@ public class UserController {
      * @param userInfoUpdateDTO 用户信息更新参数
      * @return 更新后的用户信息
      */
+    @Log
     @PostMapping("/info/update")
     public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoDTO userInfoUpdateDTO) {
         Long userId = UserContext.getUserId();
@@ -94,6 +110,78 @@ public class UserController {
         return Result.success(ResultCode.SUCCESS, "用户信息更新成功", userInfoVO);
     }
 
+    @PostMapping("/sendCode")
+    public Result sendCode(@RequestBody Map<String, String> body) {
+        String phone = body.get("phone");
+        userService.sendSmsCode(phone);
+        return Result.success(ResultCode.SUCCESS, "验证码发送成功");
+    }
+
+    @PostMapping("/loginByCode")
+    public Result loginByCode(@RequestBody Map<String, String> body){
+        boolean ok = userService.verifyCode(body.get("phone"), body.get("code"));
+        return ok ? Result.success(ResultCode.SUCCESS, "登录成功") : Result.error(ResultCode.SYSTEM_ERROR, "登录失败");
+    }
+
+    /**
+     * 登录
+     * @param body 登录参数
+     */
+    @PostMapping("/loginPhone")
+    public Result<?> loginPhone(@RequestBody Map<String, String> body) {
+        String phone = body.get("phone");
+        String code = body.get("code");
+
+        //校验验证码
+        boolean verify  = userService.verifyCode(phone, code);
+        if (!verify){
+            return Result.error(ResultCode.SYSTEM_ERROR, "验证码错误或已过期");
+        }
+        //登录
+        UserLoginVO vo = userService.loginByPhone(phone);
+        //将用户登录操作记录到redis中
+        if (vo != null){
+            Long userId = vo.getUserId();
+            dataAnalysisRedisService.recordLoginUserData(userId);
+        }
+        return Result.success(ResultCode.SUCCESS, "登录成功", vo);
+    }
+
+    @GetMapping("/nearby")
+    public Result<List<UserInfoVO>> nearby(@RequestParam(defaultValue = "5") double  distance){
+        // 获取当前线程的用户 ID
+        Long userId = UserContext.getUserId();
+        if (userId == null) {
+            return Result.error(ResultCode.SYSTEM_ERROR, "用户未登录");
+        }
+
+        // 通过 UserID 获取当前用户的经纬度信息
+        UserInfoVO currentUser = userService.getUserInfo(userId);
+        if (currentUser == null) {
+            return Result.error(ResultCode.SYSTEM_ERROR, "用户信息获取失败");
+        }
+
+        // 获取当前用户的经纬度
+        Double latitude = currentUser.getLatitude();
+        Double longitude = currentUser.getLongitude();
+
+        // 检查经纬度是否为空
+        if (latitude == null || longitude == null) {
+            return Result.error(ResultCode.SYSTEM_ERROR, "用户经纬度信息未完善");
+        }
+
+        // 这里可以添加默认值，比如如果 latitude 或 longitude 为 null，则设置为某个默认值（例如 0）
+        latitude = (latitude != null) ? latitude : 0.0;
+        longitude = (longitude != null) ? longitude : 0.0;
+
+        // 查询附近用户
+        List<UserInfoVO> nearbyUsers = userService.findNearbyUsers(latitude, longitude, distance);
+
+        // 返回成功结果
+        return Result.success(ResultCode.SUCCESS, "查询成功", nearbyUsers);
+    }
+
+
     /**
      * 用户注册
      * @param userName 用户名称
@@ -128,6 +216,9 @@ public class UserController {
         if (userLoginVO == null){
             return Result.error(ResultCode.FAIL,"请先注册用户或添加邮箱");
         }
+        //将用户登录操作记录到redis中
+        Long userId = userLoginVO.getUserId();
+        dataAnalysisRedisService.recordLoginUserData(userId);
         return Result.success(ResultCode.SUCCESS,"用户登录成功",userLoginVO);
     }
 

src/main/java/com/bao/dating/controller/text.java

@@ -1,4 +0,0 @@
-package com.bao.dating.controller;
-
-public class text {
-}

src/main/java/com/bao/dating/mapper/CommentsMapper.java

@@ -5,18 +5,18 @@ import com.bao.dating.pojo.entity.Comments;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
-
+@Mapper
 public interface CommentsMapper {
     // 添加评论
-    @Insert("INSERT INTO comments(content, user_id, post_id, created_at) VALUES(#{content}, #{user_id}, #{post_id}, #{created_at})")
+    @Insert("INSERT INTO dating.comments(content, user_id, post_id, created_at) VALUES(#{content}, #{user_id}, #{post_id}, #{created_at})")
     int addComment(Comments comments);
 
     // 删除评论
-    @Delete("DELETE FROM comments WHERE user_id = #{user_id}")
+    @Delete("DELETE FROM dating.comments WHERE user_id = #{user_id}")
     int deleteComments(@Param("user_id") Long user_id);
 
     // 根据动态ID查询评论列表
-    @Select("SELECT * FROM comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
+    @Select("SELECT * FROM dating.comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
     List<Comments> getCommentsByPostId(@Param("post_id") Long post_id);
 
     /**

src/main/java/com/bao/dating/mapper/UserMapper.java

@@ -2,9 +2,12 @@ package com.bao.dating.mapper;
 
 import com.bao.dating.pojo.dto.UserInfoDTO;
 import com.bao.dating.pojo.entity.User;
+import com.bao.dating.pojo.vo.UserInfoVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 用户Mapper
  * @author KilLze
@@ -54,4 +57,15 @@ public interface UserMapper {
      */
     User selectByUserEmailUser(@Param("userEmail") String email);
 
+    User selectByPhone(@Param("phone") String phone);
+
+    /**
+     * 根据经纬度范围查询用户
+     * @param minLat 最小纬度
+     * @param maxLat 最大纬度
+     * @param minLng 最小经度
+     * @param maxLng 最大经度
+     * @return 用户列表
+     */
+    List<UserInfoVO> findByLatLngRange(@Param("minLat") double minLat, @Param("maxLat") double maxLat, @Param("minLng") double minLng, @Param("maxLng") double maxLng);
 }

src/main/java/com/bao/dating/pojo/entity/User.java

@@ -43,4 +43,8 @@ public class User implements Serializable {
     private String userEmail;
 
     private String userPhone;
+
+    private Double latitude;   // 纬度
+
+    private Double longitude;  // 经度
 }

src/main/java/com/bao/dating/pojo/vo/DataAnalysisVO.java

@@ -0,0 +1,11 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class DataAnalysisVO {
+    //所有总数
+    private Long total;
+    //时间段
+    private String timePeriod;
+}

src/main/java/com/bao/dating/pojo/vo/UserInfoVO.java

@@ -24,4 +24,6 @@ public class UserInfoVO implements Serializable {
     private String signature;
     private LocalDateTime updatedAt;
     private LocalDateTime createdAt;
+    private Double latitude;
+    private Double longitude;
 }

src/main/java/com/bao/dating/service/UserService.java

@@ -2,11 +2,12 @@ package com.bao.dating.service;
 
 import com.bao.dating.pojo.dto.UserInfoDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
-import com.bao.dating.pojo.entity.User;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 用户服务接口
  * @author KilLze
@@ -76,4 +77,19 @@ public interface UserService {
      * @return 用户
      */
     UserInfoDTO getUserInfoById(Long userId);
+
+    void sendSmsCode(String phone);
+
+    boolean verifyCode(String phone, String code);
+
+    UserLoginVO loginByPhone(String phone);
+
+    /**
+     * 获取指定经纬度范围内的用户
+     * @param lat 用户纬度
+     * @param lng 用户经度
+     * @param radiusKm 半径 km
+     * @return 用户列表
+     */
+    List<UserInfoVO> findNearbyUsers(double lat,double lng,double  radiusKm);
 }

src/main/java/com/bao/dating/service/impl/UserServiceImpl.java

@@ -1,10 +1,9 @@
 package com.bao.dating.service.impl;
 
-import com.bao.dating.common.Result;
-import com.bao.dating.common.ResultCode;
 import com.bao.dating.common.aliyun.AliOssUtil;
 import com.bao.dating.common.aliyun.GreenImageScan;
 import com.bao.dating.common.aliyun.GreenTextScan;
+import com.bao.dating.common.aliyun.SmsUtil;
 import com.bao.dating.common.result.AliOssResult;
 import com.bao.dating.common.result.GreenAuditResult;
 import com.bao.dating.context.UserContext;
@@ -16,6 +15,8 @@ import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
 import com.bao.dating.service.VerificationCodeService;
+import com.bao.dating.util.*;
+import com.bao.dating.util.CodeUtil;
 import com.bao.dating.util.FileUtil;
 import com.bao.dating.util.JwtUtil;
 import com.bao.dating.util.MD5Util;
@@ -23,6 +24,7 @@ import io.jsonwebtoken.Claims;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -39,6 +41,10 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class UserServiceImpl implements UserService {
 
+
+    @Autowired
+    private SmsUtil smsUtil;
+
     @Autowired
     private AliOssUtil ossUtil;
 
@@ -54,6 +60,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
     @Autowired
     private VerificationCodeService verificationCodeService;
 
@@ -230,6 +239,7 @@ public class UserServiceImpl implements UserService {
         }
     }
 
+
     /**
      * 更新用户信息
      *
@@ -317,6 +327,7 @@ public class UserServiceImpl implements UserService {
         return userInfoVO;
     }
 
+
     /**
      * 用户注册
      * @param userName 用户名称
@@ -359,11 +370,13 @@ public class UserServiceImpl implements UserService {
     @Override
     public UserLoginVO emailLogin(String email, String code) {
         User user = userMapper.selectByUserEmailUser(email);
-        if (user == null)
+        if (user == null) {
             return null;
+        }
         boolean flag = verificationCodeService.verifyEmailCode(email, code);
-        if (!flag)
+        if (!flag) {
             return null;
+        }
         // 生成token
         String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
         UserLoginVO userLoginVO = new UserLoginVO();
@@ -391,4 +404,85 @@ public class UserServiceImpl implements UserService {
         dto.setNickname(user.getNickname());
         return dto;
     }
+
+    // 发送短信验证码
+    @Override
+    public void sendSmsCode(String phone) {
+        //防刷：60 秒内只能发一次
+        String key = "sms:code:" + phone;
+        Boolean exists  = stringRedisTemplate.hasKey(key);
+        if (Boolean.TRUE.equals(exists)){
+            throw new RuntimeException("请勿频繁发送验证码");
+        }
+
+        // 生成验证码
+        String code = CodeUtil.generateCode();
+        // 发送短信
+        smsUtil.sendVerificationCode(phone, code);
+        //存 Redis（5分钟过期）
+        stringRedisTemplate.opsForValue()
+                .set(key,code, 5, TimeUnit.MINUTES);
+    }
+
+    // 校验验证码
+    @Override
+    public boolean verifyCode(String phone, String code) {
+
+        String key = "sms:code:" + phone;
+        String realCode  = stringRedisTemplate.opsForValue().get(key);
+        //过期，未发送
+        if (realCode ==null){
+            return false;
+        }
+        //不匹配
+        if (!realCode.equals(code)){
+            return false;
+        }
+        // 校验成功，删除验证码（一次性）
+        stringRedisTemplate.delete(key);
+        return true;
+    }
+
+    @Override
+    public UserLoginVO loginByPhone(String phone) {
+        //根据手机号查询用户
+        User user = userMapper.selectByPhone(phone);
+        //创建token
+        String token = JwtUtil.generateToken(user.getUserId().toString());
+        //封装返回结果
+        UserLoginVO VO = new UserLoginVO();
+        VO.setUserId(user.getUserId());
+        VO.setToken(token);
+        return VO;
+
+    }
+
+    @Override
+    public List<UserInfoVO> findNearbyUsers(double lat, double lng, double radiusKm) {
+       //先用经纬度范围筛选（矩形框，提高性能）
+        double delta = radiusKm / 111.0; // 1° ≈ 111km
+        double minLat = lat - delta;// 最小纬度
+        double maxLat = lat + delta;// 最大纬度
+        double minLng = lng - delta;// 最小经度
+        double maxLng = lng + delta;// 最大经度
+
+        // 打印经纬度范围
+        System.out.println("Min Latitude: " + minLat + ", Max Latitude: " + maxLat);
+        System.out.println("Min Longitude: " + minLng + ", Max Longitude: " + maxLng);
+
+        List<UserInfoVO> byLatLngRange = userMapper.findByLatLngRange(minLat, maxLat, minLng, maxLng);
+
+        //精确计算距离，筛选在半径内的用户
+        List<UserInfoVO> result = new ArrayList<>();
+        for (UserInfoVO u:byLatLngRange){
+            // 检查用户是否有经纬度信息
+            if (u.getLatitude() != null && u.getLongitude() != null) {
+                double distance  = DistanceUtil.calculate(lat, lng, u.getLatitude(), u.getLongitude());
+                if (distance <= radiusKm){
+                    result.add(u);
+                }
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/bao/dating/util/CodeUtil.java

@@ -0,0 +1,12 @@
+package com.bao.dating.util;
+
+import java.util.Random;
+
+public class CodeUtil {
+    // 生成6位数字验证码
+    public static String generateCode() {
+        Random random = new Random();
+        int code=100000+random.nextInt(900000);
+        return String.valueOf(code);
+    }
+}

src/main/java/com/bao/dating/util/DataAnalysisRedisService.java

@@ -0,0 +1,101 @@
+package com.bao.dating.util;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 基于redis的数据分析工具 -统计动态总数和登录人数
+ */
+@Component
+public class DataAnalysisRedisService {
+    // Redis Key 定义
+    //动态总数
+    private static final String REDIS_KEY_POST_TOTAL = "data:post:total";
+    //活跃人数
+    private static final String REDIS_KEY_LOGIN_USER_TOTAL = "data:loginUser:total";
+
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    /**
+     * 记录动态向redis中添加数据
+     * @param postId 动态id
+     */
+    public void recordPostData(Long postId) {
+        // 获取当前毫秒级时间戳（作为Sorted Set的score）
+        long currentTimestamp = System.currentTimeMillis();
+        // 1. 记录动态数据
+        redisTemplate.opsForZSet().add(REDIS_KEY_POST_TOTAL, postId, currentTimestamp);
+        // 可选：设置Key的过期时间（1年+1天，避免数据无限累积）
+        setKeyExpire(REDIS_KEY_POST_TOTAL);
+    }
+
+    /**
+     * 记录动态向redis中添加数据
+     * @param userId 用户id
+     */
+    public void recordLoginUserData(Long userId) {
+        // 获取当前毫秒级时间戳（作为Sorted Set的score）
+        long currentTimestamp = System.currentTimeMillis();
+        // 1. 记录动态数据
+        redisTemplate.opsForZSet().add(REDIS_KEY_LOGIN_USER_TOTAL, userId, currentTimestamp);
+        // 可选：设置Key的过期时间（1年+1天，避免数据无限累积）
+        setKeyExpire(REDIS_KEY_LOGIN_USER_TOTAL);
+    }
+
+    /**
+     * 设置Redis Key的过期时间（1年+1天，确保1年内的数据都能被查询）
+     */
+    private void setKeyExpire(String redisKey) {
+        if (Boolean.FALSE.equals(redisTemplate.hasKey(redisKey))) {
+            redisTemplate.expire(redisKey, 366, TimeUnit.DAYS);
+        }
+    }
+
+    /**
+     * 统计指定时间段内发布的动态
+     * @param days 指定时间段
+     * @return 总数
+     */
+    public Long countPostTotalByDays(int days) {
+        // 1. 计算时间范围：结束时间=当前时间，起始时间=当前时间 - N天的毫秒数
+        long endTimestamp = System.currentTimeMillis();
+        long startTimestamp = endTimestamp - (long) days * 24 * 60 * 60 * 1000;
+        // 2.  key min max - 统计指定score范围内的成员数量（高效，直接返回数量）
+        return redisTemplate.opsForZSet().count(REDIS_KEY_POST_TOTAL, startTimestamp, endTimestamp);
+    }
+
+    public Long countLoginUserTotalByDays(int days) {
+        // 1. 计算时间范围：结束时间=当前时间，起始时间=当前时间 - N天的毫秒数
+        long endTimestamp = System.currentTimeMillis();
+        long startTimestamp = endTimestamp - (long) days * 24 * 60 * 60 * 1000;
+        // 2. key min max - 统计指定score范围内的成员数量（高效，直接返回数量）
+        return redisTemplate.opsForZSet().count(REDIS_KEY_LOGIN_USER_TOTAL, startTimestamp, endTimestamp);
+    }
+
+    /**
+     * 核心方法：传入当前时间，返回各时间段的结果
+     * @param currentDateTime 当前时间（LocalDateTime类型，可直接通过LocalDateTime.now()获取）
+     */
+    public  String calculateTimeRanges(LocalDateTime currentDateTime,int days) {
+        // 1. 计算各时间段的起始时间（当前时间往前推对应时长）
+        LocalDateTime sevenDaysAgo = currentDateTime.minusDays(7);
+        LocalDateTime fifteenDaysAgo = currentDateTime.minusDays(15);
+        LocalDateTime thirtyDaysAgo = currentDateTime.minusDays(30);
+        LocalDateTime oneYearAgo = currentDateTime.minusYears(1);
+        if (days == 7)
+            return sevenDaysAgo + " - " + currentDateTime;
+        if (days == 15)
+            return fifteenDaysAgo + " - " + currentDateTime;
+        if (days == 30)
+            return thirtyDaysAgo + " - " + currentDateTime;
+        if (days == 365)
+            return oneYearAgo + " - " + currentDateTime;
+        return null;
+    }
+
+}

src/main/java/com/bao/dating/util/DistanceUtil.java

@@ -0,0 +1,29 @@
+package com.bao.dating.util;
+
+//Haversine 公式（标准写法）
+
+public class DistanceUtil {
+    private static final double EARTH_RADIUS = 6371.0; // 地球半径 km
+
+    /**
+     * 计算两点之间距离（单位：km）
+     */
+    public static double calculate(
+            double lat1, double lon1,
+            double lat2, double lon2) {
+
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+
+        lat1 = Math.toRadians(lat1);
+        lat2 = Math.toRadians(lat2);
+
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+                + Math.cos(lat1) * Math.cos(lat2)
+                * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+        return EARTH_RADIUS * c;
+    }
+}

src/main/resources/com/bao/dating/mapper/UserMapper.xml

@@ -32,6 +32,8 @@
         <result property="signature" column="signature"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
+        <result property="latitude" column="user_latitude"/>
+        <result property="longitude" column="user_longitude"/>
     </resultMap>
     <select id="selectByUserId" resultMap="UserResultMap">
         SELECT
@@ -45,8 +47,10 @@
             hobbies,
             signature,
             created_at,
-            updated_at
-            FROM user WHERE user_id = #{userId}
+            updated_at,
+            user_latitude,
+            user_longitude
+        FROM dating.user WHERE user_id = #{userId}
     </select>
 
     <!-- 查询最大用户id -->
@@ -89,5 +93,42 @@
         WHERE user_id = #{userId}
     </update>
 
+    <select id="selectByPhone" resultType="com.bao.dating.pojo.entity.User">
+        select * from dating.user where user_phone =#{phone}
+    </select>
+    <resultMap id="UserInfoVOResultMap" type="com.bao.dating.pojo.vo.UserInfoVO">
+        <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickname" column="nickname"/>
+        <result property="avatarUrl" column="avatar_url"/>
+        <result property="backgroundUrl" column="background_url"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+        <result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToJsonTypeHandler"/>
+        <result property="signature" column="signature"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+        <result property="latitude" column="user_latitude"/>
+        <result property="longitude" column="user_longitude"/>
+    </resultMap>
+
+    <select id="findByLatLngRange" resultMap="UserInfoVOResultMap">
+        SELECT
+            user_id,
+            user_name,
+            nickname,
+            avatar_url,
+            background_url,
+            gender,
+            birthday,
+            hobbies,
+            signature,
+            created_at,
+            updated_at,
+            user_latitude,
+            user_longitude
+        FROM user WHERE user_latitude BETWEEN #{minLat} AND #{maxLat} AND user_longitude BETWEEN #{minLng} AND #{maxLng}
+    </select>
+
 
 </mapper>