|
@@ -2,6 +2,7 @@ package com.miaxis.app.controller.user;
|
|
|
|
|
|
import com.miaxis.app.user.domain.UserInfo;
|
|
import com.miaxis.app.user.domain.UserInfo;
|
|
import com.miaxis.app.user.domain.dto.UserDto;
|
|
import com.miaxis.app.user.domain.dto.UserDto;
|
|
|
|
+import com.miaxis.app.user.domain.vo.UserVo;
|
|
import com.miaxis.app.user.service.IUserInfoService;
|
|
import com.miaxis.app.user.service.IUserInfoService;
|
|
import com.miaxis.common.aliyunOSS.AliyunConfig;
|
|
import com.miaxis.common.aliyunOSS.AliyunConfig;
|
|
import com.miaxis.common.aliyunOSS.AliyunUpload;
|
|
import com.miaxis.common.aliyunOSS.AliyunUpload;
|
|
@@ -10,7 +11,6 @@ import com.miaxis.common.constant.Constants;
|
|
import com.miaxis.common.core.controller.BaseController;
|
|
import com.miaxis.common.core.controller.BaseController;
|
|
import com.miaxis.common.core.domain.Response;
|
|
import com.miaxis.common.core.domain.Response;
|
|
import com.miaxis.common.core.domain.entity.SysUser;
|
|
import com.miaxis.common.core.domain.entity.SysUser;
|
|
-import com.miaxis.common.core.domain.model.LoginUser;
|
|
|
|
import com.miaxis.common.core.page.ResponsePageInfo;
|
|
import com.miaxis.common.core.page.ResponsePageInfo;
|
|
import com.miaxis.common.enums.BusinessTypeEnum;
|
|
import com.miaxis.common.enums.BusinessTypeEnum;
|
|
import com.miaxis.common.utils.SecurityUtils;
|
|
import com.miaxis.common.utils.SecurityUtils;
|
|
@@ -30,13 +30,14 @@ import java.util.Map;
|
|
/**
|
|
/**
|
|
* 【用户信息】Controller
|
|
* 【用户信息】Controller
|
|
*
|
|
*
|
|
- * @author miaxis
|
|
|
|
|
|
+ * @author wwl
|
|
* @date 2020-12-23
|
|
* @date 2020-12-23
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping(Constants.OPEN_PREFIX+"/user/info")
|
|
@RequestMapping(Constants.OPEN_PREFIX+"/user/info")
|
|
@Api(tags={"【普通用户信息】Controller"})
|
|
@Api(tags={"【普通用户信息】Controller"})
|
|
public class UserInfoController extends BaseController{
|
|
public class UserInfoController extends BaseController{
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private IUserInfoService userInfoService;
|
|
private IUserInfoService userInfoService;
|
|
|
|
|
|
@@ -55,17 +56,6 @@ public class UserInfoController extends BaseController{
|
|
return toResponsePageInfo(list);
|
|
return toResponsePageInfo(list);
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 导出用户信息列表
|
|
|
|
- */
|
|
|
|
- @Log(title = "用户信息", businessType = BusinessTypeEnum.EXPORT)
|
|
|
|
- @GetMapping("/export")
|
|
|
|
- @ApiOperation("导出用户信息列表Excel")
|
|
|
|
- public Response<String> export(@ModelAttribute UserInfo userInfo){
|
|
|
|
- List<UserInfo> list = userInfoService.selectUserInfoList(userInfo);
|
|
|
|
- ExcelUtil<UserInfo> util = new ExcelUtil<UserInfo>(UserInfo.class);
|
|
|
|
- return util.exportExcel(list, "info");
|
|
|
|
- }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取用户信息详细信息
|
|
* 获取用户信息详细信息
|
|
@@ -79,15 +69,6 @@ public class UserInfoController extends BaseController{
|
|
return Response.success(userInfoService.selectUserInfoById(id));
|
|
return Response.success(userInfoService.selectUserInfoById(id));
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 新增用户信息
|
|
|
|
- */
|
|
|
|
- @Log(title = "用户信息", businessType = BusinessTypeEnum.INSERT)
|
|
|
|
- @PostMapping
|
|
|
|
- @ApiOperation("新增用户信息")
|
|
|
|
- public Response<Integer> add(@RequestBody UserInfo userInfo){
|
|
|
|
- return toResponse(userInfoService.insertUserInfo(userInfo));
|
|
|
|
- }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 修改用户信息
|
|
* 修改用户信息
|
|
@@ -138,7 +119,7 @@ public class UserInfoController extends BaseController{
|
|
* 删除文件
|
|
* 删除文件
|
|
* uploadIdCardAndHeadPicture
|
|
* uploadIdCardAndHeadPicture
|
|
*/
|
|
*/
|
|
- @Log(title = "用户信息", businessType = BusinessTypeEnum.INSERT)
|
|
|
|
|
|
+ @Log(title = "用户信息", businessType = BusinessTypeEnum.DELETE)
|
|
@PostMapping("/deleteCardAndHeadPicture")
|
|
@PostMapping("/deleteCardAndHeadPicture")
|
|
@ApiOperation("删除文件")
|
|
@ApiOperation("删除文件")
|
|
@ApiImplicitParam(name = "filePath",value = "文件路径(filePath)" ,dataType = "String",required = true)
|
|
@ApiImplicitParam(name = "filePath",value = "文件路径(filePath)" ,dataType = "String",required = true)
|
|
@@ -202,6 +183,10 @@ public class UserInfoController extends BaseController{
|
|
@Log(title = "用户信息", businessType = BusinessTypeEnum.UPDATE)
|
|
@Log(title = "用户信息", businessType = BusinessTypeEnum.UPDATE)
|
|
@PostMapping("/modifyPhoneNumber")
|
|
@PostMapping("/modifyPhoneNumber")
|
|
@ApiOperation("修改用户手机号")
|
|
@ApiOperation("修改用户手机号")
|
|
|
|
+ @ApiImplicitParams({
|
|
|
|
+ @ApiImplicitParam(name = "phone", value = "手机号码", required = true, dataType = "String"),
|
|
|
|
+ @ApiImplicitParam(name = "verificationCode", value = "短信验证码", required = true, dataType = "String")
|
|
|
|
+ })
|
|
public Response modifyPhoneNumber(String phone,String verificationCode){
|
|
public Response modifyPhoneNumber(String phone,String verificationCode){
|
|
//获取当前用户
|
|
//获取当前用户
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
@@ -209,5 +194,16 @@ public class UserInfoController extends BaseController{
|
|
return userInfoService.modifyPhoneNumber(phone,verificationCode,user);
|
|
return userInfoService.modifyPhoneNumber(phone,verificationCode,user);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 查询我的报名信息
|
|
|
|
+ */
|
|
|
|
+ @Log(title = "用户信息",businessType = BusinessTypeEnum.OTHER)
|
|
|
|
+ @GetMapping("/getMyRegistrationInformation")
|
|
|
|
+ @ApiOperation("查询我的报名信息")
|
|
|
|
+ @ApiImplicitParam(name = "userId",value = "用户id" ,dataType = "String",required = true)
|
|
|
|
+ public Response<UserVo> getMyRegistrationInformation(String userId){
|
|
|
|
+
|
|
|
|
+ return userInfoService.getMyRegistrationInformation(userId);
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|