合并代码

Pu Zhibing

2024-11-25 fa0d88157a1fd5e916e93d66472188571433162a

合并代码

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BaseTable.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.common.core.web.page;

import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 10:45
 */
@Data
public class BaseTable<T> implements Serializable {
    /** 总记录数 */
    private long total;
	
    /** 列表数据 */
    private List<T> rows;
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -1,8 +1,13 @@
package com.ruoyi.account.controller;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BaseTable;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -15,8 +20,70 @@
@RestController
@RequestMapping("/app-user")
public class AppUserController {



	
	
	
	
	
	
    @ResponseBody
    @PostMapping("/appletLogin")
    @ApiOperation(value = "小程序一键登录", tags = {"登录注册-小程序"})
    public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
        // todo 待完善 pu
        return AjaxResult.success();
    }
	
	
    @ResponseBody
    @PostMapping("/mobileLogin")
    @ApiOperation(value = "手机号登录", tags = {"登录注册-小程序"})
    public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
        // todo 待完善 pu
        return AjaxResult.success();
    }
	
	
	
    @ResponseBody
    @PostMapping("/getSMSCode")
    @ApiOperation(value = "获取短信验证码", tags = {"登录注册-小程序"})
    public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
        // todo 待完善 pu
        return AjaxResult.success();
    }
	
	
	
    @ResponseBody
    @PostMapping("/registerAccount")
    @ApiOperation(value = "注册新账号", tags = {"登录注册-小程序"})
    public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
        // todo 待完善 pu
        return AjaxResult.success();
    }
	
	
    @ResponseBody
    @GetMapping("/getReferrer/{id}")
    @ApiOperation(value = "获取推荐人信息", tags = {"登录注册-小程序"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
    })
    public AjaxResult<String> getReferrer(@PathVariable("id") Long id){
        // todo 待完善 pu
        return AjaxResult.success();
    }
	
	
	
    @ResponseBody
    @GetMapping("/getNearbyReferrer")
    @ApiOperation(value = "获取附近推荐人列表", tags = {"登录注册-小程序"})
    public AjaxResult<BaseTable<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer){
        // todo 待完善 pu
        return AjaxResult.success();
    }
	
}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/LoginVo.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.account.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 9:39
 */
@Data
@ApiModel
public class LoginVo {
    @ApiModelProperty("token")
    private String token;
    @ApiModelProperty("失效时间(秒)")
    private Long failureTime;
    @ApiModelProperty("跳转页面（1=首页，2=注册页）")
    private Integer skipPage;
    @ApiModelProperty("微信解密的手机号")
    private String phone;
    @ApiModelProperty("是否首次登录")
    private Boolean firstTime;
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/MobileLogin.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.account.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 9:48
 */
@Data
@ApiModel
public class MobileLogin {
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("短信验证码")
    private String code;
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrer.java

New file
@@ -0,0 +1,22 @@
package com.ruoyi.account.vo;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 10:36
 */
@Data
@ApiModel
public class NearbyReferrer extends BasePage {
    @ApiModelProperty(value = "经度", required = true)
    private String longitude;
    @ApiModelProperty(value = "纬度", required = true)
    private String latitude;
    @ApiModelProperty(value = "搜索内容", required = false)
    private String name;
	
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/NearbyReferrerVo.java

New file
@@ -0,0 +1,26 @@
package com.ruoyi.account.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 10:42
 */
@Data
@ApiModel
public class NearbyReferrerVo {
    @ApiModelProperty("id")
    private String id;
    @ApiModelProperty("头像")
    private String avatar;
    @ApiModelProperty("姓名")
    private String name;
    @ApiModelProperty("会员类型名称")
    private String vip;
    @ApiModelProperty("距离（km）")
    private BigDecimal distance;
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/RegisterAccount.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.account.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 10:03
 */
@Data
@ApiModel
public class RegisterAccount {
    @ApiModelProperty(value = "推广人id", required = false)
    private Long promoter;
    @ApiModelProperty(value = "头像", required = true)
    private String avatar;
    @ApiModelProperty(value = "姓名", required = true)
    private String name;
    @ApiModelProperty(value = "手机号", required = true)
    private String phone;
    @ApiModelProperty(value = "短信验证码", required = true)
    private String code;
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/SMSCode.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.account.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/11/25 9:53
 */
@Data
@ApiModel
public class SMSCode {
    @ApiModelProperty("类型（1=登录注册）")
    private Integer type;
    @ApiModelProperty("手机号")
    private String phone;
}