Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
43ae8500
提交
43ae8500
authored
7月 14, 2023
作者:
zhenjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
后台用户、小程序用户“删除”字段修改为“禁用”字段
上级
450ed0e1
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
47 行增加
和
261 行删除
+47
-261
UserAccountSimpleDTO.java
...ava/com/mmc/iuav/user/model/dto/UserAccountSimpleDTO.java
+0
-2
UserAccountVO.java
...c/main/java/com/mmc/iuav/user/model/vo/UserAccountVO.java
+1
-4
BackUserAccountController.java
...m/mmc/iuav/user/controller/BackUserAccountController.java
+3
-3
UserAccountController.java
...a/com/mmc/iuav/user/controller/UserAccountController.java
+3
-3
BackUserAccountDao.java
...c/main/java/com/mmc/iuav/user/dao/BackUserAccountDao.java
+13
-2
UserServiceDao.java
...r/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java
+2
-53
BackUserAccountDO.java
...main/java/com/mmc/iuav/user/entity/BackUserAccountDO.java
+1
-1
UserAccountDO.java
...src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java
+3
-6
BackUserAccountService.java
...ava/com/mmc/iuav/user/service/BackUserAccountService.java
+2
-2
UserAccountService.java
...in/java/com/mmc/iuav/user/service/UserAccountService.java
+1
-61
AuthServiceImpl.java
.../java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java
+2
-2
BackUserAccountServiceImpl.java
...mc/iuav/user/service/impl/BackUserAccountServiceImpl.java
+2
-2
UserAccountServiceImpl.java
...om/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
+2
-108
BackUserAccountDao.xml
...ice-user/src/main/resources/mapper/BackUserAccountDao.xml
+12
-12
UserServiceDao.xml
...service-user/src/main/resources/mapper/UserServiceDao.xml
+0
-0
没有找到文件。
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/UserAccountSimpleDTO.java
浏览文件 @
43ae8500
...
...
@@ -24,8 +24,6 @@ public class UserAccountSimpleDTO implements Serializable {
private
Integer
id
;
@ApiModelProperty
(
value
=
"用户类型"
)
private
Integer
accountType
;
@ApiModelProperty
(
value
=
"用户账号"
)
private
String
accountNo
;
@ApiModelProperty
(
value
=
"用户uid"
)
private
String
uid
;
@ApiModelProperty
(
value
=
"手机号"
)
...
...
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserAccountVO.java
浏览文件 @
43ae8500
package
com
.
mmc
.
iuav
.
user
.
model
.
vo
;
import
com.mmc.iuav.group.Update
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
...
...
@@ -25,14 +24,12 @@ import java.util.List;
public
class
UserAccountVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
7067111726018678883L
;
@ApiModelProperty
(
value
=
"用户id"
)
@NotNull
(
message
=
"用户id不能为空"
,
groups
=
{
Update
.
class
})
@NotNull
(
message
=
"用户id不能为空"
,
groups
=
{
Update
.
class
})
private
Integer
id
;
@ApiModelProperty
(
value
=
"用户类型"
)
private
Integer
accountType
;
@ApiModelProperty
(
value
=
"用户uid"
)
private
String
uid
;
@ApiModelProperty
(
value
=
"用户账号"
)
private
String
accountNo
;
@ApiModelProperty
(
value
=
"手机号"
)
private
String
phoneNum
;
@ApiModelProperty
(
value
=
"用户名称"
)
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java
浏览文件 @
43ae8500
...
...
@@ -43,11 +43,11 @@ public class BackUserAccountController extends BaseController {
return
backUserAccountService
.
updateBAccount
(
bUserAccountVO
,
this
.
getUserLoginInfoFromRedis
(
request
));
}
@ApiOperation
(
value
=
"账号-
删除
"
)
@ApiOperation
(
value
=
"账号-
禁用(原删除)
"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@GetMapping
(
"removeBAccount"
)
public
ResultBody
remov
eBAccount
(
@RequestParam
Integer
userAccountId
,
HttpServletRequest
request
)
{
return
backUserAccountService
.
remov
eBAccount
(
userAccountId
);
public
ResultBody
disabl
eBAccount
(
@RequestParam
Integer
userAccountId
,
HttpServletRequest
request
)
{
return
backUserAccountService
.
disabl
eBAccount
(
userAccountId
);
}
@ApiOperation
(
value
=
"账号-列表"
)
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java
浏览文件 @
43ae8500
...
...
@@ -105,11 +105,11 @@ public class UserAccountController extends BaseController {
return
userAccountService
.
feignGetUserRcdInfo
(
userAccountId
);
}
@ApiOperation
(
value
=
"账号-
删除
"
)
@ApiOperation
(
value
=
"账号-
禁用(原删除)
"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@GetMapping
(
"removeAppAccount"
)
public
ResultBody
remov
eAppAccount
(
@RequestParam
Integer
userAccountId
,
HttpServletRequest
request
)
{
return
userAccountService
.
remov
eAppAccount
(
userAccountId
);
public
ResultBody
disabl
eAppAccount
(
@RequestParam
Integer
userAccountId
,
HttpServletRequest
request
)
{
return
userAccountService
.
disabl
eAppAccount
(
userAccountId
);
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/BackUserAccountDao.java
浏览文件 @
43ae8500
...
...
@@ -14,18 +14,21 @@ import java.util.List;
public
interface
BackUserAccountDao
{
/**
* 添加后台用户
*
* @param backUserAccountDO
*/
void
insertBackUserAccount
(
BackUserAccountDO
backUserAccountDO
);
/**
* 修改后台用户
*
* @param backUserAccountDO
*/
void
updateBackUserAccount
(
BackUserAccountDO
backUserAccountDO
);
/**
* 查看用户详情
*
* @param backUserAccountId
* @return
*/
...
...
@@ -33,6 +36,7 @@ public interface BackUserAccountDao {
/**
* 查询符合条件的用户个数
*
* @param bUserAccountQO
* @return
*/
...
...
@@ -40,19 +44,22 @@ public interface BackUserAccountDao {
/**
* 查询符合条件的用户信息
*
* @param bUserAccountQO
* @return
*/
List
<
BackUserAccountDO
>
listBackUserAccount
(
BUserAccountQO
bUserAccountQO
);
/**
* 删除用户信息
* 禁用后台用户(原删除信息)
*
* @param id
*/
void
remov
eBackUserAccountDO
(
Integer
id
);
void
disabl
eBackUserAccountDO
(
Integer
id
);
/**
* 远程调用查询用户信息
*
* @param bUserAccountQO
* @return
*/
...
...
@@ -60,6 +67,7 @@ public interface BackUserAccountDao {
/**
* 验证用户密码
*
* @param id
* @return
*/
...
...
@@ -67,6 +75,7 @@ public interface BackUserAccountDao {
/**
* 登录账号密码查询用户信息
*
* @param accountNo
* @param passWord
* @return
...
...
@@ -75,6 +84,7 @@ public interface BackUserAccountDao {
/**
* 修改用户密码
*
* @param id
* @param passWord
*/
...
...
@@ -82,6 +92,7 @@ public interface BackUserAccountDao {
/**
* 根据账号名称查询数量
*
* @param excludeId
* @param accountNo
* @return
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java
浏览文件 @
43ae8500
...
...
@@ -2,7 +2,6 @@ package com.mmc.iuav.user.dao;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.entity.UserRcdDO
;
import
com.mmc.iuav.user.model.qo.BUserAccountQO
;
import
com.mmc.iuav.user.model.qo.UserAccountQO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -56,15 +55,6 @@ public interface UserServiceDao {
List
<
Integer
>
listUserAccountIdsByDistrictCode
(
Integer
provinceCode
,
Integer
cityCode
,
Integer
districtCode
);
/**
* 登录账号密码查询用户信息
*
* @param accountNo
* @param passWord
* @return
*/
UserAccountDO
getUserLoginInfo
(
String
accountNo
,
String
passWord
);
/**
* 批量获取用户信息
*
* @param userAccountQO
...
...
@@ -73,53 +63,12 @@ public interface UserServiceDao {
List
<
UserAccountDO
>
feignListUserAccount
(
UserAccountQO
userAccountQO
);
/**
*
删除用户
*
禁用用户(原删除)
*
* @param removeNO
* @param userAccountId
*/
void
removeUserAccount
(
String
removeNO
,
Integer
userAccountId
);
/**
* 根据账号名称查询数量
*
* @param excludeId
* @param accountNo
* @return
*/
int
countUserAccountNo
(
Integer
excludeId
,
String
accountNo
);
/**
* 查询用户数量
*
* @param param
* @return
*/
int
countListBAccountPage
(
BUserAccountQO
param
);
/**
* 查询用户信息
*
* @param param
* @return
*/
List
<
UserAccountDO
>
listBAccountPage
(
BUserAccountQO
param
);
/**
* 修改用户密码
*
* @param id
* @param passWord
*/
void
updatePassword
(
Integer
id
,
String
passWord
);
/**
* 获取用户密码
*
* @param id
* @return
*/
UserAccountDO
getUserAuthPwdInfo
(
Integer
id
);
void
disableUserAccount
(
String
removeNO
,
Integer
userAccountId
);
/**
* 根据id查询用户信息
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/BackUserAccountDO.java
浏览文件 @
43ae8500
...
...
@@ -29,7 +29,7 @@ public class BackUserAccountDO implements Serializable {
private
Integer
provinceCode
;
private
Integer
cityCode
;
private
Integer
districtCode
;
private
Integer
d
eleted
;
private
Integer
d
isable
;
private
Date
createTime
;
private
Date
updateTime
;
private
String
remark
;
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java
浏览文件 @
43ae8500
...
...
@@ -20,8 +20,6 @@ import java.util.Date;
public
class
UserAccountDO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
5007589179946146721L
;
private
Integer
id
;
private
String
accountNo
;
private
String
password
;
private
String
uid
;
private
String
phoneNum
;
private
String
userName
;
...
...
@@ -35,7 +33,7 @@ public class UserAccountDO implements Serializable {
private
Integer
accountStatus
;
private
String
remark
;
private
Integer
portType
;
private
Integer
d
eleted
;
private
Integer
d
isable
;
private
Date
createTime
;
private
Date
updateTime
;
private
Integer
provinceCode
;
...
...
@@ -62,7 +60,6 @@ public class UserAccountDO implements Serializable {
public
UserAccountDO
(
BUserAccountVO
bUserAccountVO
)
{
this
.
id
=
bUserAccountVO
.
getId
();
this
.
accountNo
=
bUserAccountVO
.
getAccountNo
();
this
.
phoneNum
=
bUserAccountVO
.
getPhoneNum
();
this
.
userName
=
bUserAccountVO
.
getUserName
();
this
.
email
=
bUserAccountVO
.
getEmail
();
...
...
@@ -74,14 +71,14 @@ public class UserAccountDO implements Serializable {
}
public
UserAccountVO
buildUserAccountVO
()
{
return
UserAccountVO
.
builder
().
id
(
this
.
id
).
uid
(
this
.
uid
).
accountNo
(
this
.
accountNo
).
phoneNum
(
this
.
phoneNum
).
userName
(
this
.
userName
).
nickName
(
this
.
nickName
)
return
UserAccountVO
.
builder
().
id
(
this
.
id
).
uid
(
this
.
uid
).
phoneNum
(
this
.
phoneNum
).
userName
(
this
.
userName
).
nickName
(
this
.
nickName
)
.
userImg
(
this
.
userImg
).
userSex
(
this
.
userSex
).
email
(
this
.
email
).
source
(
this
.
source
).
accountStatus
(
this
.
accountStatus
).
remark
(
this
.
remark
).
portType
(
this
.
portType
)
.
createTime
(
this
.
createTime
).
companyAuthStatus
(
this
.
companyAuthStatus
==
null
||
this
.
companyAuthStatus
!=
1
?
0
:
1
).
cooperationTagId
(
this
.
cooperationTagId
).
companyName
(
this
.
companyName
)
.
tagName
(
this
.
tagName
).
build
();
}
public
UserAccountSimpleDTO
buildUserAccountSimpleDTO
()
{
return
UserAccountSimpleDTO
.
builder
().
id
(
this
.
id
).
uid
(
this
.
uid
).
accountNo
(
this
.
accountNo
).
phoneNum
(
this
.
phoneNum
).
userName
(
this
.
userName
).
nickName
(
this
.
nickName
)
return
UserAccountSimpleDTO
.
builder
().
id
(
this
.
id
).
uid
(
this
.
uid
).
phoneNum
(
this
.
phoneNum
).
userName
(
this
.
userName
).
nickName
(
this
.
nickName
)
.
userImg
(
this
.
userImg
).
openid
(
this
.
openId
).
userSex
(
this
.
userSex
).
email
(
this
.
email
).
source
(
this
.
source
).
accountStatus
(
this
.
accountStatus
).
portType
(
this
.
portType
)
.
companyAuthStatus
(
this
.
companyAuthStatus
==
null
||
this
.
companyAuthStatus
!=
1
?
0
:
1
).
cooperationTagId
(
this
.
cooperationTagId
).
companyName
(
this
.
companyName
)
.
build
();
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java
浏览文件 @
43ae8500
...
...
@@ -32,12 +32,12 @@ public interface BackUserAccountService {
ResultBody
updateBAccount
(
BUserAccountVO
bUserAccountVO
,
LoginSuccessDTO
loginSuccessDTO
);
/**
*
删除
后台用户
*
禁用
后台用户
*
* @param userAccountId
* @return
*/
ResultBody
remov
eBAccount
(
Integer
userAccountId
);
ResultBody
disabl
eBAccount
(
Integer
userAccountId
);
/**
* 后台用户列表
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/UserAccountService.java
浏览文件 @
43ae8500
...
...
@@ -3,9 +3,7 @@ package com.mmc.iuav.user.service;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.model.dto.UserAccountSimpleDTO
;
import
com.mmc.iuav.user.model.qo.BUserAccountQO
;
import
com.mmc.iuav.user.model.qo.UserAccountQO
;
import
com.mmc.iuav.user.model.vo.BUserAccountVO
;
import
com.mmc.iuav.user.model.vo.UserAccountVO
;
import
java.util.List
;
...
...
@@ -65,39 +63,6 @@ public interface UserAccountService {
List
<
Integer
>
feignListUserAccountIds
(
Integer
provinceCode
,
Integer
cityCode
,
Integer
districtCode
);
/**
* 添加后台用户
*
* @param bUserAccountVO
* @return
*/
ResultBody
insertBAccount
(
BUserAccountVO
bUserAccountVO
);
/**
* 删除用户信
*
* @param userAccountId
* @return
*/
ResultBody
removeBAccount
(
Integer
userAccountId
);
/**
* 后台用户列表
*
* @param bUserAccountQO
* @return
*/
ResultBody
listBAccountPage
(
BUserAccountQO
bUserAccountQO
);
/**
* 登录账号密码查询用户信息
*
* @param accountNo
* @param passWord
* @return
*/
UserAccountDO
getUserLoginInfo
(
String
accountNo
,
String
passWord
);
/**
* 内部获取用户列表
*
* @param userAccountQO
...
...
@@ -106,31 +71,6 @@ public interface UserAccountService {
List
<
UserAccountSimpleDTO
>
feignListUserAccount
(
UserAccountQO
userAccountQO
);
/**
* 修改用户信息
*
* @param bUserAccountVO
* @return
*/
ResultBody
updateBAccount
(
BUserAccountVO
bUserAccountVO
);
/**
* 修改用户密码
*
* @param account
* @return
*/
ResultBody
updatePassword
(
BUserAccountVO
account
);
/**
* 验证用户密码
*
* @param id
* @param authPwd
* @return
*/
ResultBody
feignAuthUserPwd
(
Integer
id
,
String
authPwd
);
/**
* 授权手机号
*
* @param id
...
...
@@ -185,7 +125,7 @@ public interface UserAccountService {
* @param userAccountId
* @return
*/
ResultBody
remov
eAppAccount
(
Integer
userAccountId
);
ResultBody
disabl
eAppAccount
(
Integer
userAccountId
);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java
浏览文件 @
43ae8500
...
...
@@ -120,7 +120,7 @@ public class AuthServiceImpl implements AuthService {
map
.
put
(
JwtConstant
.
TOKEN_TYPE
,
JwtConstant
.
IUAV_TOKEN
);
String
token
=
JwtUtil
.
createJwt
(
map
);
LoginSuccessDTO
loginSuccessDTO
=
LoginSuccessDTO
.
builder
().
token
(
token
).
userAccountId
(
userAccountVO
.
getId
()).
accountNo
(
userAccountVO
.
getAccountNo
()).
uid
(
uid
)
LoginSuccessDTO
loginSuccessDTO
=
LoginSuccessDTO
.
builder
().
token
(
token
).
userAccountId
(
userAccountVO
.
getId
()).
uid
(
uid
)
.
userName
(
userAccountVO
.
getUserName
()).
nickName
(
userAccountVO
.
getNickName
()).
phoneNum
(
userAccountVO
.
getPhoneNum
()).
portType
(
100
).
build
();
stringRedisTemplate
.
opsForValue
().
set
(
...
...
@@ -181,7 +181,7 @@ public class AuthServiceImpl implements AuthService {
companyAuthStatus
=
companyAuthDO
.
getAuthStatus
();
}
String
token
=
JwtUtil
.
createJwt
(
map
);
LoginSuccessDTO
loginSuccessDTO
=
LoginSuccessDTO
.
builder
().
token
(
token
).
userAccountId
(
userAccountVO
.
getId
()).
accountNo
(
userAccountVO
.
getAccountNo
()).
uid
(
userAccountVO
.
getUid
())
LoginSuccessDTO
loginSuccessDTO
=
LoginSuccessDTO
.
builder
().
token
(
token
).
userAccountId
(
userAccountVO
.
getId
()).
uid
(
userAccountVO
.
getUid
())
.
userName
(
userAccountVO
.
getUserName
()).
nickName
(
userAccountVO
.
getNickName
()).
phoneNum
(
userAccountVO
.
getPhoneNum
()).
portType
(
100
).
build
();
stringRedisTemplate
.
opsForValue
().
set
(
token
,
JSONObject
.
toJSONString
(
loginSuccessDTO
),
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java
浏览文件 @
43ae8500
...
...
@@ -113,8 +113,8 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
}
@Override
public
ResultBody
remov
eBAccount
(
Integer
userAccountId
)
{
backUserAccountDao
.
remov
eBackUserAccountDO
(
userAccountId
);
public
ResultBody
disabl
eBAccount
(
Integer
userAccountId
)
{
backUserAccountDao
.
disabl
eBackUserAccountDO
(
userAccountId
);
return
ResultBody
.
success
();
}
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
浏览文件 @
43ae8500
...
...
@@ -4,16 +4,13 @@ import com.mmc.iuav.general.CodeUtil;
import
com.mmc.iuav.page.PageResult
;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.response.ResultEnum
;
import
com.mmc.iuav.user.auth.PwdUtil
;
import
com.mmc.iuav.user.dao.CooperationDao
;
import
com.mmc.iuav.user.dao.UserServiceDao
;
import
com.mmc.iuav.user.entity.CooperationTagDO
;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.entity.UserRcdDO
;
import
com.mmc.iuav.user.model.dto.UserAccountSimpleDTO
;
import
com.mmc.iuav.user.model.qo.BUserAccountQO
;
import
com.mmc.iuav.user.model.qo.UserAccountQO
;
import
com.mmc.iuav.user.model.vo.BUserAccountVO
;
import
com.mmc.iuav.user.model.vo.CompanyAuthVO
;
import
com.mmc.iuav.user.model.vo.CooperationTagVO
;
import
com.mmc.iuav.user.model.vo.UserAccountVO
;
...
...
@@ -26,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
java.security.NoSuchAlgorithmException
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
...
...
@@ -124,58 +120,6 @@ public class UserAccountServiceImpl implements UserAccountService {
}
@Override
public
ResultBody
insertBAccount
(
BUserAccountVO
bUserAccountVO
)
{
if
(!
bUserAccountVO
.
getPassWord
().
equals
(
bUserAccountVO
.
getAlertPwd
()))
{
// 两次密码不一致
return
ResultBody
.
error
(
ResultEnum
.
PWD_ALERT_ERROR
);
}
// 获取新增的账户名是否已经存在
int
count
=
userServiceDao
.
countUserAccountNo
(
null
,
bUserAccountVO
.
getAccountNo
());
if
(
count
>
0
)
{
return
ResultBody
.
error
(
ResultEnum
.
ADD_USER_ACCOUNT_NAME_EXISTS
);
}
UserAccountDO
userAccountDO
=
new
UserAccountDO
(
bUserAccountVO
);
try
{
userAccountDO
.
setPassword
(
PwdUtil
.
securityPwd
(
bUserAccountVO
.
getPassWord
()));
}
catch
(
NoSuchAlgorithmException
e
)
{
return
ResultBody
.
error
(
ResultEnum
.
PWD_CREATE_ERROR
);
}
userAccountDO
.
setUid
(
CodeUtil
.
generateUserUID
());
userAccountDO
.
setPortType
(
0
);
userAccountDO
.
setOpenId
(
userAccountDO
.
getUid
());
userAccountDO
.
setUnionId
(
userAccountDO
.
getUid
());
userServiceDao
.
insertUserAccount
(
userAccountDO
);
return
ResultBody
.
success
();
}
@Override
public
ResultBody
removeBAccount
(
Integer
userAccountId
)
{
String
removeNO
=
CodeUtil
.
removeUserAccount
();
userServiceDao
.
removeUserAccount
(
removeNO
,
userAccountId
);
return
ResultBody
.
success
();
}
@Override
public
ResultBody
listBAccountPage
(
BUserAccountQO
param
)
{
int
count
=
userServiceDao
.
countListBAccountPage
(
param
);
if
(
count
==
0
)
{
return
ResultBody
.
success
(
PageResult
.
buildPage
(
param
.
getPageNo
(),
param
.
getPageSize
(),
count
));
}
Integer
pageNo
=
param
.
getPageNo
();
param
.
buildCurrentPage
();
List
<
UserAccountDO
>
users
=
userServiceDao
.
listBAccountPage
(
param
);
List
<
UserAccountVO
>
collect
=
users
.
stream
().
map
(
UserAccountDO:
:
buildUserAccountVO
).
collect
(
Collectors
.
toList
());
return
ResultBody
.
success
(
PageResult
.
buildPage
(
pageNo
,
param
.
getPageSize
(),
count
,
collect
));
}
@Override
public
UserAccountDO
getUserLoginInfo
(
String
accountNo
,
String
passWord
)
{
UserAccountDO
userAccountDO
=
userServiceDao
.
getUserLoginInfo
(
accountNo
,
passWord
);
return
userAccountDO
;
}
@Override
public
List
<
UserAccountSimpleDTO
>
feignListUserAccount
(
UserAccountQO
userAccountQO
)
{
List
<
UserAccountDO
>
list
=
userServiceDao
.
feignListUserAccount
(
userAccountQO
);
if
(
list
==
null
)
{
...
...
@@ -203,56 +147,6 @@ public class UserAccountServiceImpl implements UserAccountService {
}
}
@Override
public
ResultBody
updateBAccount
(
BUserAccountVO
bUserAccountVO
)
{
// 判断账号是否重复
if
(!
StringUtils
.
isEmpty
(
bUserAccountVO
.
getAccountNo
()))
{
// 如果传入的名字不为空,就查找数据库,看名字是否重复
int
count
=
userServiceDao
.
countUserAccountNo
(
bUserAccountVO
.
getId
(),
bUserAccountVO
.
getAccountNo
());
if
(
count
>
0
)
{
return
ResultBody
.
error
(
ResultEnum
.
UPDATE_USER_ACCOUNT_REPEAT
);
}
}
UserAccountDO
userAccountDO
=
new
UserAccountDO
(
bUserAccountVO
);
userServiceDao
.
update
(
userAccountDO
);
return
ResultBody
.
success
();
}
@Override
public
ResultBody
updatePassword
(
BUserAccountVO
account
)
{
if
(!
account
.
getPassWord
().
equals
(
account
.
getAlertPwd
()))
{
return
ResultBody
.
error
(
ResultEnum
.
PASSWORD_INCONSISTENT
);
}
try
{
account
.
setPassWord
(
PwdUtil
.
securityPwd
(
account
.
getPassWord
()));
userServiceDao
.
updatePassword
(
account
.
getId
(),
account
.
getPassWord
());
}
catch
(
NoSuchAlgorithmException
e
)
{
return
ResultBody
.
error
(
ResultEnum
.
PWD_CONPARED_ERROR
);
}
// RoleInfoDO roleInfo = roleInfoDao.getRoleInfoByUser(account.getId());// 查询账号的角色信息
// this.disableOneToken(account.getId(), roleInfo.getId(), JwtConstant.SXTB_ACCOUNT_TOKEN);
return
ResultBody
.
success
();
}
@Override
public
ResultBody
feignAuthUserPwd
(
Integer
id
,
String
authPwd
)
{
UserAccountDO
account
=
userServiceDao
.
getUserAuthPwdInfo
(
id
);
if
(
account
==
null
)
{
return
ResultBody
.
error
(
ResultEnum
.
LOGIN_ACCOUNT_NOT_EXIT_ERROR
);
}
String
pwd
=
""
;
try
{
pwd
=
PwdUtil
.
securityPwd
(
authPwd
);
}
catch
(
NoSuchAlgorithmException
e
)
{
return
ResultBody
.
error
(
ResultEnum
.
PWD_CREATE_ERROR
);
}
if
(!
pwd
.
equals
(
account
.
getPassword
()))
{
return
ResultBody
.
error
(
ResultEnum
.
PWD_CONPARED_ERROR
);
}
return
ResultBody
.
success
();
}
@Override
public
ResultBody
getUserPhoneNumber
(
Integer
id
,
String
code
)
{
String
userPhoneNumber
=
wxService
.
getUserPhoneNumber
(
id
,
code
);
...
...
@@ -339,8 +233,8 @@ public class UserAccountServiceImpl implements UserAccountService {
}
@Override
public
ResultBody
remov
eAppAccount
(
Integer
userAccountId
)
{
userServiceDao
.
remov
eUserAccount
(
CodeUtil
.
removeUserAccount
(),
userAccountId
);
public
ResultBody
disabl
eAppAccount
(
Integer
userAccountId
)
{
userServiceDao
.
disabl
eUserAccount
(
CodeUtil
.
removeUserAccount
(),
userAccountId
);
UserAccountVO
userAccountVO
=
new
UserAccountVO
();
userAccountVO
.
setId
(
userAccountId
);
userAccountVO
.
setDeleted
(
1
);
...
...
csm-service/cms-service-user/src/main/resources/mapper/BackUserAccountDao.xml
浏览文件 @
43ae8500
...
...
@@ -16,7 +16,7 @@
<result
property=
"districtCode"
column=
"district_code"
/>
<result
property=
"address"
column=
"address"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"d
eleted"
column=
"is_deleted
"
/>
<result
property=
"d
isable"
column=
"disable
"
/>
<result
property=
"createTime"
column=
"createTime"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<association
property=
"roleInfoDO"
javaType=
"com.mmc.iuav.user.entity.RoleInfoDO"
>
...
...
@@ -76,10 +76,10 @@
</where>
</update>
<update
id=
"
remov
eBackUserAccountDO"
>
<update
id=
"
disabl
eBackUserAccountDO"
>
update back_user_account
set
is_deleted
= 1
where
is_deleted
= 0
set
disable
= 1
where
disable
= 0
and id = #{id}
</update>
...
...
@@ -102,7 +102,7 @@
city_code,
district_code,
address,
is_deleted
,
disable
,
create_time,
update_time
from back_user_account
...
...
@@ -113,7 +113,7 @@
parameterType=
"com.mmc.iuav.user.model.qo.BUserAccountQO"
>
select count(*) from back_user_account bua
left join user_role_rel urr on urr.back_user_account_id = bua.id
where bua.
is_deleted
= 0
where bua.
disable
= 0
<if
test=
" keyword != null and keyword != '' "
>
and ( bua.account_no like CONCAT("%",#{keyword},"%") or
bua.user_name like CONCAT("%",#{keyword},"%") )
...
...
@@ -160,7 +160,7 @@
left join user_role_rel urr on urr.back_user_account_id = bua.id
left join role_info ri on ri.id = urr.role_id
WHERE
bua.
is_deleted
= 0
bua.
disable
= 0
<if
test=
" keyword != null and keyword != '' "
>
and ( bua.account_no like CONCAT("%",#{keyword},"%") or
bua.user_name like CONCAT("%",#{keyword},"%") )
...
...
@@ -185,9 +185,9 @@
<select
id=
"feignListBackUserAccount"
resultMap=
"backUserAccountResultMap"
parameterType=
"com.mmc.iuav.user.model.qo.BUserAccountQO"
>
select ua.id, ua.account_no, ua.phone_num, ua.user_name, ua.user_sex, ua.email, ua.account_status, ua.remark,
ua.
is_deleted as deleted
, ua.create_time, ua.update_time
ua.
disable
, ua.create_time, ua.update_time
from back_user_account ua
where ua.
is_deleted
= 0
where ua.
disable
= 0
<if
test=
" userIds != null "
>
<foreach
collection=
"userIds"
item=
"id"
open=
"and ua.id in ("
close=
")"
separator=
","
>
#{id}
...
...
@@ -215,7 +215,7 @@
account_no,
pass_word
from back_user_account
where
is_deleted
= 0
where
disable
= 0
and id =
#{id}
</select>
...
...
@@ -228,13 +228,13 @@
bua.account_status,
bua.user_name
from back_user_account bua
where bua.
is_deleted
= 0
where bua.
disable
= 0
and BINARY bua.account_no = #{accountNo}
</select>
<select
id=
"countUserAccountNo"
resultType=
"java.lang.Integer"
>
select count(*) from back_user_account
where account_no = #{accountNo} and
is_deleted
= 0
where account_no = #{accountNo} and
disable
= 0
<if
test=
"excludeId != null"
>
and id != #{excludeId}
</if>
...
...
csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml
浏览文件 @
43ae8500
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论