提交 4731a5ba 作者: 张小凤

UserMessage(add)

上级 28c2f9d8
...@@ -6,6 +6,8 @@ import lombok.Builder; ...@@ -6,6 +6,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/** /**
* @Author small * @Author small
* @Date 2023/9/14 20:03 * @Date 2023/9/14 20:03
...@@ -37,10 +39,10 @@ public class UserMessageQO { ...@@ -37,10 +39,10 @@ public class UserMessageQO {
private String briefIntroduction; private String briefIntroduction;
@ApiModelProperty(value = "经度",example = "78.321313") @ApiModelProperty(value = "经度",example = "78.321313")
private Double longitude; private BigDecimal longitude;
@ApiModelProperty(value = "纬度",example = "67.213131") @ApiModelProperty(value = "纬度",example = "67.213131")
private Double latitude; private BigDecimal latitude;
......
...@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; ...@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -79,4 +80,17 @@ public class UserAccountVO implements Serializable { ...@@ -79,4 +80,17 @@ public class UserAccountVO implements Serializable {
private Integer xzAuthStatus; private Integer xzAuthStatus;
@ApiModelProperty(value = "是否关注公众号") @ApiModelProperty(value = "是否关注公众号")
private Integer subStatus; private Integer subStatus;
@ApiModelProperty(value = "经度")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
@ApiModelProperty(value = "地区")
private String region;
@ApiModelProperty(value = "个人简介")
private String briefIntroduction;
@ApiModelProperty(value = "封面背景图")
private String coverPicture;
} }
...@@ -160,7 +160,7 @@ public class UserAccountController extends BaseController { ...@@ -160,7 +160,7 @@ public class UserAccountController extends BaseController {
return userAccountService.updatePhoneNum(userAccountId, verifyCode); return userAccountService.updatePhoneNum(userAccountId, verifyCode);
} }
@ApiOperation(value = "修改用户信息") @ApiOperation(value = "new_修改用户信息")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/appUpdateUser") @PostMapping("/appUpdateUser")
public ResultBody appUpdateUser(@RequestBody UserMessageQO userMessageQO){ public ResultBody appUpdateUser(@RequestBody UserMessageQO userMessageQO){
......
...@@ -4,12 +4,14 @@ import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO; ...@@ -4,12 +4,14 @@ import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
import com.mmc.iuav.user.model.vo.BUserAccountVO; import com.mmc.iuav.user.model.vo.BUserAccountVO;
import com.mmc.iuav.user.model.vo.TopInviteVO; import com.mmc.iuav.user.model.vo.TopInviteVO;
import com.mmc.iuav.user.model.vo.UserAccountVO; import com.mmc.iuav.user.model.vo.UserAccountVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -79,6 +81,19 @@ public class UserAccountDO implements Serializable { ...@@ -79,6 +81,19 @@ public class UserAccountDO implements Serializable {
private Integer totalPoints; private Integer totalPoints;
@ApiModelProperty(value = "经度")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
@ApiModelProperty(value = "地区")
private String region;
@ApiModelProperty(value = "个人简介")
private String briefIntroduction;
@ApiModelProperty(value = "封面背景图")
private String coverPicture;
public UserAccountDO(UserAccountVO userAccountVO) { public UserAccountDO(UserAccountVO userAccountVO) {
this.id = userAccountVO.getId(); this.id = userAccountVO.getId();
this.phoneNum = userAccountVO.getPhoneNum(); this.phoneNum = userAccountVO.getPhoneNum();
...@@ -116,6 +131,11 @@ public class UserAccountDO implements Serializable { ...@@ -116,6 +131,11 @@ public class UserAccountDO implements Serializable {
.xzAuthStatus(this.xzAuthStatus) .xzAuthStatus(this.xzAuthStatus)
.auditStatus(this.auditStatus) .auditStatus(this.auditStatus)
.totalPoints(this.totalPoints) .totalPoints(this.totalPoints)
.longitude(this.longitude)
.latitude(this.latitude)
.region(this.region)
.briefIntroduction(this.briefIntroduction)
.coverPicture(this.coverPicture)
.build(); .build();
} }
......
...@@ -140,7 +140,12 @@ ...@@ -140,7 +140,12 @@
ua.create_time, ua.create_time,
ua.update_time, ua.update_time,
pc.audit_status, pc.audit_status,
up.total_points up.total_points,
ua.longitude,
ua.latitude,
ua.region,
ua.brief_introduction,
ua.cover_picture
FROM user_account ua FROM user_account ua
LEFT JOIN pilot_certification pc ON pc.user_account_id = ua.id LEFT JOIN pilot_certification pc ON pc.user_account_id = ua.id
LEFT JOIN user_points up ON up.user_account_id = ua.id LEFT JOIN user_points up ON up.user_account_id = ua.id
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论