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-03 17:03:47 +08:00
parent e85d818b67
commit 5ba0da6326
13 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
package com.xkrs.common.account; package com.xkrs.common.account;
import com.xkrs.model.entity.SysAuthorityEntity; import com.xkrs.model.entity.SysAuthorityEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.service.SysAuthorityService; import com.xkrs.service.SysAuthorityService;
import com.xkrs.service.SysRoleService; import com.xkrs.service.SysRoleService;
import com.xkrs.service.SysUserService; import com.xkrs.service.SysUserService;

4
src/main/java/com/xkrs/controller/FirePointController.java
View File

@ -3,9 +3,9 @@ package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.common.tool.TokenUtil; import com.xkrs.common.tool.TokenUtil;
import com.xkrs.dao.FirePointDao; import com.xkrs.dao.FirePointDao;
import com.xkrs.dao.SysUserDao; import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.model.entity.FirePointEntity; import com.xkrs.model.entity.FirePointEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.qo.AuditFireTypeQo; import com.xkrs.model.qo.AuditFireTypeQo;
import com.xkrs.model.qo.FirePointQo; import com.xkrs.model.qo.FirePointQo;
import com.xkrs.service.FirePointService; import com.xkrs.service.FirePointService;

4
src/main/java/com/xkrs/controller/PushController.java
View File

@ -1,8 +1,8 @@
package com.xkrs.controller; package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.dao.SysUserDao; import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.qo.SysUserPushAccountQo; import com.xkrs.model.qo.SysUserPushAccountQo;
import com.xkrs.sms.PushHelper; import com.xkrs.sms.PushHelper;
import org.apache.hc.core5.util.TextUtils; import org.apache.hc.core5.util.TextUtils;

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

@ -3,9 +3,9 @@ package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum; import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.common.tool.TokenUtil; import com.xkrs.common.tool.TokenUtil;
import com.xkrs.dao.AgentOrgDao; import com.xkrs.dao.AgentOrgDao;
import com.xkrs.dao.SysUserDao; import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.model.entity.AgentOrgEntity; import com.xkrs.model.entity.AgentOrgEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.qo.SysUserReceiveSmsQo; import com.xkrs.model.qo.SysUserReceiveSmsQo;
import com.xkrs.model.qo.SysUserRemarkQo; import com.xkrs.model.qo.SysUserRemarkQo;

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

@ -1,6 +1,6 @@
package com.xkrs.service; package com.xkrs.service;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.model.vo.SysUserVo;

2
src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
View File

@ -11,6 +11,8 @@ import com.xkrs.service.GlobalConfigService;
import com.xkrs.service.StreetService; import com.xkrs.service.StreetService;
import com.xkrs.sms.PushHelper; import com.xkrs.sms.PushHelper;
import com.xkrs.sms.SMSHelper; import com.xkrs.sms.SMSHelper;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.utils.*; import com.xkrs.utils.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

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

@ -7,6 +7,8 @@ import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.model.vo.SysUserVo;
import com.xkrs.service.RedisService; import com.xkrs.service.RedisService;
import com.xkrs.service.SysUserService; import com.xkrs.service.SysUserService;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.utils.DateTimeUtil; import com.xkrs.utils.DateTimeUtil;
import org.apache.http.util.TextUtils; import org.apache.http.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;

2
src/main/java/com/xkrs/sms/PushHelper.java
View File

@ -6,7 +6,7 @@ import com.xiaomi.xmpush.server.Message;
import com.xiaomi.xmpush.server.Result; import com.xiaomi.xmpush.server.Result;
import com.xiaomi.xmpush.server.Sender; import com.xiaomi.xmpush.server.Sender;
import com.xkrs.model.entity.FirePointEntity; import com.xkrs.model.entity.FirePointEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/com/xkrs/sms/SMSHelper.java
View File

@ -3,7 +3,7 @@ package com.xkrs.sms;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.xkrs.model.entity.FirePointEntity; import com.xkrs.model.entity.FirePointEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.utils.AliYunSmsUtils; import com.xkrs.utils.AliYunSmsUtils;
import com.xkrs.utils.HttpClientUtils; import com.xkrs.utils.HttpClientUtils;
import com.xkrs.utils.SMSUtils; import com.xkrs.utils.SMSUtils;

2
src/main/java/com/xkrs/sms/WeChatMessageHelper.java
View File

@ -3,7 +3,7 @@ package com.xkrs.sms;
import com.xkrs.dao.GlobalConfigurationDao; import com.xkrs.dao.GlobalConfigurationDao;
import com.xkrs.model.entity.FirePointEntity; import com.xkrs.model.entity.FirePointEntity;
import com.xkrs.model.entity.GlobalConfigurationEntity; import com.xkrs.model.entity.GlobalConfigurationEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.service.GlobalConfigurationService; import com.xkrs.service.GlobalConfigurationService;
import com.xkrs.straw.model.bean.KeyValueBean; import com.xkrs.straw.model.bean.KeyValueBean;
import com.xkrs.utils.HttpClientUtils; import com.xkrs.utils.HttpClientUtils;

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

@ -1,6 +1,6 @@
package com.xkrs.dao; package com.xkrs.straw.dao;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.vo.SysUserVo; import com.xkrs.model.vo.SysUserVo;
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;

2
src/main/java/com/xkrs/model/entity/SysUserEntity.java → src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.model.entity; package com.xkrs.straw.model.entity;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;

2
src/main/java/com/xkrs/utils/FirePointCodeUtils.java
View File

@ -1,7 +1,7 @@
package com.xkrs.utils; package com.xkrs.utils;
import com.xkrs.model.entity.AgentOrgEntity; import com.xkrs.model.entity.AgentOrgEntity;
import com.xkrs.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import org.apache.hc.core5.util.TextUtils; import org.apache.hc.core5.util.TextUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;