Skip to content
GitLab
Commit 7de741c9 authored by terrfly's avatar terrfly
Browse files

后端更改表结构

parent 893297f6
Hide whitespace changes
Inline Side-by-side
docs/sql/init.sql
View file @ 7de741c9
......@@ -30,10 +30,10 @@ CREATE TABLE `t_sys_entitlement` (
`state` TINYINT(6) NOT NULL DEFAULT 1 COMMENT '状态 0-停用, 1-启用',
`pid` VARCHAR(32) NOT NULL COMMENT '父ID',
`ent_sort` INT(11) NOT NULL DEFAULT 0 COMMENT '排序字段, 规则：正序',
`system` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间',
`updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间',
PRIMARY KEY (`ent_id`, `system`)
PRIMARY KEY (`ent_id`, `sys_type`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统权限表';
-- 角色表
......@@ -41,7 +41,7 @@ DROP TABLE IF EXISTS `t_sys_role`;
CREATE TABLE `t_sys_role` (
`role_id` VARCHAR(32) NOT NULL COMMENT '角色ID, ROLE_开头',
`role_name` VARCHAR(32) NOT NULL COMMENT '角色名称',
`system` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`belong_info_id` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '所属商户ID / 0(平台)',
`updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间',
PRIMARY KEY (`role_id`)
......@@ -67,14 +67,14 @@ CREATE TABLE `t_sys_user` (
`user_no` VARCHAR(32) COMMENT '员工编号',
`is_admin` TINYINT(6) NOT NULL DEFAULT 0 COMMENT '是否超管（超管拥有全部权限） 0-否 1-是',
`state` TINYINT(6) NOT NULL DEFAULT 0 COMMENT '状态 0-停用 1-启用',
`system` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`belong_info_id` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '所属商户ID / 0(平台)',
`created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT '创建时间',
`updated_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '更新时间',
PRIMARY KEY (`sys_user_id`),
UNIQUE KEY(`system`,`login_username`),
UNIQUE KEY(`system`,`telphone`),
UNIQUE KEY(`system`, `user_no`)
UNIQUE KEY(`sys_type`,`login_username`),
UNIQUE KEY(`sys_type`,`telphone`),
UNIQUE KEY(`sys_type`, `user_no`)
) ENGINE=InnoDB AUTO_INCREMENT=100001 DEFAULT CHARSET=utf8mb4 COMMENT='系统用户表';
-- 系统用户认证表
......@@ -86,7 +86,7 @@ CREATE TABLE `t_sys_user_auth` (
`identifier` VARCHAR(128) NOT NULL COMMENT '认证标识 ( 用户名 | open_id )',
`credential` VARCHAR(128) NOT NULL COMMENT '密码凭证',
`salt` VARCHAR(128) NOT NULL COMMENT 'salt',
`system` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`sys_type` VARCHAR(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
PRIMARY KEY (`auth_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8mb4 COMMENT='系统用户认证表';
......@@ -121,7 +121,7 @@ CREATE TABLE `t_sys_log` (
`user_id` bigint(20) DEFAULT NULL COMMENT '系统用户ID',
`user_name` varchar(32) DEFAULT NULL COMMENT '用户姓名',
`user_ip` varchar(128) NOT NULL DEFAULT '' COMMENT '用户IP',
`system` varchar(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`sys_type` varchar(8) NOT NULL COMMENT '所属系统： MGR-运营平台, MCH-商户中心',
`method_name` varchar(128) NOT NULL DEFAULT '' COMMENT '方法名',
`method_remark` varchar(128) NOT NULL DEFAULT '' COMMENT '方法描述',
`req_url` varchar(256) NOT NULL DEFAULT '' COMMENT '请求地址',
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/SysEntitlement.java
View file @ 7de741c9
......@@ -100,7 +100,7 @@ public class SysEntitlement extends BaseModel {
/**
* 所属系统： MGR-运营平台, MCH-商户中心
*/
private String system;
private String sysType;
/**
* 创建时间
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/SysLog.java
View file @ 7de741c9
......@@ -70,7 +70,7 @@ public class SysLog implements Serializable {
/**
* 所属系统： MGR-运营平台, MCH-商户中心
*/
private String system;
private String sysType;
/**
* 方法名
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/SysRole.java
View file @ 7de741c9
......@@ -60,7 +60,7 @@ public class SysRole implements Serializable {
/**
* 所属系统： MGR-运营平台, MCH-商户中心
*/
private String system;
private String sysType;
/**
* 所属商户ID / 0(平台)
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/SysUser.java
View file @ 7de741c9
......@@ -96,7 +96,7 @@ public class SysUser extends BaseModel {
/**
* 所属系统： MGR-运营平台, MCH-商户中心
*/
private String system;
private String sysType;
/**
* 所属商户ID / 0(平台)
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/SysUserAuth.java
View file @ 7de741c9
......@@ -80,7 +80,7 @@ public class SysUserAuth implements Serializable {
/**
* 所属系统： MGR-运营平台, MCH-商户中心
*/
private String system;
private String sysType;
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
View file @ 7de741c9
......@@ -70,7 +70,7 @@ public class CurrentUserController extends CommonCtrl{
allMenuList = sysEntitlementService.list(SysEntitlement.gw()
.in(SysEntitlement::getEntId, entIdList)
.in(SysEntitlement::getEntType, Arrays.asList(CS.ENT_TYPE.MENU_LEFT, CS.ENT_TYPE.MENU_OTHER))
.eq(SysEntitlement::getSystem, CS.SYS_TYPE.MGR)
.eq(SysEntitlement::getSysType, CS.SYS_TYPE.MGR)
.eq(SysEntitlement::getState, CS.PUB_USABLE));
}
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java
View file @ 7de741c9
......@@ -143,7 +143,7 @@ public class MchInfoController extends CommonCtrl {
List<Long> userIdList = new ArrayList<>();
List<SysUser> userList = sysUserService.list(SysUser.gw()
.eq(SysUser::getBelongInfoId, mchNo)
.eq(SysUser::getSystem, CS.SYS_TYPE.MCH)
.eq(SysUser::getSysType, CS.SYS_TYPE.MCH)
);
if (userList.size() > 0) {
for (SysUser user:userList) {
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysEntController.java
View file @ 7de741c9
......@@ -55,7 +55,7 @@ public class SysEntController extends CommonCtrl {
return ApiRes.ok(sysEntitlementService.getOne(SysEntitlement.gw()
.eq(SysEntitlement::getEntId, getValStringRequired("entId"))
.eq(SysEntitlement::getSystem, getValStringRequired("system")))
.eq(SysEntitlement::getSysType, getValStringRequired("system")))
);
}
......@@ -66,7 +66,7 @@ public class SysEntController extends CommonCtrl {
public ApiRes updateById(@PathVariable("entId") String entId) {
SysEntitlement queryObject = getObject(SysEntitlement.class);
sysEntitlementService.update(queryObject, SysEntitlement.gw().eq(SysEntitlement::getEntId, entId).eq(SysEntitlement::getSystem, queryObject.getSystem()));
sysEntitlementService.update(queryObject, SysEntitlement.gw().eq(SysEntitlement::getEntId, entId).eq(SysEntitlement::getSysType, queryObject.getSysType()));
return ApiRes.ok();
}
......@@ -77,7 +77,7 @@ public class SysEntController extends CommonCtrl {
public ApiRes showTree() {
//查询全部数据
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSystem, getValStringRequired("system")));
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, getValStringRequired("system")));
//转换为json树状结构
JSONArray jsonArray = (JSONArray) JSONArray.toJSON(list);
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java
View file @ 7de741c9
......@@ -64,7 +64,7 @@ public class SysLogController extends CommonCtrl {
condition.orderByDesc(SysLog::getCreatedAt);
if (sysLog.getUserId() != null) condition.eq(SysLog::getUserId, sysLog.getUserId());
if (sysLog.getUserName() != null) condition.eq(SysLog::getUserName, sysLog.getUserName());
if (StringUtils.isNotEmpty(sysLog.getSystem())) condition.eq(SysLog::getSystem, sysLog.getSystem());
if (StringUtils.isNotEmpty(sysLog.getSysType())) condition.eq(SysLog::getSysType, sysLog.getSysType());
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) condition.ge(SysLog::getCreatedAt, paramJSON.getString("createdStart"));
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) condition.le(SysLog::getCreatedAt, paramJSON.getString("createdEnd"));
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysRoleController.java
View file @ 7de741c9
......@@ -70,7 +70,7 @@ public class SysRoleController extends CommonCtrl {
QueryWrapper<SysRole> condition = new QueryWrapper<>();
LambdaQueryWrapper<SysRole> lambdaCondition = condition.lambda();
lambdaCondition.eq(SysRole::getSystem, CS.SYS_TYPE.MGR);
lambdaCondition.eq(SysRole::getSysType, CS.SYS_TYPE.MGR);
lambdaCondition.eq(SysRole::getBelongInfoId, 0);
if(StringUtils.isNotEmpty(queryObject.getRoleName())){
......@@ -109,7 +109,7 @@ public class SysRoleController extends CommonCtrl {
SysRole SysRole = getObject(SysRole.class);
String roleId = "ROLE_" + StringKit.getUUID(6);
SysRole.setRoleId(roleId);
SysRole.setSystem(CS.SYS_TYPE.MGR); //后台系统
SysRole.setSysType(CS.SYS_TYPE.MGR); //后台系统
sysRoleService.save(SysRole);
//权限信息集合
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysUserController.java
View file @ 7de741c9
......@@ -60,7 +60,7 @@ public class SysUserController extends CommonCtrl {
SysUser queryObject = getObject(SysUser.class);
LambdaQueryWrapper<SysUser> condition = SysUser.gw();
condition.eq(SysUser::getSystem, CS.SYS_TYPE.MGR);
condition.eq(SysUser::getSysType, CS.SYS_TYPE.MGR);
if(StringUtils.isNotEmpty(queryObject.getRealname())){
condition.like(SysUser::getRealname, queryObject.getRealname());
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/service/AuthService.java
View file @ 7de741c9
......@@ -166,7 +166,7 @@ public class AuthService {
//用户拥有的角色集合 需要以ROLE_ 开头, 用户拥有的权限集合
List<String> roleList = sysRoleService.findListByUser(sysUser.getSysUserId());
List<String> entList = sysRoleEntRelaService.selectEntIdsByUserId(sysUser.getSysUserId(), sysUser.getIsAdmin(), sysUser.getSystem());
List<String> entList = sysRoleEntRelaService.selectEntIdsByUserId(sysUser.getSysUserId(), sysUser.getIsAdmin(), sysUser.getSysType());
List<SimpleGrantedAuthority> grantedAuthorities = new LinkedList<>();
roleList.stream().forEach(role -> grantedAuthorities.add(new SimpleGrantedAuthority(role)));
......
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java
View file @ 7de741c9
......@@ -160,7 +160,7 @@ public class MethodLogAop{
sysLog.setReqUrl(request.getRequestURL().toString());
sysLog.setUserIp(requestKitBean.getClientIp());
sysLog.setCreatedAt(new Date());
sysLog.setSystem(CS.SYS_TYPE.MCH);
sysLog.setSysType(CS.SYS_TYPE.MCH);
if (userDetails != null) {
sysLog.setUserId(JeeUserDetails.getCurrentUserDetails().getSysUser().getSysUserId());
......
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
View file @ 7de741c9
......@@ -73,7 +73,7 @@ public class CurrentUserController extends CommonCtrl{
allMenuList = sysEntitlementService.list(SysEntitlement.gw()
.in(SysEntitlement::getEntId, entIdList)
.in(SysEntitlement::getEntType, Arrays.asList(CS.ENT_TYPE.MENU_LEFT, CS.ENT_TYPE.MENU_OTHER))
.eq(SysEntitlement::getSystem, CS.SYS_TYPE.MCH)
.eq(SysEntitlement::getSysType, CS.SYS_TYPE.MCH)
.eq(SysEntitlement::getState, CS.PUB_USABLE));
}
......
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysEntController.java
View file @ 7de741c9
......@@ -53,7 +53,7 @@ public class SysEntController extends CommonCtrl {
public ApiRes showTree() {
//查询全部数据
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSystem, CS.SYS_TYPE.MCH));
List<SysEntitlement> list = sysEntitlementService.list(SysEntitlement.gw().eq(SysEntitlement::getSysType, CS.SYS_TYPE.MCH));
//4. 转换为json树状结构
JSONArray jsonArray = (JSONArray) JSONArray.toJSON(list);
......
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleController.java
View file @ 7de741c9
......@@ -69,7 +69,7 @@ public class SysRoleController extends CommonCtrl {
SysRole queryObject = getObject(SysRole.class);
LambdaQueryWrapper<SysRole> condition = SysRole.gw();
condition.eq(SysRole::getSystem, CS.SYS_TYPE.MCH);
condition.eq(SysRole::getSysType, CS.SYS_TYPE.MCH);
condition.eq(SysRole::getBelongInfoId, getCurrentMchNo());
if(StringUtils.isNotEmpty(queryObject.getRoleName())){
......@@ -103,7 +103,7 @@ public class SysRoleController extends CommonCtrl {
SysRole SysRole = getObject(SysRole.class);
String roleId = "ROLE_" + StringKit.getUUID(6);
SysRole.setRoleId(roleId);
SysRole.setSystem(CS.SYS_TYPE.MCH); //后台系统
SysRole.setSysType(CS.SYS_TYPE.MCH); //后台系统
SysRole.setBelongInfoId(getCurrentUser().getSysUser().getBelongInfoId());
sysRoleService.save(SysRole);
......
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
View file @ 7de741c9
......@@ -62,7 +62,7 @@ public class SysUserController extends CommonCtrl {
SysUser queryObject = getObject(SysUser.class);
LambdaQueryWrapper<SysUser> condition = SysUser.gw();
condition.eq(SysUser::getSystem, CS.SYS_TYPE.MCH);
condition.eq(SysUser::getSysType, CS.SYS_TYPE.MCH);
condition.eq(SysUser::getBelongInfoId, getCurrentUser().getSysUser().getBelongInfoId());
if(StringUtils.isNotEmpty(queryObject.getRealname())){
......
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/service/AuthService.java
View file @ 7de741c9
......@@ -176,7 +176,7 @@ public class AuthService {
//用户拥有的角色集合 需要以ROLE_ 开头, 用户拥有的权限集合
List<String> roleList = sysRoleService.findListByUser(sysUser.getSysUserId());
List<String> entList = sysRoleEntRelaService.selectEntIdsByUserId(sysUser.getSysUserId(), sysUser.getIsAdmin(), sysUser.getSystem());
List<String> entList = sysRoleEntRelaService.selectEntIdsByUserId(sysUser.getSysUserId(), sysUser.getIsAdmin(), sysUser.getSysType());
List<SimpleGrantedAuthority> grantedAuthorities = new LinkedList<>();
roleList.stream().forEach(role -> grantedAuthorities.add(new SimpleGrantedAuthority(role)));
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java
View file @ 7de741c9
......@@ -108,7 +108,7 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
List<SysUser> userList = sysUserService.list(SysUser.gw()
.eq(SysUser::getBelongInfoId, mchNo)
.eq(SysUser::getSystem, CS.SYS_TYPE.MCH)
.eq(SysUser::getSysType, CS.SYS_TYPE.MCH)
);
// 返回的用户id
List<Long> userIdList = new ArrayList<>();
......@@ -123,7 +123,7 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
// 5.删除当前商户的登录用户
sysUserService.remove(SysUser.gw()
.eq(SysUser::getBelongInfoId, mchNo)
.eq(SysUser::getSystem, CS.SYS_TYPE.MCH)
.eq(SysUser::getSysType, CS.SYS_TYPE.MCH)
);
// 6.删除当前商户
......
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