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

后端更改表结构

parent 893297f6
Hide whitespace changes
Inline Side-by-side
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysRoleEntRelaService.java
View file @ 7de741c9
......@@ -47,7 +47,7 @@ public class SysRoleEntRelaService extends ServiceImpl<SysRoleEntRelaMapper, Sys
if(isAdmin == CS.YES){
List<String> result = new ArrayList<>();
sysEntitlementService.list(SysEntitlement.gw().select(SysEntitlement::getEntId).eq(SysEntitlement::getSystem, system).eq(SysEntitlement::getState, CS.PUB_USABLE)
sysEntitlementService.list(SysEntitlement.gw().select(SysEntitlement::getEntId).eq(SysEntitlement::getSysType, system).eq(SysEntitlement::getState, CS.PUB_USABLE)
).stream().forEach(r -> result.add(r.getEntId()));
return result;
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysUserAuthService.java
View file @ 7de741c9
......@@ -52,13 +52,13 @@ public class SysUserAuthService extends ServiceImpl<SysUserAuthMapper, SysUserAu
String userPwd = new BCryptPasswordEncoder().encode(pwdRaw);
/** 用户名登录方式 */
SysUserAuth record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSystem(system);
SysUserAuth record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSysType(system);
record.setIdentityType(CS.AUTH_TYPE.LOGIN_USER_NAME);
record.setIdentifier(loginUserName);
save(record);
/** 手机号登录方式 */
record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSystem(system);
record = new SysUserAuth(); record.setUserId(userId); record.setCredential(userPwd); record.setSalt(salt);record.setSysType(system);
record.setIdentityType(CS.AUTH_TYPE.TELPHONE);
record.setIdentifier(telPhone);
save(record);
......@@ -86,7 +86,7 @@ public class SysUserAuthService extends ServiceImpl<SysUserAuthMapper, SysUserAu
//更改密码
if(StringUtils.isNotEmpty(newPwd)){
//根据当前用户ID 查询出用户的所有认证记录
List<SysUserAuth> authList = list(SysUserAuth.gw().eq(SysUserAuth::getSystem, system).eq(SysUserAuth::getUserId, resetUserId));
List<SysUserAuth> authList = list(SysUserAuth.gw().eq(SysUserAuth::getSysType, system).eq(SysUserAuth::getUserId, resetUserId));
for (SysUserAuth auth : authList) {
if(StringUtils.isEmpty(auth.getSalt())){ //可能为其他登录方式， 不存在salt
continue;
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysUserService.java
View file @ 7de741c9
......@@ -62,15 +62,15 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
if(sysUser.getSex() == null ) throw new BizException("性别不能为空！");
//登录用户名不可重复
if( count(SysUser.gw().eq(SysUser::getSystem, system).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0 ){
if( count(SysUser.gw().eq(SysUser::getSysType, system).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0 ){
throw new BizException("登录用户名已存在！");
}
//手机号不可重复
if( count(SysUser.gw().eq(SysUser::getSystem, system).eq(SysUser::getTelphone, sysUser.getTelphone())) > 0 ){
if( count(SysUser.gw().eq(SysUser::getSysType, system).eq(SysUser::getTelphone, sysUser.getTelphone())) > 0 ){
throw new BizException("手机号已存在！");
}
//员工号不可重复
if( count(SysUser.gw().eq(SysUser::getSystem, system).eq(SysUser::getUserNo, sysUser.getUserNo())) > 0 ){
if( count(SysUser.gw().eq(SysUser::getSysType, system).eq(SysUser::getUserNo, sysUser.getUserNo())) > 0 ){
throw new BizException("员工号已存在！");
}
......@@ -82,7 +82,7 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
}
//1. 插入用户主表
sysUser.setSystem(system); // 系统类型
sysUser.setSysType(system); // 系统类型
this.save(sysUser);
Long sysUserId = sysUser.getSysUserId();
......@@ -109,21 +109,21 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
//修改了手机号， 需要修改auth表信息
if(!dbRecord.getTelphone().equals(sysUser.getTelphone())){
if(count(SysUser.gw().eq(SysUser::getSystem, dbRecord.getSystem()).eq(SysUser::getTelphone, sysUser.getTelphone())) > 0){
if(count(SysUser.gw().eq(SysUser::getSysType, dbRecord.getSysType()).eq(SysUser::getTelphone, sysUser.getTelphone())) > 0){
throw new BizException("该手机号已关联其他用户！");
}
sysUserAuthService.resetAuthInfo(sysUserId, null, sysUser.getTelphone(), null, dbRecord.getSystem());
sysUserAuthService.resetAuthInfo(sysUserId, null, sysUser.getTelphone(), null, dbRecord.getSysType());
}
//修改了手机号， 需要修改auth表信息
if(!dbRecord.getLoginUsername().equals(sysUser.getLoginUsername())){
if(count(SysUser.gw().eq(SysUser::getSystem, dbRecord.getSystem()).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0){
if(count(SysUser.gw().eq(SysUser::getSysType, dbRecord.getSysType()).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0){
throw new BizException("该登录用户名已关联其他用户！");
}
sysUserAuthService.resetAuthInfo(sysUserId, sysUser.getLoginUsername(), null, null, dbRecord.getSystem());
sysUserAuthService.resetAuthInfo(sysUserId, sysUser.getLoginUsername(), null, null, dbRecord.getSysType());
}
//修改用户主表
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysEntitlementMapper.java
View file @ 7de741c9
......@@ -29,6 +29,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface SysEntitlementMapper extends BaseMapper<SysEntitlement> {
Integer userHasLeftMenu(@Param("userId") Long userId, @Param("system") String system);
Integer userHasLeftMenu(@Param("userId") Long userId, @Param("sysType") String sysType);
}
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysEntitlementMapper.xml
View file @ 7de741c9
......@@ -14,7 +14,7 @@
<result column="state" property="state" />
<result column="pid" property="pid" />
<result column="ent_sort" property="entSort" />
<result column="system" property="system" />
<result column="sys_type" property="sysType" />
<result column="created_at" property="createdAt" />
<result column="updated_at" property="updatedAt" />
</resultMap>
......@@ -25,7 +25,7 @@
select DISTINCT ent_id from t_sys_role_ent_rela where role_id in (
select role_id from t_sys_user_role_rela where user_id = #{userId}
)
) and state = 1 and ent_type = 'ML' and system = #{system}
) and state = 1 and ent_type = 'ML' and sys_type = #{sysType}
</select>
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysLogMapper.xml
View file @ 7de741c9
......@@ -8,7 +8,7 @@
<result column="user_id" property="userId" />
<result column="user_name" property="userName" />
<result column="user_ip" property="userIp" />
<result column="system" property="system" />
<result column="sys_type" property="sysType" />
<result column="method_name" property="methodName" />
<result column="method_remark" property="methodRemark" />
<result column="req_url" property="reqUrl" />
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysRoleEntRelaMapper.java
View file @ 7de741c9
......@@ -31,6 +31,6 @@ import java.util.List;
*/
public interface SysRoleEntRelaMapper extends BaseMapper<SysRoleEntRela> {
List<String> selectEntIdsByUserId(@Param("userId") Long userId, @Param("system") String system);
List<String> selectEntIdsByUserId(@Param("userId") Long userId, @Param("sysType") String sysType);
}
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysRoleEntRelaMapper.xml
View file @ 7de741c9
......@@ -13,7 +13,7 @@
select distinct ent_id from t_sys_entitlement where ent_id in (
select distinct re.ent_id from t_sys_role_ent_rela re left join t_sys_user_role_rela ur on re.role_id = ur.role_id
where ur.user_id = #{userId}
) and `system` = #{system} and state = 1
) and `sys_type` = #{sysType} and state = 1
</select>
</mapper>
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysRoleMapper.xml
View file @ 7de741c9
......@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.jeequan.jeepay.core.entity.SysRole">
<id column="role_id" property="roleId" />
<result column="role_name" property="roleName" />
<result column="system" property="system" />
<result column="sys_type" property="sysType" />
<result column="belong_info_id" property="belongInfoId" />
<result column="updated_at" property="updatedAt" />
</resultMap>
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysUserAuthMapper.java
View file @ 7de741c9
......@@ -30,6 +30,6 @@ import com.jeequan.jeepay.core.entity.SysUserAuth;
public interface SysUserAuthMapper extends BaseMapper<SysUserAuth> {
SysUserAuth selectByLogin(@Param("identifier")String identifier,
@Param("identityType")Byte identityType, @Param("system")String system);
@Param("identityType")Byte identityType, @Param("sysType")String sysType);
}
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysUserAuthMapper.xml
View file @ 7de741c9
......@@ -10,14 +10,14 @@
<result column="identifier" property="identifier" />
<result column="credential" property="credential" />
<result column="salt" property="salt" />
<result column="system" property="system" />
<result column="sys_type" property="sysType" />
</resultMap>
<!-- 根据登录信息查询 -->
<select id="selectByLogin" resultMap="BaseResultMap">
select a.* from t_sys_user_auth a left join t_sys_user u on a.user_id = u.sys_user_id
where a.identity_type = #{identityType} and a.identifier = #{identifier} and a.system = #{system}
where a.identity_type = #{identityType} and a.identifier = #{identifier} and a.sys_type = #{sysType}
</select>
......
jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/SysUserMapper.xml
View file @ 7de741c9
......@@ -12,7 +12,7 @@
<result column="user_no" property="userNo" />
<result column="is_admin" property="isAdmin" />
<result column="state" property="state" />
<result column="system" property="system" />
<result column="sys_type" property="sysType" />
<result column="belong_info_id" property="belongInfoId" />
<result column="created_at" property="createdAt" />
<result column="updated_at" property="updatedAt" />
......
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