huanghongfa
2020-12-19 3dcf05955b72998d60a86c5b4ab7c5ca5caa2a62
修改部分数据
7个文件已修改
2个文件已添加
66 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/exceptions/GlobalExceptionCapture.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActVO.class 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/UserPhoneVO.class 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/validated/AddGroup.class 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -3,8 +3,10 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -24,7 +26,7 @@
    @ApiOperation("新增社区")
    @PostMapping("community")
    public R addCommunity(@RequestBody ComActVO comActVO){
    public R addCommunity(@RequestBody @Validated(AddGroup.class) ComActVO comActVO){
       return communityService.addCommunity(comActVO);
    }
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/exceptions/GlobalExceptionCapture.java
@@ -1,11 +1,19 @@
package com.panzhihua.applets_backstage.exceptions;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.exceptions.TokenException;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.exceptions.UnAuthorizationException;
import com.panzhihua.common.model.vos.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -13,6 +21,7 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-25 14:36
 **/
@Slf4j
@RestControllerAdvice
public class GlobalExceptionCapture {
    /**
@@ -46,12 +55,33 @@
    }
    /**
     * 校验异常
     * @param ex valid
     * @return 返回json
     */
    @ExceptionHandler(value = MethodArgumentNotValidException.class)
    public R methodArgumentNotValidException(MethodArgumentNotValidException ex) {
        BindingResult result = ex.getBindingResult();
        StringBuilder errorMessage = new StringBuilder();
        if (result.hasErrors()) {
            List<ObjectError> errors = result.getAllErrors();
            errors.forEach(p ->{
                FieldError fieldError = (FieldError) p;
                errorMessage.append(fieldError.getDefaultMessage());
                errorMessage.append("  ");
            });
        }
        return R.fail(HttpStatus.BAD_REQUEST,errorMessage.toString());
    }
    /**
     * 全局异常捕捉处理
     * @param ex 所有运行时异常
     * @return R 500
     */
    @ExceptionHandler(value = Exception.class)
    public R errorHandler(Exception ex) {
        log.error("捕获全局异常【{}】",ex.getMessage());
        return R.fail();
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
@@ -1,9 +1,12 @@
package com.panzhihua.common.model.vos.community;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
@@ -20,42 +23,54 @@
    private Long communityId;
    @ApiModelProperty("社区名字")
    @NotBlank(groups = {AddGroup.class},message = "社区名字不能为空")
    private String name;
    @ApiModelProperty("社区地址")
    @NotBlank(groups = {AddGroup.class},message = "社区地址不能为空")
    private String address;
    @ApiModelProperty("经度")
    @NotBlank(groups = {AddGroup.class},message = "经度不能为空")
    private String lng;
    @ApiModelProperty("维度")
    @NotBlank(groups = {AddGroup.class},message = "纬度不能为空")
    private String lat;
    @ApiModelProperty("创建时间")
    private Date createAt;
    @ApiModelProperty("省份地址编码")
    @NotBlank(groups = {AddGroup.class},message = "省份地址编码不能为空")
    private String provinceCode;
    @ApiModelProperty("市级地址编码")
    @NotBlank(groups = {AddGroup.class},message = "市级地址编码不能为空")
    private String cityCode;
    @ApiModelProperty("区级地址编码")
    @NotBlank(groups = {AddGroup.class},message = "区级地址编码不能为空")
    private String areaCode;
    @ApiModelProperty("社区面积")
    @Min(value =1,groups = {AddGroup.class},message = "社区面积不能为空")
    private Double square;
    @ApiModelProperty("联系人")
    @NotBlank(groups = {AddGroup.class},message = "联系人不能为空")
    private String contacts;
    @ApiModelProperty("联系人电话")
    @NotBlank(groups = {AddGroup.class},message = "联系人电话不能为空")
    private String contactsPhone;
    @ApiModelProperty("超管账号")
    @NotBlank(groups = {AddGroup.class},message = "超管账号不能为空")
    private String account;
    @ApiModelProperty("账号密码")
    @NotBlank(groups = {AddGroup.class},message = "账号密码不能为空")
    private String password;
    @ApiModelProperty(value = "状态 0 启用 1 禁用",example = "0")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 修改手机号
@@ -12,7 +14,8 @@
 **/
@Data
@ApiModel("修改手机号")
public class UserPhoneVO {
public class
UserPhoneVO {
    @ApiModelProperty("老手机号")
    private String oldPhone;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java
New file
@@ -0,0 +1,10 @@
package com.panzhihua.common.validated;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 新增校验组
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-18 17:35
 **/
public interface AddGroup {
}
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActVO.class
Binary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/UserPhoneVO.class
Binary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/validated/AddGroup.class
Binary files differ
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java
@@ -13,7 +13,7 @@
 * @create: 2020-12-14 16:51
 **/
@Data
@TableName("sys_user")
@TableName("com_mng_family_info")
public class ComMngFamilyInfoDO implements Serializable {
    private static final long serialVersionUID = 1L;