Просмотр исходного кода

[用户][修改]: 用户角色选择的修改

release_toaliyun_real
jinguo24@163.com 7 лет назад
Родитель
Сommit
ec9de64b68
6 измененных файлов: 51 добавлений и 9 удалений
  1. +29
    -5
      mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java
  2. +11
    -0
      mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java
  3. +1
    -1
      mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java
  4. +1
    -1
      mallinkService/src/main/java/com/simple/service/MallUserRoleService.java
  5. +6
    -0
      mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java
  6. +3
    -2
      mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml

+ 29
- 5
mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java Просмотреть файл

@@ -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();
}



+ 11
- 0
mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java Просмотреть файл

@@ -65,12 +65,23 @@ public class MallUserInfo implements Serializable {
/*0 不是超管 1是超管**/
@io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin")
private Integer isAdmin;
@Transient
private Long roleId;
//该用户所有的角色
@Transient
private List<MallRole> role;
//该用户包含的所有权限
@Transient
private List<MallPermission> permission;
public Long getRoleId() {
return roleId;
}

public void setRoleId(Long roleId) {
this.roleId = roleId;
}

public String getTenantId() {
return tenantId;
}


+ 1
- 1
mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java Просмотреть файл

@@ -10,7 +10,7 @@ public interface MallUserRoleMapper extends CommonMapper<MallUserRole, String> {
List<MallUserRole> findList(MallUserRole mallUserRole);
void deleteByUserId(Long userId);


+ 1
- 1
mallinkService/src/main/java/com/simple/service/MallUserRoleService.java Просмотреть файл

@@ -47,7 +47,7 @@ public interface MallUserRoleService {

void deleteByUserId(Long uid);


+ 6
- 0
mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java Просмотреть файл

@@ -52,6 +52,12 @@ public class MallUserRoleServiceImpl implements MallUserRoleService {
public void batchInsert(List<MallUserRole> u2rs) {
mallUserRoleMapper.insertList(u2rs);
}

@Override
public void deleteByUserId(Long uid) {
mallUserRoleMapper.deleteByUserId(uid);
}


+ 3
- 2
mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml Просмотреть файл

@@ -42,8 +42,9 @@
<include refid="dynamicWhereConditions" />
</select>
<delete id="deleteByUserId">
delete from mall_user_role where uid=#{userId}
</delete>


Загрузка…
Отмена
Сохранить