liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

重构用户角色类

Browse Source
This commit is contained in:
liuchengqian 2023-02-06 10:30:57 +08:00
parent 85e6dbf06f
commit f3bff41275
10 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xkrs/common/account/JwtLoginFilter.java
View File

@ -2,7 +2,7 @@ package com.xkrs.common.account;
import com.xkrs.common.encapsulation.OutputEncapsulation; import com.xkrs.common.encapsulation.OutputEncapsulation;
import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.straw.service.SysUserService; import com.xkrs.straw.service.SysUserService;
import com.xkrs.utils.IpUtil; import com.xkrs.utils.IpUtil;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;

2
src/main/java/com/xkrs/common/account/TokenAuthenticationService.java
View File

@ -2,7 +2,7 @@ package com.xkrs.common.account;
import com.xkrs.common.encapsulation.OutputEncapsulation; import com.xkrs.common.encapsulation.OutputEncapsulation;
import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.Keys;

20
src/main/java/com/xkrs/controller/SysUserController.java
View File

@ -10,7 +10,7 @@ import com.xkrs.model.qo.SysUserRemarkQo;
import com.xkrs.model.qo.SysUserVipLevelQo; import com.xkrs.model.qo.SysUserVipLevelQo;
import com.xkrs.model.validation.SysUserQoInsert; import com.xkrs.model.validation.SysUserQoInsert;
import com.xkrs.model.validation.SysUserQoUpdate; import com.xkrs.model.validation.SysUserQoUpdate;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.service.RedisService; import com.xkrs.service.RedisService;
import com.xkrs.sms.SMSHelper; import com.xkrs.sms.SMSHelper;
import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.dao.SysUserDao;
@ -380,15 +380,15 @@ public class SysUserController {
*/ */
@GetMapping("/verificationCodeUpdate") @GetMapping("/verificationCodeUpdate")
public String verificationCodeUpdate(@RequestParam("phone") String phone) throws Exception { public String verificationCodeUpdate(@RequestParam("phone") String phone) throws Exception {
SysUserVo sysUserVo = sysUserDao.selectUserByUserName(phone); // SysUserVo sysUserVo = sysUserDao.selectUserByUserName(phone);
if (sysUserVo == null) { // if (sysUserVo == null) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "手机号错误，请使用您注册的手机号", locale); // return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "手机号错误，请使用您注册的手机号", locale);
} // }
List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll(); // List<AgentOrgEntity> agentOrgList = agentOrgDao.findAll();
String targetAgentOrgName = FirePointCodeUtils.getTargetAgentOrgName(sysUserVo.getAgentOrgId(), agentOrgList); // String targetAgentOrgName = FirePointCodeUtils.getTargetAgentOrgName(sysUserVo.getAgentOrgId(), agentOrgList);
String optCode = String.valueOf(RandomUtil.returnCode()); // String optCode = String.valueOf(RandomUtil.returnCode());
redisService.set(phone, optCode, 10, TimeUnit.MINUTES); // redisService.set(phone, optCode, 10, TimeUnit.MINUTES);
smsHelper.dispatchSMSCode(targetAgentOrgName, phone, optCode); // smsHelper.dispatchSMSCode(targetAgentOrgName, phone, optCode);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "", locale); return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "", locale);
} }

2
src/main/java/com/xkrs/straw/dao/RelRoleAuthorityDao.java
View File

@ -5,9 +5,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@Component
public interface RelRoleAuthorityDao extends JpaRepository<RelRoleAuthorityEntity, Long>, JpaSpecificationExecutor<RelRoleAuthorityEntity> { public interface RelRoleAuthorityDao extends JpaRepository<RelRoleAuthorityEntity, Long>, JpaSpecificationExecutor<RelRoleAuthorityEntity> {
/** /**

2
src/main/java/com/xkrs/straw/dao/RelUserRoleDao.java
View File

@ -3,7 +3,9 @@ package com.xkrs.straw.dao;
import com.xkrs.straw.model.entity.RelUserRoleEntity; import com.xkrs.straw.model.entity.RelUserRoleEntity;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;
@Component
public interface RelUserRoleDao extends JpaRepository<RelUserRoleEntity, Long>, JpaSpecificationExecutor<RelUserRoleEntity> { public interface RelUserRoleDao extends JpaRepository<RelUserRoleEntity, Long>, JpaSpecificationExecutor<RelUserRoleEntity> {
} }

2
src/main/java/com/xkrs/straw/dao/SysAuthorityDao.java
View File

@ -5,9 +5,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@Component
public interface SysAuthorityDao extends JpaRepository<SysAuthorityEntity, Long>, JpaSpecificationExecutor<SysAuthorityEntity> { public interface SysAuthorityDao extends JpaRepository<SysAuthorityEntity, Long>, JpaSpecificationExecutor<SysAuthorityEntity> {
/** /**

26
src/main/java/com/xkrs/straw/dao/SysUserDao.java
View File

@ -1,15 +1,17 @@
package com.xkrs.straw.dao; package com.xkrs.straw.dao;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@Component
public interface SysUserDao extends JpaRepository<SysUserEntity, Long>, JpaSpecificationExecutor<SysUserEntity> { public interface SysUserDao extends JpaRepository<SysUserEntity, Long>, JpaSpecificationExecutor<SysUserEntity> {
@Modifying(clearAutomatically = true) @Modifying(clearAutomatically = true)
@ -62,17 +64,17 @@ public interface SysUserDao extends JpaRepository<SysUserEntity, Long>, JpaSpeci
@Query(value = "DELETE FROM sys_user WHERE user_name = :userName ;", nativeQuery = true) @Query(value = "DELETE FROM sys_user WHERE user_name = :userName ;", nativeQuery = true)
int deleteSysUser(@Param("userName") String userName); int deleteSysUser(@Param("userName") String userName);
/** // /**
* 查询用户信息 // * 查询用户信息
*/ // */
@Query(value = "select new com.xkrs.model.vo.SysUserVo (id,reallyName,telephone,countyCode,activeFlag,addTime,overTime,dayNum,accountType,countyName,lastEntryIp,loginNum,loginLastTime,vipLevel,receiveSms,remark,agentOrgId) from SysUserEntity") // @Query(value = "select new com.xkrs.straw.model.vo.SysUserVo (id,reallyName,telephone,countyCode,activeFlag,addTime,overTime,dayNum,accountType,countyName,lastEntryIp,loginNum,loginLastTime,vipLevel,receiveSms,remark,agentOrgId) from SysUserEntity")
List<SysUserVo> selectAll(); // List<SysUserVo> selectAll();
//
/** // /**
* 根据用户名查询实体信息 // * 根据用户名查询实体信息
*/ // */
@Query(value = "select new com.xkrs.model.vo.SysUserVo (id,reallyName,telephone,countyCode,activeFlag,addTime,overTime,dayNum,accountType,countyName,lastEntryIp,loginNum,loginLastTime,vipLevel,receiveSms,remark,agentOrgId) from SysUserEntity where userName = :userName") // @Query(value = "select new com.xkrs.straw.model.vo.SysUserVo (id,reallyName,telephone,countyCode,activeFlag,addTime,overTime,dayNum,accountType,countyName,lastEntryIp,loginNum,loginLastTime,vipLevel,receiveSms,remark,agentOrgId) from SysUserEntity where userName = :userName")
SysUserVo selectUserByUserName(String userName); // SysUserVo selectUserByUserName(String userName);
/** /**
* 启用 * 启用

2
src/main/java/com/xkrs/model/vo/SysUserVo.java → src/main/java/com/xkrs/straw/model/vo/SysUserVo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.model.vo; package com.xkrs.straw.model.vo;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/com/xkrs/straw/service/SysUserService.java
View File

@ -1,7 +1,7 @@
package com.xkrs.straw.service; package com.xkrs.straw.service;
import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;

14
src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.dao.StreetDao; import com.xkrs.dao.StreetDao;
import com.xkrs.model.entity.StreetEntity; import com.xkrs.model.entity.StreetEntity;
import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.service.RedisService; import com.xkrs.service.RedisService;
import com.xkrs.straw.dao.RelRoleAuthorityDao; import com.xkrs.straw.dao.RelRoleAuthorityDao;
import com.xkrs.straw.dao.RelUserRoleDao; import com.xkrs.straw.dao.RelUserRoleDao;
@ -202,11 +202,11 @@ public class SysUserServiceImpl implements SysUserService {
RelUserRoleEntity relUserRoleEntity = new RelUserRoleEntity(); RelUserRoleEntity relUserRoleEntity = new RelUserRoleEntity();
relUserRoleEntity.setUserId(sysUserEntity.getId()); relUserRoleEntity.setUserId(sysUserEntity.getId());
relUserRoleEntity.setRoleId(2); relUserRoleEntity.setRoleId(2L);
RelRoleAuthorityEntity relRoleAuthorityEntity = new RelRoleAuthorityEntity(); RelRoleAuthorityEntity relRoleAuthorityEntity = new RelRoleAuthorityEntity();
relRoleAuthorityEntity.setRoleId(2); relRoleAuthorityEntity.setRoleId(2L);
relRoleAuthorityEntity.setAuthorityId(2); relRoleAuthorityEntity.setAuthorityId(2L);
relRoleAuthorityEntity.setUserId(sysUserEntity.getId()); relRoleAuthorityEntity.setUserId(sysUserEntity.getId());
relUserRoleDao.save(relUserRoleEntity); relUserRoleDao.save(relUserRoleEntity);
@ -280,7 +280,8 @@ public class SysUserServiceImpl implements SysUserService {
*/ */
@Override @Override
public List<SysUserVo> selectAllUser() { public List<SysUserVo> selectAllUser() {
return sysUserDao.selectAll(); // return sysUserDao.selectAll();
return null;
} }
/** /**
@ -351,7 +352,8 @@ public class SysUserServiceImpl implements SysUserService {
@Override @Override
public SysUserVo getUserByUserName(String userName) { public SysUserVo getUserByUserName(String userName) {
return sysUserDao.selectUserByUserName(userName); // return sysUserDao.selectUserByUserName(userName);
return null;
} }
/** /**