From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
index 6792ae0..4820535 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -54,18 +55,21 @@
@ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"),
@ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"),
@ApiImplicitParam(value = "服务城市", name = "city", dataType = "String"),
+ @ApiImplicitParam(value = "账号启用状态", name = "state", dataType = "Integer"),
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
- public R<IPage<MasterWorker>> selectServe(String name, String phone, String city,
+ public R<IPage<MasterWorker>> selectServe(String name, String phone, String city, Integer state,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryChainWrapper<MasterWorker> wrapper = masterWorkerService.lambdaQuery();
wrapper = StringUtils.isNotBlank(name) ? wrapper.like(MasterWorker::getRealName, name) : wrapper;
wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(MasterWorker::getPhone, phone) : wrapper;
wrapper = StringUtils.isNotBlank(city) ? wrapper.like(MasterWorker::getCity, city) : wrapper;
- return R.ok(wrapper.eq(MasterWorker::getIsDelete, 0)
- .eq(MasterWorker::getIsEnable,1)
+ if (null != state) {
+ wrapper.eq(MasterWorker::getIsEnable, Constants.ONE);
+ }
+ return R.ok(wrapper.eq(MasterWorker::getIsDelete, Constants.ZERO)
.orderByDesc(MasterWorker::getCreateTime).page(Page.of(pageNum, pageSize)));
}
@@ -77,11 +81,16 @@
@ApiOperation(value = "新增师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody MasterWorker masterWorker) {
- // MD5加密登录密码(新)
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- String md5Password = passwordEncoder.encode(Constants.DEFAULT_PASSWORD);
- masterWorker.setPassword(md5Password);
- return masterWorkerService.save(masterWorker) ? R.ok() : R.fail();
+ boolean check = masterWorkerService.checkOnlyPhone(masterWorker.getPhone());
+ if (check) {
+ // MD5加密登录密码(新)
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+ String md5Password = passwordEncoder.encode(Constants.DEFAULT_PASSWORD);
+ masterWorker.setPassword(md5Password);
+ return masterWorkerService.save(masterWorker) ? R.ok() : R.fail();
+ } else {
+ return R.fail("该手机号已注册账号！");
+ }
}
/**
@@ -108,8 +117,13 @@
*/
@ApiOperation(value = "修改师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@PostMapping(value = "/update")
- public R<String> update(@RequestBody MasterWorker masterWorker) {
- return masterWorkerService.updateById(masterWorker) ? R.ok() : R.fail();
+ public R<String> update(@RequestBody @Validated MasterWorker masterWorker) {
+ boolean check = masterWorkerService.checkOnlyPhone(masterWorker.getPhone());
+ if (check) {
+ return masterWorkerService.updateById(masterWorker) ? R.ok() : R.fail();
+ } else {
+ return R.fail("该手机号已注册账号！");
+ }
}
/**
--
Gitblit v1.7.1