Commit 0627791b authored by yurong's avatar yurong
Browse files

商户系统完善knife4j接口描述

parent 496865c8
...@@ -17,14 +17,16 @@ package com.jeequan.jeepay.mch.ctrl.sysuser; ...@@ -17,14 +17,16 @@ package com.jeequan.jeepay.mch.ctrl.sysuser;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.SysEntitlement; import com.jeequan.jeepay.core.entity.SysEntitlement;
import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.core.utils.TreeDataBuilder; import com.jeequan.jeepay.core.utils.TreeDataBuilder;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import com.jeequan.jeepay.service.impl.SysEntitlementService; import com.jeequan.jeepay.service.impl.SysEntitlementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -41,6 +43,7 @@ import java.util.List; ...@@ -41,6 +43,7 @@ import java.util.List;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021-04-27 15:50 * @date 2021-04-27 15:50
*/ */
@Api(tags = "系统管理(用户权限)")
@RestController @RestController
@RequestMapping("api/sysEnts") @RequestMapping("api/sysEnts")
public class SysEntController extends CommonCtrl { public class SysEntController extends CommonCtrl {
...@@ -48,9 +51,14 @@ public class SysEntController extends CommonCtrl { ...@@ -48,9 +51,14 @@ public class SysEntController extends CommonCtrl {
@Autowired SysEntitlementService sysEntitlementService; @Autowired SysEntitlementService sysEntitlementService;
/** 查询权限集合 */ /** 查询权限集合 */
@ApiOperation("查询权限集合")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "sysType", value = "所属系统: MGR-运营平台, MCH-商户中心", required = true)
})
@PreAuthorize("hasAnyAuthority( 'ENT_UR_ROLE_ENT_LIST', 'ENT_UR_ROLE_DIST' )") @PreAuthorize("hasAnyAuthority( 'ENT_UR_ROLE_ENT_LIST', 'ENT_UR_ROLE_DIST' )")
@RequestMapping(value="/showTree", method = RequestMethod.GET) @RequestMapping(value="/showTree", method = RequestMethod.GET)
public ApiRes showTree() { public ApiRes<List<JSONObject>> showTree() {
//查询全部数据 //查询全部数据
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, CS.SYS_TYPE.MCH)); List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, CS.SYS_TYPE.MCH));
......
...@@ -24,6 +24,7 @@ import com.jeequan.jeepay.core.constants.CS; ...@@ -24,6 +24,7 @@ import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.SysRole; import com.jeequan.jeepay.core.entity.SysRole;
import com.jeequan.jeepay.core.entity.SysUserRoleRela; import com.jeequan.jeepay.core.entity.SysUserRoleRela;
import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.ApiPageRes;
import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.core.utils.StringKit; import com.jeequan.jeepay.core.utils.StringKit;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
...@@ -31,6 +32,10 @@ import com.jeequan.jeepay.mch.service.AuthService; ...@@ -31,6 +32,10 @@ import com.jeequan.jeepay.mch.service.AuthService;
import com.jeequan.jeepay.service.impl.SysRoleEntRelaService; import com.jeequan.jeepay.service.impl.SysRoleEntRelaService;
import com.jeequan.jeepay.service.impl.SysRoleService; import com.jeequan.jeepay.service.impl.SysRoleService;
import com.jeequan.jeepay.service.impl.SysUserRoleRelaService; import com.jeequan.jeepay.service.impl.SysUserRoleRelaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -51,6 +56,7 @@ import java.util.List; ...@@ -51,6 +56,7 @@ import java.util.List;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021-04-27 15:50 * @date 2021-04-27 15:50
*/ */
@Api(tags = "系统管理(用户角色)")
@RestController @RestController
@RequestMapping("api/sysRoles") @RequestMapping("api/sysRoles")
public class SysRoleController extends CommonCtrl { public class SysRoleController extends CommonCtrl {
...@@ -62,9 +68,17 @@ public class SysRoleController extends CommonCtrl { ...@@ -62,9 +68,17 @@ public class SysRoleController extends CommonCtrl {
/** list */ /** list */
@ApiOperation("角色列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "pageNumber", value = "分页页码", dataType = "int", defaultValue = "1"),
@ApiImplicitParam(name = "pageSize", value = "分页条数(-1时查全部数据)", dataType = "int", defaultValue = "20"),
@ApiImplicitParam(name = "roleId", value = "角色ID, ROLE_开头"),
@ApiImplicitParam(name = "roleName", value = "角色名称")
})
@PreAuthorize("hasAnyAuthority( 'ENT_UR_ROLE_LIST', 'ENT_UR_USER_UPD_ROLE' )") @PreAuthorize("hasAnyAuthority( 'ENT_UR_ROLE_LIST', 'ENT_UR_USER_UPD_ROLE' )")
@RequestMapping(value="", method = RequestMethod.GET) @RequestMapping(value="", method = RequestMethod.GET)
public ApiRes list() { public ApiPageRes<SysRole> list() {
SysRole queryObject = getObject(SysRole.class); SysRole queryObject = getObject(SysRole.class);
...@@ -83,11 +97,16 @@ public class SysRoleController extends CommonCtrl { ...@@ -83,11 +97,16 @@ public class SysRoleController extends CommonCtrl {
condition.orderByDesc(SysRole::getUpdatedAt); //时间倒序 condition.orderByDesc(SysRole::getUpdatedAt); //时间倒序
IPage<SysRole> pages = sysRoleService.page(getIPage(true), condition); IPage<SysRole> pages = sysRoleService.page(getIPage(true), condition);
return ApiRes.page(pages); return ApiPageRes.pages(pages);
} }
/** detail */ /** detail */
@ApiOperation("角色详情")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "recordId", value = "角色ID, ROLE_开头", required = true)
})
@PreAuthorize("hasAuthority( 'ENT_UR_ROLE_EDIT' )") @PreAuthorize("hasAuthority( 'ENT_UR_ROLE_EDIT' )")
@RequestMapping(value="/{recordId}", method = RequestMethod.GET) @RequestMapping(value="/{recordId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("recordId") String recordId) { public ApiRes detail(@PathVariable("recordId") String recordId) {
...@@ -99,6 +118,12 @@ public class SysRoleController extends CommonCtrl { ...@@ -99,6 +118,12 @@ public class SysRoleController extends CommonCtrl {
} }
/** add */ /** add */
@ApiOperation("添加角色信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "roleName", value = "角色名称", required = true),
@ApiImplicitParam(name = "entIdListStr", value = "权限信息集合,eg:[str1,str2],字符串列表转成json字符串,若为空,则创建的角色无任何权限")
})
@PreAuthorize("hasAuthority( 'ENT_UR_ROLE_ADD' )") @PreAuthorize("hasAuthority( 'ENT_UR_ROLE_ADD' )")
@RequestMapping(value="", method = RequestMethod.POST) @RequestMapping(value="", method = RequestMethod.POST)
public ApiRes add() { public ApiRes add() {
...@@ -124,6 +149,13 @@ public class SysRoleController extends CommonCtrl { ...@@ -124,6 +149,13 @@ public class SysRoleController extends CommonCtrl {
} }
/** update */ /** update */
@ApiOperation("更新角色信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "recordId", value = "角色ID, ROLE_开头", required = true),
@ApiImplicitParam(name = "roleName", value = "角色名称", required = true),
@ApiImplicitParam(name = "entIdListStr", value = "权限信息集合,eg:[str1,str2],字符串列表转成json字符串,若为空,则创建的角色无任何权限")
})
@PreAuthorize("hasAuthority( 'ENT_UR_ROLE_EDIT' )") @PreAuthorize("hasAuthority( 'ENT_UR_ROLE_EDIT' )")
@RequestMapping(value="/{recordId}", method = RequestMethod.PUT) @RequestMapping(value="/{recordId}", method = RequestMethod.PUT)
public ApiRes update(@PathVariable("recordId") String recordId) { public ApiRes update(@PathVariable("recordId") String recordId) {
...@@ -156,6 +188,11 @@ public class SysRoleController extends CommonCtrl { ...@@ -156,6 +188,11 @@ public class SysRoleController extends CommonCtrl {
} }
/** delete */ /** delete */
@ApiOperation("删除角色")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "recordId", value = "角色ID, ROLE_开头", required = true)
})
@PreAuthorize("hasAuthority('ENT_UR_ROLE_DEL')") @PreAuthorize("hasAuthority('ENT_UR_ROLE_DEL')")
@RequestMapping(value="/{recordId}", method = RequestMethod.DELETE) @RequestMapping(value="/{recordId}", method = RequestMethod.DELETE)
public ApiRes del(@PathVariable("recordId") String recordId) { public ApiRes del(@PathVariable("recordId") String recordId) {
......
...@@ -23,12 +23,17 @@ import com.jeequan.jeepay.core.entity.SysRole; ...@@ -23,12 +23,17 @@ import com.jeequan.jeepay.core.entity.SysRole;
import com.jeequan.jeepay.core.entity.SysRoleEntRela; import com.jeequan.jeepay.core.entity.SysRoleEntRela;
import com.jeequan.jeepay.core.entity.SysUserRoleRela; import com.jeequan.jeepay.core.entity.SysUserRoleRela;
import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.ApiPageRes;
import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.mch.service.AuthService; import com.jeequan.jeepay.mch.service.AuthService;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import com.jeequan.jeepay.service.impl.SysRoleEntRelaService; import com.jeequan.jeepay.service.impl.SysRoleEntRelaService;
import com.jeequan.jeepay.service.impl.SysRoleService; import com.jeequan.jeepay.service.impl.SysRoleService;
import com.jeequan.jeepay.service.impl.SysUserRoleRelaService; import com.jeequan.jeepay.service.impl.SysUserRoleRelaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -47,6 +52,7 @@ import java.util.List; ...@@ -47,6 +52,7 @@ import java.util.List;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021-04-27 15:50 * @date 2021-04-27 15:50
*/ */
@Api(tags = "系统管理(用户-角色-权限关联信息)")
@RestController @RestController
@RequestMapping("api/sysRoleEntRelas") @RequestMapping("api/sysRoleEntRelas")
public class SysRoleEntRelaController extends CommonCtrl { public class SysRoleEntRelaController extends CommonCtrl {
...@@ -57,9 +63,16 @@ public class SysRoleEntRelaController extends CommonCtrl { ...@@ -57,9 +63,16 @@ public class SysRoleEntRelaController extends CommonCtrl {
@Autowired private AuthService authService; @Autowired private AuthService authService;
/** list */ /** list */
@ApiOperation("关联关系--角色-权限关联信息列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "pageNumber", value = "分页页码", dataType = "int", defaultValue = "1"),
@ApiImplicitParam(name = "pageSize", value = "分页条数(-1时查全部数据)", dataType = "int", defaultValue = "20"),
@ApiImplicitParam(name = "roleId", value = "角色ID, ROLE_开头")
})
@PreAuthorize("hasAuthority( 'ENT_UR_ROLE_DIST' )") @PreAuthorize("hasAuthority( 'ENT_UR_ROLE_DIST' )")
@RequestMapping(value="", method = RequestMethod.GET) @RequestMapping(value="", method = RequestMethod.GET)
public ApiRes list() { public ApiPageRes<SysRoleEntRela> list() {
SysRoleEntRela queryObject = getObject(SysRoleEntRela.class); SysRoleEntRela queryObject = getObject(SysRoleEntRela.class);
...@@ -71,7 +84,7 @@ public class SysRoleEntRelaController extends CommonCtrl { ...@@ -71,7 +84,7 @@ public class SysRoleEntRelaController extends CommonCtrl {
IPage<SysRoleEntRela> pages = sysRoleEntRelaService.page(getIPage(true), condition); IPage<SysRoleEntRela> pages = sysRoleEntRelaService.page(getIPage(true), condition);
return ApiRes.page(pages); return ApiPageRes.pages(pages);
} }
/** 重置角色权限关联信息 */ /** 重置角色权限关联信息 */
......
...@@ -23,11 +23,16 @@ import com.jeequan.jeepay.core.constants.ApiCodeEnum; ...@@ -23,11 +23,16 @@ import com.jeequan.jeepay.core.constants.ApiCodeEnum;
import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.SysUser; import com.jeequan.jeepay.core.entity.SysUser;
import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.ApiPageRes;
import com.jeequan.jeepay.core.model.ApiRes; import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import com.jeequan.jeepay.mch.service.AuthService; import com.jeequan.jeepay.mch.service.AuthService;
import com.jeequan.jeepay.service.impl.SysUserAuthService; import com.jeequan.jeepay.service.impl.SysUserAuthService;
import com.jeequan.jeepay.service.impl.SysUserService; import com.jeequan.jeepay.service.impl.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -37,7 +42,6 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -37,7 +42,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* 用户管理类 * 用户管理类
...@@ -47,6 +51,7 @@ import java.util.List; ...@@ -47,6 +51,7 @@ import java.util.List;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021-04-27 15:50 * @date 2021-04-27 15:50
*/ */
@Api(tags = "系统管理(操作员)")
@RestController @RestController
@RequestMapping("api/sysUsers") @RequestMapping("api/sysUsers")
public class SysUserController extends CommonCtrl { public class SysUserController extends CommonCtrl {
...@@ -57,9 +62,17 @@ public class SysUserController extends CommonCtrl { ...@@ -57,9 +62,17 @@ public class SysUserController extends CommonCtrl {
/** list */ /** list */
@ApiOperation("操作员列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "pageNumber", value = "分页页码", dataType = "int", defaultValue = "1"),
@ApiImplicitParam(name = "pageSize", value = "分页条数", dataType = "int", defaultValue = "20"),
@ApiImplicitParam(name = "sysUserId", value = "用户ID"),
@ApiImplicitParam(name = "realname", value = "用户姓名")
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_LIST' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_LIST' )")
@RequestMapping(value="", method = RequestMethod.GET) @RequestMapping(value="", method = RequestMethod.GET)
public ApiRes list() { public ApiPageRes<SysUser> list() {
SysUser queryObject = getObject(SysUser.class); SysUser queryObject = getObject(SysUser.class);
...@@ -77,11 +90,16 @@ public class SysUserController extends CommonCtrl { ...@@ -77,11 +90,16 @@ public class SysUserController extends CommonCtrl {
IPage<SysUser> pages = sysUserService.page(getIPage(), condition); IPage<SysUser> pages = sysUserService.page(getIPage(), condition);
return ApiRes.page(pages); return ApiPageRes.pages(pages);
} }
/** detail */ /** detail */
@ApiOperation("操作员详情")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "recordId", value = "用户ID", required = true, dataType = "Long")
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_EDIT' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_EDIT' )")
@RequestMapping(value="/{recordId}", method = RequestMethod.GET) @RequestMapping(value="/{recordId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("recordId") Integer recordId) { public ApiRes detail(@PathVariable("recordId") Integer recordId) {
...@@ -97,9 +115,20 @@ public class SysUserController extends CommonCtrl { ...@@ -97,9 +115,20 @@ public class SysUserController extends CommonCtrl {
} }
/** add */ /** add */
@ApiOperation("添加操作员")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "isAdmin", value = "是否超管(超管拥有全部权限) 0-否 1-是", required = true, dataType = "Byte"),
@ApiImplicitParam(name = "loginUsername", value = "登录用户名", required = true),
@ApiImplicitParam(name = "realname", value = "真实姓名", required = true),
@ApiImplicitParam(name = "sex", value = "性别 0-未知, 1-男, 2-女", required = true, dataType = "Byte"),
@ApiImplicitParam(name = "telphone", value = "手机号", required = true),
@ApiImplicitParam(name = "userNo", value = "员工编号", required = true),
@ApiImplicitParam(name = "state", value = "状态: 0-停用, 1-启用", required = true, dataType = "Byte")
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_ADD' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_ADD' )")
@RequestMapping(value="", method = RequestMethod.POST) @RequestMapping(value="", method = RequestMethod.POST)
@MethodLog(remark = "添加管理员") @MethodLog(remark = "添加操作员")
public ApiRes add() { public ApiRes add() {
SysUser sysUser = getObject(SysUser.class); SysUser sysUser = getObject(SysUser.class);
sysUser.setBelongInfoId(getCurrentUser().getSysUser().getBelongInfoId()); sysUser.setBelongInfoId(getCurrentUser().getSysUser().getBelongInfoId());
...@@ -135,6 +164,21 @@ public class SysUserController extends CommonCtrl { ...@@ -135,6 +164,21 @@ public class SysUserController extends CommonCtrl {
/** update */ /** update */
@ApiOperation("修改操作员信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "recordId", value = "用户ID", required = true, dataType = "Long"),
@ApiImplicitParam(name = "isAdmin", value = "是否超管(超管拥有全部权限) 0-否 1-是", required = true, dataType = "Byte"),
@ApiImplicitParam(name = "loginUsername", value = "登录用户名", required = true),
@ApiImplicitParam(name = "realname", value = "真实姓名", required = true),
@ApiImplicitParam(name = "sex", value = "性别 0-未知, 1-男, 2-女", required = true, dataType = "Byte"),
@ApiImplicitParam(name = "telphone", value = "手机号", required = true),
@ApiImplicitParam(name = "userNo", value = "员工编号", required = true),
@ApiImplicitParam(name = "state", value = "状态: 0-停用, 1-启用", required = true, dataType = "Byte"),
@ApiImplicitParam(name = "resetPass", value = "是否重置密码", dataType = "Boolean"),
@ApiImplicitParam(name = "confirmPwd", value = "待更新的密码,base64加密"),
@ApiImplicitParam(name = "defaultPass", value = "是否默认密码", dataType = "Boolean")
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_EDIT' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_EDIT' )")
@RequestMapping(value="/{recordId}", method = RequestMethod.PUT) @RequestMapping(value="/{recordId}", method = RequestMethod.PUT)
@MethodLog(remark = "修改操作员信息") @MethodLog(remark = "修改操作员信息")
...@@ -176,6 +220,11 @@ public class SysUserController extends CommonCtrl { ...@@ -176,6 +220,11 @@ public class SysUserController extends CommonCtrl {
} }
/** delete */ /** delete */
@ApiOperation("删除操作员信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "recordId", value = "用户ID", required = true, dataType = "Long")
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_DELETE' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_DELETE' )")
@RequestMapping(value="/{recordId}", method = RequestMethod.DELETE) @RequestMapping(value="/{recordId}", method = RequestMethod.DELETE)
@MethodLog(remark = "删除操作员信息") @MethodLog(remark = "删除操作员信息")
......
...@@ -21,8 +21,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -21,8 +21,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.constants.ApiCodeEnum;
import com.jeequan.jeepay.core.entity.SysUser; import com.jeequan.jeepay.core.entity.SysUser;
import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.ApiPageRes;
import com.jeequan.jeepay.mch.service.AuthService; import com.jeequan.jeepay.mch.service.AuthService;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -45,6 +50,7 @@ import java.util.List; ...@@ -45,6 +50,7 @@ import java.util.List;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021-04-27 15:50 * @date 2021-04-27 15:50
*/ */
@Api(tags = "系统管理(用户-角色-权限关联信息)")
@RestController @RestController
@RequestMapping("api/sysUserRoleRelas") @RequestMapping("api/sysUserRoleRelas")
public class SysUserRoleRelaController extends CommonCtrl { public class SysUserRoleRelaController extends CommonCtrl {
...@@ -54,9 +60,16 @@ public class SysUserRoleRelaController extends CommonCtrl { ...@@ -54,9 +60,16 @@ public class SysUserRoleRelaController extends CommonCtrl {
@Autowired private AuthService authService; @Autowired private AuthService authService;
/** list */ /** list */
@ApiOperation("关联关系--用户-角色关联信息列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "pageNumber", value = "分页页码", dataType = "int", defaultValue = "1"),
@ApiImplicitParam(name = "pageSize", value = "分页条数(-1时查全部数据)", dataType = "int", defaultValue = "20"),
@ApiImplicitParam(name = "userId", value = "用户ID")
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_UPD_ROLE' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_UPD_ROLE' )")
@RequestMapping(value="", method = RequestMethod.GET) @RequestMapping(value="", method = RequestMethod.GET)
public ApiRes list() { public ApiPageRes<SysUserRoleRela> list() {
SysUserRoleRela queryObject = getObject(SysUserRoleRela.class); SysUserRoleRela queryObject = getObject(SysUserRoleRela.class);
...@@ -68,10 +81,16 @@ public class SysUserRoleRelaController extends CommonCtrl { ...@@ -68,10 +81,16 @@ public class SysUserRoleRelaController extends CommonCtrl {
IPage<SysUserRoleRela> pages = sysUserRoleRelaService.page(getIPage(true), condition); IPage<SysUserRoleRela> pages = sysUserRoleRelaService.page(getIPage(true), condition);
return ApiRes.page(pages); return ApiPageRes.pages( pages);
} }
/** 重置用户角色关联信息 */ /** 重置用户角色关联信息 */
@ApiOperation("更改用户角色信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "sysUserId", value = "用户ID", required = true),
@ApiImplicitParam(name = "roleIdListStr", value = "角色信息,eg:[str1,str2],字符串列表转成json字符串", required = true)
})
@PreAuthorize("hasAuthority( 'ENT_UR_USER_UPD_ROLE' )") @PreAuthorize("hasAuthority( 'ENT_UR_USER_UPD_ROLE' )")
@RequestMapping(value="relas/{sysUserId}", method = RequestMethod.POST) @RequestMapping(value="relas/{sysUserId}", method = RequestMethod.POST)
public ApiRes relas(@PathVariable("sysUserId") Long sysUserId) { public ApiRes relas(@PathVariable("sysUserId") Long sysUserId) {
......
...@@ -18,6 +18,10 @@ package com.jeequan.jeepay.mch.ctrl.transfer; ...@@ -18,6 +18,10 @@ package com.jeequan.jeepay.mch.ctrl.transfer;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import com.jeequan.jeepay.mch.websocket.server.WsChannelUserIdServer; import com.jeequan.jeepay.mch.websocket.server.WsChannelUserIdServer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -28,10 +32,17 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -28,10 +32,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021/8/13 17:54 * @date 2021/8/13 17:54
*/ */
@Api(tags = "商户转账")
@Controller @Controller
@RequestMapping("/api/anon/channelUserIdCallback") @RequestMapping("/api/anon/channelUserIdCallback")
public class ChannelUserIdNotifyController extends CommonCtrl { public class ChannelUserIdNotifyController extends CommonCtrl {
@ApiOperation("(转账)获取用户ID - 回调函数")
@ApiImplicitParams({
@ApiImplicitParam(name = "extParam", value = "扩展参数"),
@ApiImplicitParam(name = "channelUserId", value = "用户userId"),
@ApiImplicitParam(name = "appId", value = "应用ID")
})
@RequestMapping("") @RequestMapping("")
public String channelUserIdCallback() { public String channelUserIdCallback() {
......
...@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.JeepayClient; import com.jeequan.jeepay.JeepayClient;
import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.MchApp; import com.jeequan.jeepay.core.entity.MchApp;
import com.jeequan.jeepay.core.entity.MchPayPassage;
import com.jeequan.jeepay.core.entity.PayInterfaceConfig; import com.jeequan.jeepay.core.entity.PayInterfaceConfig;
import com.jeequan.jeepay.core.entity.PayInterfaceDefine; import com.jeequan.jeepay.core.entity.PayInterfaceDefine;
import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.exception.BizException;
...@@ -29,23 +28,23 @@ import com.jeequan.jeepay.core.utils.JeepayKit; ...@@ -29,23 +28,23 @@ import com.jeequan.jeepay.core.utils.JeepayKit;
import com.jeequan.jeepay.core.utils.StringKit; import com.jeequan.jeepay.core.utils.StringKit;
import com.jeequan.jeepay.exception.JeepayException; import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl; import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.model.TransferOrderCreateReqModel; import com.jeequan.jeepay.model.TransferOrderCreateReqModel;
import com.jeequan.jeepay.model.TransferOrderCreateResModel;
import com.jeequan.jeepay.request.PayOrderCreateRequest;
import com.jeequan.jeepay.request.TransferOrderCreateRequest; import com.jeequan.jeepay.request.TransferOrderCreateRequest;
import com.jeequan.jeepay.response.PayOrderCreateResponse;
import com.jeequan.jeepay.response.TransferOrderCreateResponse; import com.jeequan.jeepay.response.TransferOrderCreateResponse;
import com.jeequan.jeepay.service.impl.*; import com.jeequan.jeepay.service.impl.MchAppService;
import org.apache.commons.lang3.StringUtils; import com.jeequan.jeepay.service.impl.PayInterfaceConfigService;
import com.jeequan.jeepay.service.impl.PayInterfaceDefineService;
import com.jeequan.jeepay.service.impl.SysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* 转账api * 转账api
...@@ -54,6 +53,7 @@ import java.util.Set; ...@@ -54,6 +53,7 @@ import java.util.Set;
* @site https://www.jeequan.com * @site https://www.jeequan.com
* @date 2021/8/13 14:43 * @date 2021/8/13 14:43
*/ */
@Api(tags = "商户转账")
@RestController @RestController
@RequestMapping("/api/mchTransfers") @RequestMapping("/api/mchTransfers")
public class MchTransferController extends CommonCtrl { public class MchTransferController extends CommonCtrl {
...@@ -64,10 +64,14 @@ public class MchTransferController extends CommonCtrl { ...@@ -64,10 +64,14 @@ public class MchTransferController extends CommonCtrl {
@Autowired private SysConfigService sysConfigService; @Autowired private SysConfigService sysConfigService;
/** 查询商户对应应用下支持的支付通道 **/ /** 查询商户对应应用下支持的支付通道 **/
@ApiOperation("查询商户对应应用下支持的支付通道")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "appId", value = "应用ID", required = true)
})
@PreAuthorize("hasAuthority('ENT_MCH_TRANSFER_IF_CODE_LIST')") @PreAuthorize("hasAuthority('ENT_MCH_TRANSFER_IF_CODE_LIST')")
@GetMapping("/ifCodes/{appId}") @GetMapping("/ifCodes/{appId}")
public ApiRes ifCodeList(@PathVariable("appId") String appId) { public ApiRes<List> ifCodeList(@PathVariable("appId") String appId) {
List<String> ifCodeList = new ArrayList<>(); List<String> ifCodeList = new ArrayList<>();
payInterfaceConfigService.list( payInterfaceConfigService.list(
...@@ -88,6 +92,13 @@ public class MchTransferController extends CommonCtrl { ...@@ -88,6 +92,13 @@ public class MchTransferController extends CommonCtrl {
/** 获取渠道侧用户ID **/ /** 获取渠道侧用户ID **/
@ApiOperation("获取渠道侧用户ID")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "appId", value = "应用ID", required = true),
@ApiImplicitParam(name = "ifCode", value = "接口类型代码", required = true),
@ApiImplicitParam(name = "extParam", value = "扩展参数", required = true)
})
@PreAuthorize("hasAuthority('ENT_MCH_TRANSFER_CHANNEL_USER')") @PreAuthorize("hasAuthority('ENT_MCH_TRANSFER_CHANNEL_USER')")
@GetMapping("/channelUserId") @GetMapping("/channelUserId")
public ApiRes channelUserId() { public ApiRes channelUserId() {
...@@ -119,6 +130,22 @@ public class MchTransferController extends CommonCtrl { ...@@ -119,6 +130,22 @@ public class MchTransferController extends CommonCtrl {
/** 调起下单接口 **/ /** 调起下单接口 **/
@ApiOperation("调起转账接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "iToken", value = "用户身份凭证", required = true, paramType = "header"),
@ApiImplicitParam(name = "mchOrderNo", value = "商户订单号", required = true),
@ApiImplicitParam(name = "entryType", value = "入账方式: WX_CASH-微信零钱; ALIPAY_CASH-支付宝转账; BANK_CARD-银行卡", required = true),
@ApiImplicitParam(name = "ifCode", value = "接口类型代码", required = true),
@ApiImplicitParam(name = "amount", value = "转账金额,单位元", required = true),
@ApiImplicitParam(name = "accountNo", value = "收款账号", required = true),
@ApiImplicitParam(name = "accountName", value = "收款人姓名"),
@ApiImplicitParam(name = "bankName", value = "收款人开户行名称"),
@ApiImplicitParam(name = "clientIp", value = "客户端IP"),
@ApiImplicitParam(name = "transferDesc", value = "转账备注信息"),
@ApiImplicitParam(name = "notifyUrl", value = "通知地址"),
@ApiImplicitParam(name = "channelExtra", value = "特定渠道发起时额外参数"),
@ApiImplicitParam(name = "extParam", value = "扩展参数")
})
@PreAuthorize("hasAuthority('ENT_MCH_PAY_TEST_DO')") @PreAuthorize("hasAuthority('ENT_MCH_PAY_TEST_DO')")
@PostMapping("/doTransfer") @PostMapping("/doTransfer")
public ApiRes doTransfer() { public ApiRes doTransfer() {
......
Supports Markdown
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