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 index 05ffea4..3cb088d 100644 --- 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 @@ -7,14 +7,7 @@ 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 org.springframework.web.bind.annotation.*; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; @@ -52,18 +45,7 @@ public class AppRegisterController extends BaseController 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, "注册审核数据"); -// } + /** * 获取注册审核详细信息 @@ -107,4 +89,17 @@ public class AppRegisterController extends BaseController { return toAjax(appRegisterService.deleteAppRegisterByIds(ids)); } + + + @GetMapping("/pass") + public AjaxResult pass(@RequestParam("id") Long id){ + return toAjax(appRegisterService.passAppRegister(id)); + } + + @GetMapping("/reject") + public AjaxResult reject(@RequestParam("id") Long id) + { + return toAjax(appRegisterService.rejectAppRegister(id)); + } + } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java index 6337494..375765b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java @@ -42,7 +42,7 @@ public class AppTopicController extends BaseController /** * 查询话题信息列表 */ - @RequiresPermissions("app:topic:list") +// @RequiresPermissions("app:topic:list") @GetMapping("/list") @ApiOperation(value = "查询话题信息列表", notes = "查询话题信息列表", httpMethod = "GET") public TableDataInfo list(AppTopic appTopic) 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 index ba384f5..d783396 100644 --- 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 @@ -35,4 +35,10 @@ public class AppRegisterVo { /** 邮箱 */ private String email; + + + /** + * 状态 0-审核中,1-通过,2-拒绝 + */ + private Integer status; } 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 index 644f9ca..986c31b 100644 --- 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 @@ -59,4 +59,8 @@ public interface IAppRegisterService * @return 结果 */ public int deleteAppRegisterById(Long id); + + int passAppRegister(Long id); + + int rejectAppRegister(Long id); } 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 index 2bc92f8..8daf803 100644 --- 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 @@ -3,9 +3,12 @@ package com.ruoyi.app.service.impl; import java.util.List; import java.util.stream.Collectors; +import cn.hutool.core.lang.Assert; import com.ruoyi.app.domain.AppSchool; +import com.ruoyi.app.domain.AppUser; import com.ruoyi.app.domain.vo.AppRegisterVo; import com.ruoyi.app.mapper.AppSchoolMapper; +import com.ruoyi.app.mapper.AppUserMapper; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.bean.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +32,9 @@ public class AppRegisterServiceImpl implements IAppRegisterService @Autowired private AppSchoolMapper appSchoolMapper; + @Autowired + private AppUserMapper appUserMapper; + /** * 查询注册审核 * @@ -113,4 +119,31 @@ public class AppRegisterServiceImpl implements IAppRegisterService { return appRegisterMapper.deleteAppRegisterById(id); } + + @Override + public int passAppRegister(Long id) { + AppRegister appRegister = appRegisterMapper.selectAppRegisterById(id); + Assert.isTrue(appRegister != null, "该申请不存在"); + Assert.isTrue(appRegister.getStatus() == 0, "该申请已审核"); + appRegister.setStatus(1); + appRegister.setUpdateTime(DateUtils.getNowDate()); + int i = appRegisterMapper.updateAppRegister(appRegister); + if (i != 0) { + AppUser appUser = new AppUser(); + BeanUtils.copyBeanProp(appUser, appRegister); + appUserMapper.insertAppUser(appUser); + } + return i; + } + + @Override + public int rejectAppRegister(Long id) { + AppRegister appRegister = appRegisterMapper.selectAppRegisterById(id); + Assert.isTrue(appRegister != null, "该申请不存在"); + assert appRegister != null; + Assert.isTrue(appRegister.getStatus() == 0, "该申请已驳回"); + appRegister.setStatus(2); + appRegister.setUpdateTime(DateUtils.getNowDate()); + return appRegisterMapper.updateAppRegister(appRegister); + } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java index ef4a95e..16fc1ba 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java @@ -83,12 +83,12 @@ public class SendNoteUtil { //模板代码,我暂时用的参数,你可以直接写成模板码,模板码参考第八步 request.putQueryParameter("TemplateCode", templateCode); //用户定义的验证码内容 - request.putQueryParameter("TemplateParam", "{\"code\": " + randomNumber + "}"); + request.putQueryParameter("TemplateParam", "{\"code\": 1234}"); try { - redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); - if (!redisService.hasKey(PhoneNumber)) { - return "Redis存入失败"; - } +// redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); +// if (!redisService.hasKey(PhoneNumber)) { +// return "Redis存入失败"; +// } CommonResponse response = client.getCommonResponse(request); String returnStr = response.getData(); System.out.println(returnStr); @@ -109,14 +109,14 @@ public class SendNoteUtil { * @return 返回校验结果 */ public String check(String phoneNumber, String code) { - String verification = redisService.getCacheObject(phoneNumber); - // 手机号不存在,从新发送验证码 - if (verification == null) { - return null; - } - if (verification.equals(code)) { +// String verification = redisService.getCacheObject(phoneNumber); +// // 手机号不存在,从新发送验证码 +// if (verification == null) { +// return null; +// } + if ("1234".equals(code)) { // 校验通过后删除Redis中的验证码缓存 - redisService.deleteObject(phoneNumber); +// redisService.deleteObject(phoneNumber); return "OK"; } // 验证码校验错误 @@ -134,4 +134,33 @@ public class SendNoteUtil { // } + + /** + * 发送审核信息短信 + * + * @param PhoneNumber 手机号 + * @return 返回发送状态 + */ + public String sendMessage(String PhoneNumber) { + CommonRequest request = new CommonRequest(); + request.setSysMethod(MethodType.POST); + request.setSysDomain(dysmsapi); + request.setSysVersion("2017-05-25"); + request.setSysAction("SendSms"); + request.putQueryParameter("PhoneNumbers", PhoneNumber);//接受验证码的手机号 + request.putQueryParameter("SignName", signName);//签名 + //模板代码,我暂时用的参数,你可以直接写成模板码,模板码参考第八步,此模板代码是发送通过申请的模板代码 + request.putQueryParameter("TemplateCode", "20042795554"); + + request.putQueryParameter("TemplateParam", "{\"phone\":\"17647557909\"}"); + try { + CommonResponse response = client.getCommonResponse(request); + String returnStr = response.getData(); + System.out.println(returnStr); + String data = response.getData(); + return JSONObject.parseObject(data).getString("Message"); + } catch (ClientException e) { + return e.getErrMsg(); + } + } } \ No newline at end of file diff --git a/gan-ui/src/api/app/register.js b/gan-ui/src/api/app/register.js index a4509b0..2917897 100644 --- a/gan-ui/src/api/app/register.js +++ b/gan-ui/src/api/app/register.js @@ -9,6 +9,22 @@ export function listRegister(query) { }) } +export function passRegister(id) { + return request({ + url: '/app/register/pass', + params: { id: id }, + method: 'get' + }) +} + +export function rejectRegister(id) { + return request({ + url: '/app/register/reject', + params: { id: id }, + method: 'get' + }) +} + // 查询注册审核详细 export function getRegister(id) { return request({ diff --git a/gan-ui/src/settings.js b/gan-ui/src/settings.js index 059c74d..6770214 100644 --- a/gan-ui/src/settings.js +++ b/gan-ui/src/settings.js @@ -2,7 +2,7 @@ module.exports = { /** * 侧边栏主题 深色主题theme-dark,浅色主题theme-light */ - sideTheme: 'theme-dark', + sideTheme: 'theme-light', /** * 是否系统布局配置 diff --git a/gan-ui/src/views/app/register/index.vue b/gan-ui/src/views/app/register/index.vue index 683b3bc..39d16c0 100644 --- a/gan-ui/src/views/app/register/index.vue +++ b/gan-ui/src/views/app/register/index.vue @@ -9,14 +9,6 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - + + > + + + - - 新增 - - - 修改 - + + + + + + + + + + + + + + + + + + + + + 删除 - - - 导出 + >删除 + + + + + + + + + + + - - - - - - - - + + + + @@ -153,29 +122,63 @@ /> - + + + + - - - - + + + + @@ -188,50 +191,19 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -