Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
9c9ad17f
Commit
9c9ad17f
authored
Apr 09, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
103afbf4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
23 deletions
+45
-23
TUserService.java
...va/cn/wisenergy/chnmuseum/party/service/TUserService.java
+2
-0
TUserServiceImpl.java
...energy/chnmuseum/party/service/impl/TUserServiceImpl.java
+40
-6
TUserController.java
...nergy/chnmuseum/party/web/controller/TUserController.java
+2
-16
TBoxOperationMapper.xml
src/main/resources/mapper/TBoxOperationMapper.xml
+1
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/service/TUserService.java
View file @
9c9ad17f
...
...
@@ -23,4 +23,6 @@ public interface TUserService extends IService<TUser> {
TUser
selectById
(
String
id
);
List
<
TUser
>
getUserList
(
TUser
user
);
boolean
addBox
(
TUser
user
);
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java
View file @
9c9ad17f
...
...
@@ -3,8 +3,10 @@ package cn.wisenergy.chnmuseum.party.service.impl;
import
cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum
;
import
cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum
;
import
cn.wisenergy.chnmuseum.party.mapper.TAreaMapper
;
import
cn.wisenergy.chnmuseum.party.model.TBoxOperation
;
import
cn.wisenergy.chnmuseum.party.model.TUser
;
import
cn.wisenergy.chnmuseum.party.mapper.TUserMapper
;
import
cn.wisenergy.chnmuseum.party.model.TUserRole
;
import
cn.wisenergy.chnmuseum.party.service.TUserService
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -15,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.annotation.Resource
;
import
java.time.LocalDateTime
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -28,6 +31,7 @@ import java.util.List;
*/
@Slf4j
@Service
@Transactional
public
class
TUserServiceImpl
extends
ServiceImpl
<
TUserMapper
,
TUser
>
implements
TUserService
{
@Resource
...
...
@@ -36,6 +40,13 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Resource
private
TAreaMapper
areaMapper
;
@Resource
TBoxOperationServiceImpl
boxOperationService
;
@Resource
TUserRoleServiceImpl
tUserRoleService
;
@Override
public
TUser
selectByUsername
(
String
userName
)
{
return
tUserMapper
.
selectByUsername
(
userName
);
...
...
@@ -43,15 +54,15 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Override
public
Page
<
TUser
>
getList
(
Page
<
TUser
>
page
,
TUser
user
)
{
List
<
TUser
>
list
=
tUserMapper
.
getList
(
page
,
user
);
List
<
TUser
>
list
=
tUserMapper
.
getList
(
page
,
user
);
for
(
TUser
u
:
list
)
{
if
(
AuditStatusEnum
.
REFUSED
.
name
().
equals
(
u
.
getAuditStatus
())
||
AuditStatusEnum
.
APPROVED_FINAL
.
name
().
equals
(
u
.
getAuditStatus
()))
{
if
(
AuditOperationEnum
.
ENABLE
.
name
().
equals
(
u
.
getStatus
())){
if
(
AuditStatusEnum
.
REFUSED
.
name
().
equals
(
u
.
getAuditStatus
())
||
AuditStatusEnum
.
APPROVED_FINAL
.
name
().
equals
(
u
.
getAuditStatus
()))
{
if
(
AuditOperationEnum
.
ENABLE
.
name
().
equals
(
u
.
getStatus
()))
{
u
.
setStatusName
(
"活跃"
);
}
else
{
}
else
{
u
.
setStatusName
(
"禁用"
);
}
}
else
{
}
else
{
u
.
setStatusName
(
"待审核"
);
}
}
...
...
@@ -61,7 +72,7 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Override
public
TUser
selectById
(
String
id
)
{
TUser
user
=
tUserMapper
.
getById
(
id
);
if
(
user
.
getAreaId
()
!=
null
)
{
if
(
user
.
getAreaId
()
!=
null
)
{
String
s
=
areaMapper
.
selectParent
(
user
.
getAreaId
());
user
.
setAreas
(
Arrays
.
asList
(
s
.
split
(
","
)));
}
...
...
@@ -74,4 +85,27 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
return
list
;
}
@Override
public
boolean
addBox
(
TUser
user
)
{
boolean
ret
=
false
;
ret
=
save
(
user
);
TBoxOperation
tBoxOperation
=
new
TBoxOperation
();
tBoxOperation
.
setOrganId
(
user
.
getOrgId
());
tBoxOperation
.
setAreaId
(
user
.
getAreaId
());
tBoxOperation
.
setStatus
(
1
);
tBoxOperation
.
setCreateTime
(
LocalDateTime
.
now
());
tBoxOperation
.
setUpdateTime
(
LocalDateTime
.
now
());
ret
=
boxOperationService
.
save
(
tBoxOperation
);
TUserRole
userRole
=
new
TUserRole
();
userRole
.
setUserId
(
user
.
getId
());
userRole
.
setRoleId
(
"3"
);
userRole
.
setIsDeleted
(
false
);
ret
=
tUserRoleService
.
save
(
userRole
);
return
ret
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @
9c9ad17f
...
...
@@ -649,7 +649,7 @@ public class TUserController extends BaseController {
List
<
TUser
>
list
=
this
.
userService
.
list
(
ew
);
if
(
list
!=
null
&&
list
.
size
()>
1
&&
list
.
get
(
0
)!=
null
)
{
resultMap
.
put
(
"resultCode"
,
"500"
);
resultMap
.
put
(
"message"
,
"
每个单位只能有一个机顶盒账号
!"
);
resultMap
.
put
(
"message"
,
"
该单位机顶盒账号已存在
!"
);
return
ResponseEntity
.
status
(
HttpStatus
.
BAD_REQUEST
).
body
(
resultMap
);
}
}
...
...
@@ -667,21 +667,7 @@ public class TUserController extends BaseController {
user
.
setAuditStatus
(
AuditStatusEnum
.
APPROVED_FINAL
.
name
());
user
.
setType
(
"3"
);
boolean
ret
=
this
.
userService
.
save
(
user
);
TBoxOperation
tBoxOperation
=
new
TBoxOperation
();
tBoxOperation
.
setOrganId
(
user
.
getOrgId
());
tBoxOperation
.
setAreaId
(
user
.
getAreaId
());
tBoxOperation
.
setStatus
(
1
);
tBoxOperation
.
setCreateTime
(
LocalDateTime
.
now
());
tBoxOperation
.
setUpdateTime
(
LocalDateTime
.
now
());
ret
=
boxOperationService
.
save
(
tBoxOperation
);
TUserRole
userRole
=
new
TUserRole
();
userRole
.
setUserId
(
user
.
getId
());
userRole
.
setRoleId
(
"3"
);
userRole
.
setIsDeleted
(
false
);
tUserRoleService
.
save
(
userRole
);
boolean
ret
=
this
.
userService
.
addBox
(
user
);
if
(!
ret
)
{
// 新增失败, 500
...
...
src/main/resources/mapper/TBoxOperationMapper.xml
View file @
9c9ad17f
...
...
@@ -40,7 +40,7 @@ left join t_organ r on r.id = b.organ_id
from t_user u
left join t_organ o on o.id = u.org_id
left join t_area a on u.area_id = a.id
left
join t_box_operation b on b.organ_id = o.id
inner
join t_box_operation b on b.organ_id = o.id
where 1=1
<if
test=
"user.orgId!= null and user.orgId != '' "
>
and b.organ_id =#{user.orgId}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment