调整配置

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/controller/CenterRoleController.java

@@ -3,11 +3,8 @@ package org.nafmii.webcenter.user.controller;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.nafmii.webcenter.user.dto.CenterRoleDto;
 import org.nafmii.webcenter.user.param.*;
 import org.nafmii.webcenter.user.service.ICenterRoleService;
-import org.nafmii.webcenter.user.vo.CenterRoleVO;
-import org.nafmii.webcenter.user.vo.CenterUserAndRoleVo;
 import org.nafmii.webcenter.user.vo.RoleListVo;
 import org.nafmii.common.param.BeanTransferUtils;
 import org.nafmii.common.param.PageResult;
@@ -16,7 +13,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * <p>

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/controller/CenterUserController.java

@@ -3,13 +3,16 @@ package org.nafmii.webcenter.user.controller;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.nafmii.webcenter.user.param.AddOrUpdateUserParam;
+import org.nafmii.common.param.IdQuery;
+import org.nafmii.webcenter.user.dto.AddCenterUserDto;
+import org.nafmii.webcenter.user.dto.ModifyCenterUserDto;
+import org.nafmii.webcenter.user.param.AddCenterUserParam;
 import org.nafmii.webcenter.user.param.LoginParam;
+import org.nafmii.webcenter.user.param.ModifyCenterUserParam;
 import org.nafmii.webcenter.user.param.QueryUsersParam;
 import org.nafmii.webcenter.user.param.SwitchStatusParam;
 import org.nafmii.webcenter.user.service.ICenterUserService;
 import org.nafmii.webcenter.user.vo.CenterUserAndRoleVo;
-import org.nafmii.webcenter.user.vo.CenterUserVO;
 import org.nafmii.common.param.BeanTransferUtils;
 import org.nafmii.common.param.PageResult;
 import org.nafmii.common.response.ApiResponse;
@@ -18,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 /**
  * <p>
@@ -35,26 +37,45 @@ public class CenterUserController {
     @Resource
     private ICenterUserService centerUserService;
 
-    @ApiOperation( value = "中心端用户登陆",notes = "中心端用户登陆")
+    @ApiOperation( value = "中心端登陆",notes = "中心端登陆")
     @PostMapping("/login")
     @ResponseBody
     public ApiResponse login (@RequestBody @Validated LoginParam param, HttpServletRequest request){
-        ApiResponse login = centerUserService.userLogin(param,request);
-        return login;
+
+        return new ApiResponse(centerUserService.userLogin(param,request));
     }
 
-    @ApiOperation( value = "中心端新建或编辑用户接口",notes = "中心端新建或编辑用户接口")
-    @PostMapping("/addOrUpdateUser")
+    @ApiOperation( value = "中心端新建用户",notes = "中心端新建用户")
+    @PostMapping("/addCenterUser")
+    @ResponseBody
+    public ApiResponse addCenterUser (@RequestBody @Validated AddCenterUserParam param){
+
+        AddCenterUserDto dto = BeanTransferUtils.transfer(param,AddCenterUserDto.class);
+
+        return centerUserService.addCenterUser(dto);
+    }
+    @ApiOperation( value = "中心端新建用户",notes = "中心端新建用户")
+    @GetMapping("/getCenterUser")
     @ResponseBody
-    public ApiResponse addOrUpdateUser (@RequestBody @Validated AddOrUpdateUserParam param){
-        ApiResponse user = centerUserService.addOrUpdateUser(param);
-        return user;
+    public ApiResponse getCenterUser ( @Validated IdQuery query){
+
+//        AddCenterUserDto dto = BeanTransferUtils.transfer(param,AddCenterUserDto.class);
+
+        return new ApiResponse();
     }
+    @ApiOperation( value = "中心端编辑用户",notes = "中心端编辑用户")
+    @PostMapping("/modifyCenterUser")
+    @ResponseBody
+    public ApiResponse modifyCenterUser (@RequestBody @Validated ModifyCenterUserParam param){
 
-    @ApiOperation( value = "中心端用户",notes = "中心端用户")
-    @PostMapping("/queryUser")
+        ModifyCenterUserDto dto = BeanTransferUtils.transfer(param,ModifyCenterUserDto.class);
+
+        return centerUserService.modifyCenterUser(dto);
+    }
+    @ApiOperation( value = "中心端用户列表",notes = "中心端用户列表")
+    @PostMapping("/queryUserList")
     @ResponseBody
-    public ApiResponse queryUser (@RequestBody QueryUsersParam param){
+    public ApiResponse queryUserList (@RequestBody QueryUsersParam param){
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
         PageResult<CenterUserAndRoleVo> result =
                 BeanTransferUtils.toPagedResult(centerUserService.queryUser(param),CenterUserAndRoleVo.class);

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/AddOrUpdateUserParam.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/user/dto/AddCenterUserDto.java

-package org.nafmii.webcenter.user.param;
+package org.nafmii.webcenter.user.dto;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * @author:zhoujh
  * @Function:TODO
- * @date 2021/5/12 14:18
+ * @date 2021/5/12 14:29
  * @ClassName:
  * @version:
  * @remark:
  */
 @Data
-@ApiModel(value="新建或编辑用户参数对象")
-public class AddOrUpdateUserParam {
-    @ApiModelProperty("中心端主键id：编辑时传入")
-    private Long id;
+public class AddCenterUserDto {
 
     @ApiModelProperty("账号")
-    @NotNull
     private String loginName;
 
     @ApiModelProperty("登陆密码")
-    @NotNull
     private String loginPwd;
 
     @ApiModelProperty("中文姓名")
-    @NotNull
     private String cnName;
 
     @ApiModelProperty("英文姓名")
-    @NotNull
     private String enNAme;
 
     @ApiModelProperty("角色id")
-    @NotNull
     private Long roleId;
 
     @ApiModelProperty("手机号")
-    private String phone;
+    private String Phone;
 
     @ApiModelProperty("0 有效 1 无效")
-    @NotNull
-    private String isEnable;
-//
-//    @ApiModelProperty("创建人id")
-//    private Long userId;
-
+    private String isEnable ;
 
+    @ApiModelProperty("邮箱")
+    private String email;
 
 
 }

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/dto/AddOrUpdateUserDto.java → nafmii-web-center/src/main/java/org/nafmii/webcenter/user/dto/ModifyCenterUserDto.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * @remark:
  */
 @Data
-public class AddOrUpdateUserDto {
+public class ModifyCenterUserDto {
     @ApiModelProperty("中心端用户id：编辑时传入")
     private Long id;
 
@@ -35,10 +35,10 @@ public class AddOrUpdateUserDto {
     private String Phone;
 
     @ApiModelProperty("0 有效 1 无效")
-    private String isEnable;
+    private String isEnable ;
 
-//    @ApiModelProperty("创建人id")
-//    private Long userId;
+    @ApiModelProperty("邮箱")
+    private String email;
 
 
 }

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/entity/CenterUserPO.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -74,11 +76,11 @@ public class CenterUserPO extends Model {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("CREATE_TIME")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
     @TableField("UPDATE_TIME")
-    private LocalDateTime updateTime;
+    private Date updateTime  ;
 
     @ApiModelProperty(value = "0 有效 1 无效")
     @TableField("IS_ENABLE")

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/entity/CenterUserRolePO.java

@@ -10,6 +10,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * <p>
  * 中心端用户角色关系表
@@ -41,7 +43,9 @@ public class CenterUserRolePO extends Model {
 
     @ApiModelProperty(value = "活动标识  0 有效 1 无效活动标识  0 有效 1 无效")
     @TableField("IS_ENABLE")
-    private String isEnable;
-
+    private String isEnable = "0";
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
 
 }

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/AddCenterUserParam.java

+package org.nafmii.webcenter.user.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author:zhoujh
+ * @date 2021/5/12
+ */
+@Data
+@ApiModel(value="新建用户参数对象")
+public class AddCenterUserParam {
+
+    @ApiModelProperty("账号")
+    @NotBlank(message = "登录账号不能为空")
+    private String loginName;
+
+    @ApiModelProperty("登陆密码")
+    @NotBlank(message = "登录密码不能为空")
+    private String loginPwd;
+
+    @ApiModelProperty("姓名")
+    @NotBlank(message = "姓名不能为空")
+    private String cnName;
+
+    @ApiModelProperty("英文姓名")
+    private String enName;
+
+    @ApiModelProperty("角色id")
+    @NotNull(message = "角色信息不能为空")
+    private Long roleId;
+
+    @ApiModelProperty("手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    @ApiModelProperty("邮箱地址")
+    @NotBlank(message = "邮箱不能为空")
+    @Email(message = "邮箱格式错误")
+    private String email;
+
+    @ApiModelProperty("启用状态")
+    @Pattern(message = "启用状态错误", regexp = "[0|1]")
+    private String isEnable;
+
+
+
+}

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/GroupOne.java

+package org.nafmii.webcenter.user.param;
+
+/**
+ * @author lvyp
+ * @date 2021/5/25
+ */
+public interface GroupOne {
+}

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/GroupTwo.java

+package org.nafmii.webcenter.user.param;
+
+/**
+ * @author lvyp
+ * @date 2021/5/25
+ */
+public class GroupTwo {
+}

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/LoginParam.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -19,12 +20,14 @@ import javax.validation.constraints.NotNull;
 public class LoginParam {
 
     @ApiModelProperty("账号")
-    @NotNull(message = "登录账号不能为空")
+    @NotBlank(message = "登录账号不能为空")
     private String loginName;
+
     @ApiModelProperty("登陆密码")
-    @NotNull(message = "密码不能为空")
+    @NotBlank(message = "密码不能为空")
     private String loginPwd;
-    @ApiModelProperty("验证码")
-    @NotNull(message = "验证码不能为空")
-    private String captcha;
+
+//    @ApiModelProperty("验证码")
+//    @NotBlank(message = "验证码不能为空")
+//    private String captcha;
 }

nafmii-web-center/src/main/java/org/nafmii/webcenter/user/param/ModifyCenterUserParam.java

+package org.nafmii.webcenter.user.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author:zhoujh
+ * @date 2021/5/12
+ */
+@Data
+@ApiModel(value="编辑用户参数对象")
+public class ModifyCenterUserParam {
+    @ApiModelProperty("用户主键")
+    @NotNull(message = "用户主键不能为空")
+    private Long id;
+
+    @ApiModelProperty("账号")
+    @NotBlank(message = "登录账号不能为空")
+    private String loginName;
+
+    @ApiModelProperty("登陆密码")
+    @NotBlank(message = "登录密码不能为空")
+    private String loginPwd;
+
+    @ApiModelProperty("姓名")
+    @NotBlank(message = "姓名不能为空")
+    private String cnName;
+
+    @ApiModelProperty("英文姓名")
+    private String enName;
+
+    @ApiModelProperty("角色id")
+    @NotNull(message = "角色信息不能为空")
+    private Long roleId;
+
+    @ApiModelProperty("手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    @ApiModelProperty("邮箱地址")
+    @NotBlank(message = "邮箱不能为空")
+    private String email;
+
+    @ApiModelProperty("启用状态")
+    @Pattern(message = "启用状态错误", regexp = "[0|1]")
+    private String isEnable;
+
+
+
+
+
+}