From 04e6dd3e265ab2efdddee74c64abf314a3fc816a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Wed, 24 Apr 2024 14:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/service/TokenService.java | 15 +- gan-modules/ruoyi-gan/pom.xml | 4 + .../app/controller/AppLoginController.java | 89 ++++- .../app/controller/AppRegisterController.java | 110 ++++++ .../app/controller/AppSchoolController.java | 2 +- .../app/controller/PhoneCodeController.java | 4 +- .../app/controller/UserSkillController.java | 2 + .../com/ruoyi/app/domain/AppRegister.java | 181 +++++++++ .../ruoyi/app/domain/vo/AppRegisterVo.java | 38 ++ .../java/com/ruoyi/app/form/LoginForm.java | 14 + .../java/com/ruoyi/app/form/RegisterForm.java | 37 ++ .../ruoyi/app/mapper/AppRegisterMapper.java | 61 +++ .../com/ruoyi/app/mapper/AppUserMapper.java | 3 + .../com/ruoyi/app/mapper/UserSkillMapper.java | 2 + .../app/service/IAppRegisterService.java | 62 +++ .../ruoyi/app/service/IAppUserService.java | 2 + .../service/impl/AppRegisterServiceImpl.java | 116 ++++++ .../app/service/impl/AppUserServiceImpl.java | 5 + .../mapper/app/AppRegisterMapper.xml | 120 ++++++ .../resources/mapper/app/AppUserMapper.xml | 4 + .../ruoyi/gen/controller/GenController.java | 6 +- gan-ui/src/api/app/register.js | 44 +++ gan-ui/src/views/app/register/index.vue | 353 ++++++++++++++++++ 23 files changed, 1258 insertions(+), 16 deletions(-) create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppRegisterVo.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/LoginForm.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java create mode 100644 gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java create mode 100644 gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml create mode 100644 gan-ui/src/api/app/register.js create mode 100644 gan-ui/src/views/app/register/index.vue diff --git a/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 43539ea..ade1f5a 100644 --- a/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/gan-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -48,11 +48,20 @@ public class TokenService public Map createToken(LoginUser loginUser) { String token = IdUtils.fastUUID(); - Long userId = loginUser.getSysUser().getUserId(); - String userName = loginUser.getSysUser().getUserName(); + Long userId = 0L; + String userName = null; + if (loginUser.getSysUser()== null){ + userId = loginUser.getUserid(); + userName = loginUser.getUsername(); + }else{ + userId = loginUser.getSysUser().getUserId(); + userName = loginUser.getSysUser().getUserName(); + } +// +// String userName = loginUser.getSysUser().getUserName(); loginUser.setToken(token); loginUser.setUserid(userId); - loginUser.setUsername(userName); +// loginUser.setUsername(userName); loginUser.setIpaddr(IpUtils.getIpAddr()); refreshToken(loginUser); diff --git a/gan-modules/ruoyi-gan/pom.xml b/gan-modules/ruoyi-gan/pom.xml index d7ebbec..73885e7 100644 --- a/gan-modules/ruoyi-gan/pom.xml +++ b/gan-modules/ruoyi-gan/pom.xml @@ -42,6 +42,10 @@ org.springframework.boot spring-boot-starter-actuator + + org.springframework.cloud + spring-cloud-starter-openfeign + diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java index 4586776..519cc28 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java @@ -1,26 +1,101 @@ package com.ruoyi.app.controller; +import com.ruoyi.app.domain.AppRegister; +import com.ruoyi.app.domain.AppUser; +import com.ruoyi.app.form.LoginForm; +import com.ruoyi.app.form.RegisterForm; +import com.ruoyi.app.service.IAppRegisterService; +import com.ruoyi.app.service.IAppUserService; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.ip.IpUtils; +import com.ruoyi.common.core.utils.uuid.IdUtils; +import com.ruoyi.common.redis.service.RedisService; +import com.ruoyi.common.security.service.TokenService; +import com.ruoyi.system.api.model.LoginUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.concurrent.TimeUnit; + @RestController -@RequestMapping("/api/app") +@RequestMapping("/app") @Api( tags = "APP-登录接口" ) public class AppLoginController { + @Autowired + private IAppUserService appUserService; + + @Autowired + private IAppRegisterService appRegisterService; + + @Autowired + private RedisService redisService; + + @Autowired + private TokenService tokenService; + + @PostMapping("/register") + @ApiOperation(value = "注册" , notes = "注册") + public R register(@RequestBody RegisterForm registerForm) { + AppUser appUser = appUserService.selectAppUserByPhone(registerForm.getPhoneNumber()); + Assert.notNull(registerForm.getSchoolId(), "学校id不能为空"); + Assert.isNull(appUser, "手机号已注册"); + AppRegister appRegister = setAppRegister(registerForm); + appRegister.setInvitationCode(registerForm.getInvitationCode()); + int i = appRegisterService.insertAppRegister(appRegister); + redisService.deleteObject(registerForm.getPhoneNumber()); + Assert.isTrue(i > 0, "注册失败"); + return R.ok(null,"注册成功,请等待审核结果！"); + } + + @PostMapping("/login") + @ApiOperation(value = "登录" , notes = "登录") + public R login(@RequestBody LoginForm loginForm) { + AppUser appUser = appUserService.selectAppUserByPhone(loginForm.getPhoneNumber()); + Assert.notNull(appUser, "手机号未注册"); + Object cacheObject = redisService.getCacheObject(loginForm.getPhoneNumber()); + if (cacheObject != null) { + String code = (String) cacheObject; + Assert.isTrue(code.equals(loginForm.getCode()), "验证码错误"); + } + String token = IdUtils.fastUUID(); + LoginUser loginUser = new LoginUser(); + loginUser.setUsername(appUser.getUsername()); + Long userId = appUser.getId(); + String userName = loginUser.getUsername(); + loginUser.setToken(token); + loginUser.setUserid(userId); + loginUser.setUsername(userName); + loginUser.setIpaddr(IpUtils.getIpAddr()); + loginUser.setExpireTime(43200L); + return R.ok(tokenService.createToken(loginUser)); + } + + private static AppRegister setAppRegister(RegisterForm registerForm) { + AppRegister appRegister = new AppRegister(); + appRegister.setPhone(registerForm.getPhoneNumber()); + appRegister.setUsername(registerForm.getUsername()); + appRegister.setProve(registerForm.getProve()); + appRegister.setAvatarUrl(registerForm.getAvatarUrl()); + appRegister.setSex(registerForm.getSex()); + appRegister.setAddress(registerForm.getAddress()); + appRegister.setSchoolId(registerForm.getSchoolId()); + appRegister.setEmail(registerForm.getEmail()); + appRegister.setInvitationCode(registerForm.getInvitationCode()); + appRegister.setStatus(0); + return appRegister; + } + -// @PostMapping("/register") -// @ApiOperation(value = "注册" , notes = "注册") -// public void register(RegisterForm registerForm) { -// -// -// } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java new file mode 100644 index 0000000..05ffea4 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java @@ -0,0 +1,110 @@ +package com.ruoyi.app.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.app.domain.vo.AppRegisterVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.app.domain.AppRegister; +import com.ruoyi.app.service.IAppRegisterService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 注册审核Controller + * + * @author wyh + * @date 2024-04-23 + */ +@RestController +@RequestMapping("/register") +@ApiIgnore +public class AppRegisterController extends BaseController +{ + @Autowired + private IAppRegisterService appRegisterService; + + /** + * 查询注册审核列表 + */ + @RequiresPermissions("app:register:list") + @GetMapping("/list") + public TableDataInfo list(AppRegister appRegister) + { + startPage(); + List list = appRegisterService.selectAppRegisterList(appRegister); + return getDataTable(list); + } + +// /** +// * 导出注册审核列表 +// */ +// @RequiresPermissions("app:register:export") +// @Log(title = "注册审核", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, AppRegister appRegister) +// { +// List list = appRegisterService.selectAppRegisterList(appRegister); +// ExcelUtil util = new ExcelUtil(AppRegister.class); +// util.exportExcel(response, list, "注册审核数据"); +// } + + /** + * 获取注册审核详细信息 + */ + @RequiresPermissions("app:register:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(appRegisterService.selectAppRegisterById(id)); + } + + /** + * 新增注册审核 + */ + @RequiresPermissions("app:register:add") + @Log(title = "注册审核", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppRegister appRegister) + { + return toAjax(appRegisterService.insertAppRegister(appRegister)); + } + + /** + * 修改注册审核 + */ + @RequiresPermissions("app:register:edit") + @Log(title = "注册审核", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppRegister appRegister) + { + return toAjax(appRegisterService.updateAppRegister(appRegister)); + } + + /** + * 删除注册审核 + */ + @RequiresPermissions("app:register:remove") + @Log(title = "注册审核", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(appRegisterService.deleteAppRegisterByIds(ids)); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java index dbed4a0..c634fe0 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java @@ -25,7 +25,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo; * @date 2024-04-18 */ @RestController -@RequestMapping("/api/school") +@RequestMapping("/school") @Api(tags = "学校配置" , description = "学校配置") public class AppSchoolController extends BaseController { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java index 35de760..f58c38b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java @@ -23,7 +23,7 @@ public class PhoneCodeController { @GetMapping(value = "/send") @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码", httpMethod = "GET") - public AjaxResult sendCode(@RequestParam("phoneNum") String phoneNum){ + public AjaxResult sendCode(@RequestParam("phoneNumber") String phoneNum){ String send = sendNoteUtil.sendNoteMessgae(phoneNum); @@ -43,7 +43,7 @@ public class PhoneCodeController { @GetMapping(value ="/check") @ApiOperation(value = "验证验证码", notes = "验证验证码", httpMethod = "GET") - public AjaxResult check(@RequestParam("phoneNum") String phoneNumber, @RequestParam("code") String code) { + public AjaxResult check(@RequestParam("phoneNumber") String phoneNumber, @RequestParam("code") String code) { String verificationResults = sendNoteUtil.check(phoneNumber, code); if (StringUtils.isNotBlank(verificationResults)) { if (verificationResults.equals("OK")) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java index f2945b6..9091772 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/UserSkillController.java @@ -21,6 +21,7 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.page.TableDataInfo; +import springfox.documentation.annotations.ApiIgnore; /** * 技能标签Controller @@ -30,6 +31,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/skill") +@ApiIgnore public class UserSkillController extends BaseController { @Autowired diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java new file mode 100644 index 0000000..91c2d84 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppRegister.java @@ -0,0 +1,181 @@ +package com.ruoyi.app.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 注册审核对象 app_register + * + * @author wyh + * @date 2024-04-23 + */ +public class AppRegister extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 审核id */ + private Long id; + + /** 手机号 */ + @Excel(name = "手机号") + private String phone; + + /** 用户名 */ + @Excel(name = "用户名") + private String username; + + /** 学校证明 */ + @Excel(name = "学校证明") + private String prove; + + /** 头像 */ + @Excel(name = "头像") + private String avatarUrl; + + /** 性别：0-男，1-女 */ + @Excel(name = "性别：0-男，1-女") + private Integer sex; + + /** 地址 */ + @Excel(name = "地址") + private String address; + + /** 学校id */ + @Excel(name = "学校id") + private Long schoolId; + + /** 邮箱 */ + @Excel(name = "邮箱") + private String email; + + /** 邀请码 */ + @Excel(name = "邀请码") + private String invitationCode; + /** 审核状态 */ + @Excel(name = "审核状态") + private Integer status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setUsername(String username) + { + this.username = username; + } + + public String getUsername() + { + return username; + } + public void setProve(String prove) + { + this.prove = prove; + } + + public String getProve() + { + return prove; + } + public void setAvatarUrl(String avatarUrl) + { + this.avatarUrl = avatarUrl; + } + + public String getAvatarUrl() + { + return avatarUrl; + } + public void setSex(Integer sex) + { + this.sex = sex; + } + + public Integer getSex() + { + return sex; + } + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + public void setSchoolId(Long schoolId) + { + this.schoolId = schoolId; + } + + public Long getSchoolId() + { + return schoolId; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + + public void setStatus(Integer status) + { + this.status = status; + } + public Integer getStatus() { + return status; + } + + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("phone", getPhone()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("createBy", getCreateBy()) + .append("updateBy", getUpdateBy()) + .append("remark", getRemark()) + .append("username", getUsername()) + .append("prove", getProve()) + .append("avatarUrl", getAvatarUrl()) + .append("sex", getSex()) + .append("address", getAddress()) + .append("schoolId", getSchoolId()) + .append("email", getEmail()) + .append("invitationCode", getInvitationCode()).append("status", getStatus()) + .toString(); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppRegisterVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppRegisterVo.java new file mode 100644 index 0000000..ba384f5 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppRegisterVo.java @@ -0,0 +1,38 @@ +package com.ruoyi.app.domain.vo; + +import com.ruoyi.common.core.annotation.Excel; +import lombok.Data; + +@Data +public class AppRegisterVo { + + private static final long serialVersionUID = 1L; + + /** 审核id */ + private Long id; + + /** 手机号 */ + private String phone; + + /** 用户名 */ + private String username; + + /** 学校证明 */ + private String prove; + + /** 头像 */ + private String avatarUrl; + + /** 性别：0-男，1-女 */ + private Integer sex; + + /** 地址 */ + private String address; + + /** 学校id */ + private Long schoolId; + private String schoolName; + + /** 邮箱 */ + private String email; +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/LoginForm.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/LoginForm.java new file mode 100644 index 0000000..01d89b2 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/LoginForm.java @@ -0,0 +1,14 @@ +package com.ruoyi.app.form; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "登录表单") +public class LoginForm { + @ApiModelProperty(value = "手机号") + private String phoneNumber; + @ApiModelProperty(value = "验证码") + private String code; +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java new file mode 100644 index 0000000..ae742d0 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java @@ -0,0 +1,37 @@ +package com.ruoyi.app.form; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("注册表单") +public class RegisterForm { + + @ApiModelProperty("邀请码") + private String invitationCode; + + @ApiModelProperty("手机号") + private String phoneNumber; + + @ApiModelProperty("头像") + private String avatarUrl; + + @ApiModelProperty("用户名") + private String username; + + @ApiModelProperty("性别：0-男，1-女") + private Integer sex; + + @ApiModelProperty("地址") + private String address; + + @ApiModelProperty("学校id") + private Long schoolId; + + @ApiModelProperty("邮箱") + private String email; + + @ApiModelProperty("学校证明") + private String prove; +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java new file mode 100644 index 0000000..8aec4b4 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppRegisterMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.app.mapper; + +import java.util.List; +import com.ruoyi.app.domain.AppRegister; + +/** + * 注册审核Mapper接口 + * + * @author wyh + * @date 2024-04-23 + */ +public interface AppRegisterMapper +{ + /** + * 查询注册审核 + * + * @param id 注册审核主键 + * @return 注册审核 + */ + public AppRegister selectAppRegisterById(Long id); + + /** + * 查询注册审核列表 + * + * @param appRegister 注册审核 + * @return 注册审核集合 + */ + public List selectAppRegisterList(AppRegister appRegister); + + /** + * 新增注册审核 + * + * @param appRegister 注册审核 + * @return 结果 + */ + public int insertAppRegister(AppRegister appRegister); + + /** + * 修改注册审核 + * + * @param appRegister 注册审核 + * @return 结果 + */ + public int updateAppRegister(AppRegister appRegister); + + /** + * 删除注册审核 + * + * @param id 注册审核主键 + * @return 结果 + */ + public int deleteAppRegisterById(Long id); + + /** + * 批量删除注册审核 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAppRegisterByIds(Long[] ids); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java index 4185b57..7e32e38 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/AppUserMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.app.mapper; import java.util.List; import com.ruoyi.app.domain.AppUser; import com.ruoyi.app.domain.vo.AppUserVo; +import org.apache.ibatis.annotations.Param; /** * app用户Mapper接口 @@ -59,4 +60,6 @@ public interface AppUserMapper * @return 结果 */ public int deleteAppUserByIds(Long[] ids); + + AppUser selectAppUserByPhone(@Param("phoneNumber") String phoneNumber); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/UserSkillMapper.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/UserSkillMapper.java index 2a3540c..bff08e0 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/UserSkillMapper.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/mapper/UserSkillMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.app.mapper; import java.util.List; + +import com.ruoyi.app.domain.AppUser; import com.ruoyi.app.domain.UserSkill; /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java new file mode 100644 index 0000000..644f9ca --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java @@ -0,0 +1,62 @@ +package com.ruoyi.app.service; + +import java.util.List; +import com.ruoyi.app.domain.AppRegister; +import com.ruoyi.app.domain.vo.AppRegisterVo; + +/** + * 注册审核Service接口 + * + * @author wyh + * @date 2024-04-23 + */ +public interface IAppRegisterService +{ + /** + * 查询注册审核 + * + * @param id 注册审核主键 + * @return 注册审核 + */ + public AppRegister selectAppRegisterById(Long id); + + /** + * 查询注册审核列表 + * + * @param appRegister 注册审核 + * @return 注册审核集合 + */ + public List selectAppRegisterList(AppRegister appRegister); + + /** + * 新增注册审核 + * + * @param appRegister 注册审核 + * @return 结果 + */ + public int insertAppRegister(AppRegister appRegister); + + /** + * 修改注册审核 + * + * @param appRegister 注册审核 + * @return 结果 + */ + public int updateAppRegister(AppRegister appRegister); + + /** + * 批量删除注册审核 + * + * @param ids 需要删除的注册审核主键集合 + * @return 结果 + */ + public int deleteAppRegisterByIds(Long[] ids); + + /** + * 删除注册审核信息 + * + * @param id 注册审核主键 + * @return 结果 + */ + public int deleteAppRegisterById(Long id); +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserService.java index e15090e..08a75f7 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserService.java @@ -59,4 +59,6 @@ public interface IAppUserService * @return 结果 */ public int deleteAppUserById(Long id); + + AppUser selectAppUserByPhone(String phoneNumber); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java new file mode 100644 index 0000000..2bc92f8 --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java @@ -0,0 +1,116 @@ +package com.ruoyi.app.service.impl; + +import java.util.List; +import java.util.stream.Collectors; + +import com.ruoyi.app.domain.AppSchool; +import com.ruoyi.app.domain.vo.AppRegisterVo; +import com.ruoyi.app.mapper.AppSchoolMapper; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.bean.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.app.mapper.AppRegisterMapper; +import com.ruoyi.app.domain.AppRegister; +import com.ruoyi.app.service.IAppRegisterService; + +/** + * 注册审核Service业务层处理 + * + * @author wyh + * @date 2024-04-23 + */ +@Service +public class AppRegisterServiceImpl implements IAppRegisterService +{ + @Autowired + private AppRegisterMapper appRegisterMapper; + + @Autowired + private AppSchoolMapper appSchoolMapper; + + /** + * 查询注册审核 + * + * @param id 注册审核主键 + * @return 注册审核 + */ + @Override + public AppRegister selectAppRegisterById(Long id) + { + return appRegisterMapper.selectAppRegisterById(id); + } + + /** + * 查询注册审核列表 + * + * @param appRegister 注册审核 + * @return 注册审核 + */ + @Override + public List selectAppRegisterList(AppRegister appRegister) + { + List appRegisters = appRegisterMapper.selectAppRegisterList(appRegister); + List collect = appRegisters.stream().map(register -> { + AppRegisterVo appRegisterVo = new AppRegisterVo(); + BeanUtils.copyBeanProp(appRegisterVo, register); + AppSchool appSchool = appSchoolMapper.selectAppSchoolById(register.getSchoolId()); + if (appSchool != null) { + appRegisterVo.setSchoolName(appSchool.getName()); + } + return appRegisterVo; + + }).collect(Collectors.toList()); + return collect; + } + + /** + * 新增注册审核 + * + * @param appRegister 注册审核 + * @return 结果 + */ + @Override + public int insertAppRegister(AppRegister appRegister) + { + appRegister.setCreateTime(DateUtils.getNowDate()); + return appRegisterMapper.insertAppRegister(appRegister); + } + + /** + * 修改注册审核 + * + * @param appRegister 注册审核 + * @return 结果 + */ + @Override + public int updateAppRegister(AppRegister appRegister) + { + appRegister.setUpdateTime(DateUtils.getNowDate()); + return appRegisterMapper.updateAppRegister(appRegister); + } + + /** + * 批量删除注册审核 + * + * @param ids 需要删除的注册审核主键 + * @return 结果 + */ + @Override + public int deleteAppRegisterByIds(Long[] ids) + { + return appRegisterMapper.deleteAppRegisterByIds(ids); + } + + /** + * 删除注册审核信息 + * + * @param id 注册审核主键 + * @return 结果 + */ + @Override + public int deleteAppRegisterById(Long id) + { + return appRegisterMapper.deleteAppRegisterById(id); + } +} diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java index 3150517..924cbb3 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java @@ -122,4 +122,9 @@ public class AppUserServiceImpl implements IAppUserService userSkillMapper.deleteUserSkillByUserId(id); return appUserMapper.deleteAppUserById(id); } + + @Override + public AppUser selectAppUserByPhone(String phoneNumber) { + return appUserMapper.selectAppUserByPhone(phoneNumber); + } } diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml new file mode 100644 index 0000000..43ad2af --- /dev/null +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppRegisterMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, phone, create_time, update_time, create_by, updateBy, remark, username, prove, avatar_url, sex, address, school_id, email ,invitation_code ,status from app_register + + + + + + + + insert into app_register + + phone, + create_time, + update_time, + create_by, + updateBy, + remark, + username, + prove, + avatar_url, + sex, + address, + school_id, + email, + invitation_code, + status, + + + #{phone}, + #{createTime}, + #{updateTime}, + #{createBy}, + #{updateBy}, + #{remark}, + #{username}, + #{prove}, + #{avatarUrl}, + #{sex}, + #{address}, + #{schoolId}, + #{email}, + #{invitationCode}, + #{status}, + + + + + update app_register + + phone = #{phone}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_by = #{createBy}, + updateBy = #{updateBy}, + remark = #{remark}, + username = #{username}, + prove = #{prove}, + avatar_url = #{avatarUrl}, + sex = #{sex}, + address = #{address}, + school_id = #{schoolId}, + email = #{email}, + invitation_code = #{invitationCode}, + status = #{status}, + + where id = #{id} + + + + delete from app_register where id = #{id} + + + + delete from app_register where id in + + #{id} + + + \ No newline at end of file diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index f5538cb..3b8c9c2 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -244,4 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file diff --git a/gan-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/gan-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java index 8ed9183..63dfea2 100644 --- a/gan-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/gan-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java @@ -163,7 +163,7 @@ public class GenController extends BaseController /** * 生成代码（自定义路径） */ - @RequiresPermissions("tool:gen:code") +// @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") public AjaxResult genCode(@PathVariable("tableName") String tableName) @@ -175,7 +175,7 @@ public class GenController extends BaseController /** * 同步数据库 */ - @RequiresPermissions("tool:gen:edit") +// @RequiresPermissions("tool:gen:edit") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") public AjaxResult synchDb(@PathVariable("tableName") String tableName) @@ -187,7 +187,7 @@ public class GenController extends BaseController /** * 批量生成代码 */ - @RequiresPermissions("tool:gen:code") +// @RequiresPermissions("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") public void batchGenCode(HttpServletResponse response, String tables) throws IOException diff --git a/gan-ui/src/api/app/register.js b/gan-ui/src/api/app/register.js new file mode 100644 index 0000000..a4509b0 --- /dev/null +++ b/gan-ui/src/api/app/register.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询注册审核列表 +export function listRegister(query) { + return request({ + url: '/app/register/list', + method: 'get', + params: query + }) +} + +// 查询注册审核详细 +export function getRegister(id) { + return request({ + url: '/app/register/' + id, + method: 'get' + }) +} + +// 新增注册审核 +export function addRegister(data) { + return request({ + url: '/app/register', + method: 'post', + data: data + }) +} + +// 修改注册审核 +export function updateRegister(data) { + return request({ + url: '/app/register', + method: 'put', + data: data + }) +} + +// 删除注册审核 +export function delRegister(id) { + return request({ + url: '/app/register/' + id, + method: 'delete' + }) +} diff --git a/gan-ui/src/views/app/register/index.vue b/gan-ui/src/views/app/register/index.vue new file mode 100644 index 0000000..3ede343 --- /dev/null +++ b/gan-ui/src/views/app/register/index.vue @@ -0,0 +1,353 @@ + + +