Skip to content

S
SiEn
Commit 6589acc0 by giaogiao
Options

商家: 账户管理,添加职位, 添加是否为管理员

parent f9fc40fc
Showing with 82 additions and 111 deletions
api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserManagerController.java
...@@ -3,7 +3,6 @@ package com.jumeirah.api.merchant.controller; ...@@ -3,7 +3,6 @@ package com.jumeirah.api.merchant.controller;
import com.jumeirah.api.merchant.entity.param.MerchantUserAddParam; import com.jumeirah.api.merchant.entity.param.MerchantUserAddParam;
import com.jumeirah.api.merchant.entity.param.MerchantUserUpdateParam; import com.jumeirah.api.merchant.entity.param.MerchantUserUpdateParam;
import com.jumeirah.common.entity.MerchantUser; import com.jumeirah.common.entity.MerchantUser;
import com.jumeirah.common.service.MerchantService;
import com.jumeirah.common.service.MerchantUserService; import com.jumeirah.common.service.MerchantUserService;
import com.jumeirah.common.vo.MerchantUserQueryVo; import com.jumeirah.common.vo.MerchantUserQueryVo;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
...@@ -45,8 +44,6 @@ public class MerchantUserManagerController extends BaseController { ...@@ -45,8 +44,6 @@ public class MerchantUserManagerController extends BaseController {
@Autowired @Autowired
private MerchantUserService merchantUserService; private MerchantUserService merchantUserService;
@Autowired
private MerchantService merchantService;
/** /**
* 添加商家用户 * 添加商家用户
...@@ -55,8 +52,11 @@ public class MerchantUserManagerController extends BaseController { ...@@ -55,8 +52,11 @@ public class MerchantUserManagerController extends BaseController {
@OperationLog(name = "添加商家用户", type = OperationLogType.ADD) @OperationLog(name = "添加商家用户", type = OperationLogType.ADD)
@ApiOperation(value = "添加商家用户", response = ApiResult.class) @ApiOperation(value = "添加商家用户", response = ApiResult.class)
public ApiResult<Boolean> addMerchantUser(@Validated(Add.class) @RequestBody MerchantUserAddParam merchantUserAddParam) throws Exception { public ApiResult<Boolean> addMerchantUser(@Validated(Add.class) @RequestBody MerchantUserAddParam merchantUserAddParam) throws Exception {
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
MerchantUser merchantUser = new MerchantUser(); MerchantUser merchantUser = new MerchantUser();
BeanUtils.copyProperties(merchantUserAddParam, merchantUser); BeanUtils.copyProperties(merchantUserAddParam, merchantUser);
merchantUser.setMcId(jwtToken.getMcId());
boolean flag = merchantUserService.saveMerchantUser(merchantUser); boolean flag = merchantUserService.saveMerchantUser(merchantUser);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
...@@ -68,8 +68,11 @@ public class MerchantUserManagerController extends BaseController { ...@@ -68,8 +68,11 @@ public class MerchantUserManagerController extends BaseController {
@OperationLog(name = "修改商家用户", type = OperationLogType.UPDATE) @OperationLog(name = "修改商家用户", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改商家用户", response = ApiResult.class) @ApiOperation(value = "修改商家用户", response = ApiResult.class)
public ApiResult<Boolean> updateMerchantUser(@Validated(Update.class) @RequestBody MerchantUserUpdateParam merchantUserUpdateParam) throws Exception { public ApiResult<Boolean> updateMerchantUser(@Validated(Update.class) @RequestBody MerchantUserUpdateParam merchantUserUpdateParam) throws Exception {
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
MerchantUser merchantUser = new MerchantUser(); MerchantUser merchantUser = new MerchantUser();
BeanUtils.copyProperties(merchantUserUpdateParam, merchantUser); BeanUtils.copyProperties(merchantUserUpdateParam, merchantUser);
boolean flag = merchantUserService.updateMerchantUser(merchantUser); boolean flag = merchantUserService.updateMerchantUser(merchantUser);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
...@@ -81,6 +84,7 @@ public class MerchantUserManagerController extends BaseController { ...@@ -81,6 +84,7 @@ public class MerchantUserManagerController extends BaseController {
@OperationLog(name = "删除商家用户", type = OperationLogType.DELETE) @OperationLog(name = "删除商家用户", type = OperationLogType.DELETE)
@ApiOperation(value = "删除商家用户", response = ApiResult.class) @ApiOperation(value = "删除商家用户", response = ApiResult.class)
public ApiResult<Boolean> deleteMerchantUser(@PathVariable("id") Long id) throws Exception { public ApiResult<Boolean> deleteMerchantUser(@PathVariable("id") Long id) throws Exception {
JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
boolean flag = merchantUserService.deleteMerchantUser(id); boolean flag = merchantUserService.deleteMerchantUser(id);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
......
api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserPermissionController.java
package com.jumeirah.api.merchant.controller; package com.jumeirah.api.merchant.controller;
import com.jumeirah.common.entity.MerchantUserPermission;
import com.jumeirah.common.param.MerchantUserPermissionPageParam;
import com.jumeirah.common.param.MerchantUserPermissionQueryVo; import com.jumeirah.common.param.MerchantUserPermissionQueryVo;
import com.jumeirah.common.service.MerchantUserPermissionService; import com.jumeirah.common.service.MerchantUserPermissionService;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.controller.BaseController; import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog; import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType; import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -38,41 +30,9 @@ public class MerchantUserPermissionController extends BaseController { ...@@ -38,41 +30,9 @@ public class MerchantUserPermissionController extends BaseController {
@Autowired @Autowired
private MerchantUserPermissionService merchantUserPermissionService; private MerchantUserPermissionService merchantUserPermissionService;
/**
* 添加商家用户权限关系
*/
@PostMapping("/add")
@OperationLog(name = "添加商家用户权限关系", type = OperationLogType.ADD)
@ApiOperation(value = "添加商家用户权限关系")
public ApiResult<Boolean> addMerchantUserPermission(@Validated(Add.class) @RequestBody MerchantUserPermission merchantUserPermission) throws Exception {
boolean flag = merchantUserPermissionService.saveMerchantUserPermission(merchantUserPermission);
return ApiResult.result(flag);
}
/**
* 修改商家用户权限关系
*/
@PostMapping("/update")
@OperationLog(name = "修改商家用户权限关系", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改商家用户权限关系")
public ApiResult<Boolean> updateMerchantUserPermission(@Validated(Update.class) @RequestBody MerchantUserPermission merchantUserPermission) throws Exception {
boolean flag = merchantUserPermissionService.updateMerchantUserPermission(merchantUserPermission);
return ApiResult.result(flag);
}
/** /**
* 删除商家用户权限关系 *查询商家用户权限详情
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除商家用户权限关系", type = OperationLogType.DELETE)
@ApiOperation(value = "删除商家用户权限关系")
public ApiResult<Boolean> deleteMerchantUserPermission(@PathVariable("id") Long id) throws Exception {
boolean flag = merchantUserPermissionService.deleteMerchantUserPermission(id);
return ApiResult.result(flag);
}
/**
* 获取商家用户权限关系详情
*/ */
@GetMapping("/info/{id}") @GetMapping("/info/{id}")
@OperationLog(name = "商家用户权限关系详情", type = OperationLogType.INFO) @OperationLog(name = "商家用户权限关系详情", type = OperationLogType.INFO)
...@@ -82,16 +42,60 @@ public class MerchantUserPermissionController extends BaseController { ...@@ -82,16 +42,60 @@ public class MerchantUserPermissionController extends BaseController {
return ApiResult.ok(merchantUserPermissionQueryVo); return ApiResult.ok(merchantUserPermissionQueryVo);
} }
/** // /**
* 商家用户权限关系分页列表 // * 添加商家用户权限关系
*/ // */
@PostMapping("/getPageList") // @PostMapping("/add")
@OperationLog(name = "商家用户权限关系分页列表", type = OperationLogType.PAGE) // @OperationLog(name = "添加商家用户权限关系", type = OperationLogType.ADD)
@ApiOperation(value = "商家用户权限关系分页列表") // @ApiOperation(value = "添加商家用户权限关系")
public ApiResult<Paging<MerchantUserPermissionQueryVo>> getMerchantUserPermissionPageList(@Validated @RequestBody MerchantUserPermissionPageParam merchantUserPermissionPageParam) throws Exception { // public ApiResult<Boolean> addMerchantUserPermission(@Validated(Add.class) @RequestBody MerchantUserPermission merchantUserPermission) throws Exception {
Paging<MerchantUserPermissionQueryVo> paging = merchantUserPermissionService.getMerchantUserPermissionPageList(merchantUserPermissionPageParam); // boolean flag = merchantUserPermissionService.saveMerchantUserPermission(merchantUserPermission);
return ApiResult.ok(paging); // return ApiResult.result(flag);
} // }
//
// /**
// * 修改商家用户权限关系
// */
// @PostMapping("/update")
// @OperationLog(name = "修改商家用户权限关系", type = OperationLogType.UPDATE)
// @ApiOperation(value = "修改商家用户权限关系")
// public ApiResult<Boolean> updateMerchantUserPermission(@Validated(Update.class) @RequestBody MerchantUserPermission merchantUserPermission) throws Exception {
// boolean flag = merchantUserPermissionService.updateMerchantUserPermission(merchantUserPermission);
// return ApiResult.result(flag);
// }
//
// /**
// * 删除商家用户权限关系
// */
// @PostMapping("/delete/{id}")
// @OperationLog(name = "删除商家用户权限关系", type = OperationLogType.DELETE)
// @ApiOperation(value = "删除商家用户权限关系")
// public ApiResult<Boolean> deleteMerchantUserPermission(@PathVariable("id") Long id) throws Exception {
// boolean flag = merchantUserPermissionService.deleteMerchantUserPermission(id);
// return ApiResult.result(flag);
// }
//
// /**
// * 获取商家用户权限关系详情
// */
// @GetMapping("/info/{id}")
// @OperationLog(name = "商家用户权限关系详情", type = OperationLogType.INFO)
// @ApiOperation(value = "商家用户权限关系详情")
// public ApiResult<MerchantUserPermissionQueryVo> getMerchantUserPermission(@PathVariable("id") Long id) throws Exception {
// MerchantUserPermissionQueryVo merchantUserPermissionQueryVo = merchantUserPermissionService.getMerchantUserPermissionById(id);
// return ApiResult.ok(merchantUserPermissionQueryVo);
// }
//
// /**
// * 商家用户权限关系分页列表
// */
// @PostMapping("/getPageList")
// @OperationLog(name = "商家用户权限关系分页列表", type = OperationLogType.PAGE)
// @ApiOperation(value = "商家用户权限关系分页列表")
// public ApiResult<Paging<MerchantUserPermissionQueryVo>> getMerchantUserPermissionPageList(@Validated @RequestBody MerchantUserPermissionPageParam merchantUserPermissionPageParam) throws Exception {
// Paging<MerchantUserPermissionQueryVo> paging = merchantUserPermissionService.getMerchantUserPermissionPageList(merchantUserPermissionPageParam);
// return ApiResult.ok(paging);
// }
} }
api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/MerchantUserAddParam.java
...@@ -31,6 +31,6 @@ public class MerchantUserAddParam extends BaseEntity { ...@@ -31,6 +31,6 @@ public class MerchantUserAddParam extends BaseEntity {
private String password; private String password;
@ApiModelProperty("职位") @ApiModelProperty("职位")
private String remark; private String position;
} }
api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/MerchantUserUpdateParam.java
...@@ -22,18 +22,14 @@ import javax.validation.constraints.NotBlank; ...@@ -22,18 +22,14 @@ import javax.validation.constraints.NotBlank;
public class MerchantUserUpdateParam extends BaseEntity { public class MerchantUserUpdateParam extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("用户名") @ApiModelProperty("用户名")
private String username; private String username;
@ApiModelProperty("昵称")
private String nickname;
@NotBlank(message = "密码不能为空") @NotBlank(message = "密码不能为空")
@ApiModelProperty("密码") @ApiModelProperty("密码")
private String password; private String password;
@ApiModelProperty("备注") @ApiModelProperty("职位")
private String remark; private String position;
} }
common/src/main/java/com/jumeirah/common/entity/MerchantUser.java
...@@ -66,8 +66,8 @@ public class MerchantUser extends BaseEntity { ...@@ -66,8 +66,8 @@ public class MerchantUser extends BaseEntity {
@ApiModelProperty("头像") @ApiModelProperty("头像")
private String head; private String head;
@ApiModelProperty("备注") @ApiModelProperty("职位")
private String remark; private String position;
@ApiModelProperty("状态，0：禁用，1：启用，2：锁定") @ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
private Integer state; private Integer state;
......
common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java
...@@ -187,6 +187,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper, ...@@ -187,6 +187,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
LoginMerUserTokenVo loginSysUserTokenVo = new LoginMerUserTokenVo(); LoginMerUserTokenVo loginSysUserTokenVo = new LoginMerUserTokenVo();
loginSysUserTokenVo.setToken(token); loginSysUserTokenVo.setToken(token);
loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo); loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo);
loginSysUserTokenVo.setIsAdmin(merchantUser.getIsAdmin());
return ApiResult.ok(loginSysUserTokenVo); return ApiResult.ok(loginSysUserTokenVo);
} }
......
common/src/main/java/com/jumeirah/common/vo/LoginMerUserTokenVo.java
...@@ -37,6 +37,9 @@ public class LoginMerUserTokenVo implements LoginToken { ...@@ -37,6 +37,9 @@ public class LoginMerUserTokenVo implements LoginToken {
@ApiModelProperty("token") @ApiModelProperty("token")
private String token; private String token;
@ApiModelProperty("是否为管理员，0：普通，1：超级管理员")
private Integer isAdmin;
/** /**
* 登录用户对象 * 登录用户对象
*/ */
......
common/src/main/java/com/jumeirah/common/vo/MerchantUserQueryVo.java
...@@ -27,53 +27,16 @@ public class MerchantUserQueryVo implements Serializable { ...@@ -27,53 +27,16 @@ public class MerchantUserQueryVo implements Serializable {
@ApiModelProperty("用户名") @ApiModelProperty("用户名")
private String username; private String username;
//
// @ApiModelProperty("密码")
// private String password;
@ApiModelProperty("昵称") @ApiModelProperty("职位")
private String nickname; private String position;
@ApiModelProperty("航空公司名称") @ApiModelProperty("是否为管理员，0：普通，1：超级管理员")
private String airlineName; private Integer isAdmin;
@ApiModelProperty("密码")
private String password;
@ApiModelProperty("盐值")
private String salt;
@ApiModelProperty("手机号码")
private String phone;
@ApiModelProperty("手机区号")
private String phoneArea;
@ApiModelProperty("性别，0：女，1：男，默认1")
private Integer gender;
@ApiModelProperty("头像")
private String head;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
private Integer state;
@ApiModelProperty("部门id")
private Long departmentId;
@ApiModelProperty("角色id")
private Long roleId;
@ApiModelProperty("逻辑删除，0：未删除，1：已删除")
private Integer deleted;
@ApiModelProperty("版本")
private Integer version;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Timestamp createTime; private Timestamp createTime;
@ApiModelProperty("修改时间")
private Timestamp updateTime;
} }
\ No newline at end of file
common/src/main/resources/mapper/merchant/MerchantUserMapper.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,mc_id,is_admin, username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time id,mc_id,is_admin, username, nickname, password, salt, phone, phone_area, gender, head, position, state, department_id, role_id, deleted, version, create_time, update_time
</sql> </sql>
<select id="getMerchantUserById" resultType="com.jumeirah.common.vo.MerchantUserQueryVo"> <select id="getMerchantUserById" resultType="com.jumeirah.common.vo.MerchantUserQueryVo">
...@@ -24,9 +24,10 @@ ...@@ -24,9 +24,10 @@
resultType="com.jumeirah.common.vo.MerchantUserQueryVo"> resultType="com.jumeirah.common.vo.MerchantUserQueryVo">
select select
id,mc_id,is_admin, username, nickname, phone, phone_area, gender, head, remark, state, role_id, deleted, version, create_time, update_time id,mc_id,is_admin, username, nickname, phone, phone_area, gender, head, position, state, role_id, create_time, update_time
from merchant_user from merchant_user
where where mc_id = #{id} where mc_id = #{id}
and deleted=0
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment