|
|
|
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
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; |
|
|
|
|
|
|
|
@@ -44,6 +45,15 @@ public class MallUserInfoController { |
|
|
|
@GetMapping("lists") |
|
|
|
public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize){ |
|
|
|
final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); |
|
|
|
for(MallUserInfo u:page.getList()) { |
|
|
|
MallUserRole r =new MallUserRole(); |
|
|
|
r.setUid(u.getId()); |
|
|
|
PageInfo<MallUserRole> ur = userRoleService.listAsPage(r, 1, 1); |
|
|
|
if(ur.getSize()>0) { |
|
|
|
u.setRoleId(ur.getList().get(0).getRoleId()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -56,32 +66,46 @@ public class MallUserInfoController { |
|
|
|
|
|
|
|
@ApiOperation(value = "创建用户接口", response = String.class) |
|
|
|
@PostMapping("add") |
|
|
|
public ResultData createUser(MallUserInfo userInfo){ |
|
|
|
public ResultData createUser(@RequestBody MallUserInfo userInfo){ |
|
|
|
Assert.notNull(userInfo.getUsername(), "用户名不能为空"); |
|
|
|
Assert.isTrue(checkUnique(userInfo.getUsername(), 0), "重复的用户名"); |
|
|
|
Assert.notNull(userInfo.getPassword(), "密码不能为空"); |
|
|
|
PasswordHelper passwordHelper = new PasswordHelper(); |
|
|
|
passwordHelper.encryptPassword(userInfo); |
|
|
|
userInfoService.saveOrUpdate(userInfo); |
|
|
|
if(userInfo.getRoleId()!=null) { |
|
|
|
MallUserRole r = new MallUserRole(); |
|
|
|
r.setRoleId(userInfo.getRoleId()); |
|
|
|
r.setUid(userInfo.getId()); |
|
|
|
userRoleService.saveOrUpdate(r); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "修改用户接口", response = String.class) |
|
|
|
@PostMapping("update") |
|
|
|
public ResultData updateUser(MallUserInfo userInfo){ |
|
|
|
public ResultData updateUser(@RequestBody MallUserInfo userInfo){ |
|
|
|
Assert.notNull(userInfo.getUsername(), "用户名不能为空"); |
|
|
|
Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); |
|
|
|
Assert.notNull(userInfo.getPassword(), "密码不能为空"); |
|
|
|
PasswordHelper passwordHelper = new PasswordHelper(); |
|
|
|
passwordHelper.encryptPassword(userInfo); |
|
|
|
userInfoService.saveOrUpdate(userInfo); |
|
|
|
if(userInfo.getRoleId()!=null) { |
|
|
|
userRoleService.deleteByUserId(userInfo.getId()); |
|
|
|
MallUserRole r = new MallUserRole(); |
|
|
|
r.setRoleId(userInfo.getRoleId()); |
|
|
|
r.setUid(userInfo.getId()); |
|
|
|
userRoleService.saveOrUpdate(r); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "删除用户接口", response = String.class) |
|
|
|
@GetMapping("/del") |
|
|
|
public ResultData deleteUser(Long id) { |
|
|
|
userInfoService.deleteById(id); |
|
|
|
@PostMapping("/del") |
|
|
|
public ResultData deleteUser(@RequestBody MallUserInfo userInfo) { |
|
|
|
userInfoService.deleteById(userInfo.getId()); |
|
|
|
|
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
|