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
18a535ac
Commit
18a535ac
authored
Mar 25, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://111.203.232.171:8888/lee/chnmuseum-party
into master
parents
62ae87d7
7740ade9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
47 additions
and
2 deletions
+47
-2
TAreaMapper.java
...java/cn/wisenergy/chnmuseum/party/mapper/TAreaMapper.java
+2
-0
TOrgan.java
src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java
+7
-0
TUser.java
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
+4
-0
TOrganServiceImpl.java
...nergy/chnmuseum/party/service/impl/TOrganServiceImpl.java
+12
-1
TUserServiceImpl.java
...energy/chnmuseum/party/service/impl/TUserServiceImpl.java
+11
-1
TOrganController.java
...ergy/chnmuseum/party/web/controller/TOrganController.java
+4
-0
TAreaMapper.xml
src/main/resources/mapper/TAreaMapper.xml
+7
-0
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TAreaMapper.java
View file @
18a535ac
...
...
@@ -17,4 +17,6 @@ import java.util.Map;
public
interface
TAreaMapper
extends
BaseMapper
<
TArea
>
{
List
<
Map
<
String
,
String
>>
languageInfo
();
String
selectParent
(
String
areaId
);
}
src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java
View file @
18a535ac
...
...
@@ -104,5 +104,12 @@ public class TOrgan implements Serializable {
@TableField
(
exist
=
false
)
private
String
areaName
;
@ApiModelProperty
(
"区域集合"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
areas
;
@ApiModelProperty
(
"当前操作级别"
)
@TableField
(
exist
=
false
)
private
Integer
currentLevel
;
}
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @
18a535ac
...
...
@@ -146,6 +146,10 @@ public class TUser implements Serializable {
@TableField
(
exist
=
false
)
private
String
areaName
;
@ApiModelProperty
(
"区域集合"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
areas
;
@TableField
(
exist
=
false
)
private
String
jwtToken
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java
View file @
18a535ac
...
...
@@ -2,9 +2,12 @@ package cn.wisenergy.chnmuseum.party.service.impl;
import
cn.wisenergy.chnmuseum.party.common.util.DateUtil80
;
import
cn.wisenergy.chnmuseum.party.mapper.TAreaMapper
;
import
cn.wisenergy.chnmuseum.party.model.TArea
;
import
cn.wisenergy.chnmuseum.party.model.TOrgan
;
import
cn.wisenergy.chnmuseum.party.mapper.TOrganMapper
;
import
cn.wisenergy.chnmuseum.party.service.TOrganService
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -31,6 +34,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
@Resource
private
TOrganMapper
organMapper
;
@Resource
private
TAreaMapper
areaMapper
;
@Override
public
List
<
TOrgan
>
getTree
()
{
List
<
TOrgan
>
list
=
list
(
Wrappers
.<
TOrgan
>
lambdaQuery
().
eq
(
TOrgan:
:
getIsDeleted
,
0
).
orderByDesc
(
TOrgan:
:
getLevel
));
...
...
@@ -91,6 +97,11 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
@Override
public
TOrgan
selectById
(
String
id
)
{
return
organMapper
.
getById
(
id
);
TOrgan
organ
=
organMapper
.
getById
(
id
);
String
s
=
areaMapper
.
selectParent
(
organ
.
getAreaId
());
List
<
TOrgan
>
list1
=
list
(
new
UpdateWrapper
<
TOrgan
>().
eq
(
"parent_id"
,
organ
.
getParentId
()));
organ
.
setAreas
(
Arrays
.
asList
(
s
.
split
(
","
)));
organ
.
setChildren
(
list1
);
return
organ
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java
View file @
18a535ac
package
cn
.
wisenergy
.
chnmuseum
.
party
.
service
.
impl
;
import
cn.wisenergy.chnmuseum.party.mapper.TAreaMapper
;
import
cn.wisenergy.chnmuseum.party.model.TUser
;
import
cn.wisenergy.chnmuseum.party.mapper.TUserMapper
;
import
cn.wisenergy.chnmuseum.party.service.TUserService
;
...
...
@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.annotation.Resource
;
import
java.util.Arrays
;
/**
* <pre>
...
...
@@ -28,6 +30,9 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Resource
private
TUserMapper
tUserMapper
;
@Resource
private
TAreaMapper
areaMapper
;
@Override
public
TUser
selectByUsername
(
String
userName
)
{
return
tUserMapper
.
selectByUsername
(
userName
);
...
...
@@ -40,6 +45,11 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
@Override
public
TUser
selectById
(
String
id
)
{
return
tUserMapper
.
getById
(
id
);
TUser
user
=
tUserMapper
.
getById
(
id
);
if
(
user
.
getAreaId
()!=
null
)
{
String
s
=
areaMapper
.
selectParent
(
user
.
getAreaId
());
user
.
setAreas
(
Arrays
.
asList
(
s
.
split
(
","
)));
}
return
user
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
View file @
18a535ac
...
...
@@ -74,6 +74,10 @@ public class TOrganController extends BaseController {
public
Map
<
String
,
Object
>
add
(
TOrgan
organ
)
{
organ
.
setCreateTime
(
DateUtil80
.
getDateTimeOfTimestamp
(
System
.
currentTimeMillis
()));
organ
.
setUpdateTime
(
DateUtil80
.
getDateTimeOfTimestamp
(
System
.
currentTimeMillis
()));
if
(
organ
.
getLevel
()==
2
&&
organ
.
getCurrentLevel
()!=
null
&&
organ
.
getCurrentLevel
()==
3
){
TArea
byId
=
tAreaService
.
getById
(
organ
.
getParentId
());
organ
.
setParentId
(
byId
.
getParentId
());
}
// 保存业务节点信息
boolean
result
=
tOrganService
.
save
(
organ
);
// 返回操作结果
...
...
src/main/resources/mapper/TAreaMapper.xml
View file @
18a535ac
...
...
@@ -25,4 +25,11 @@
<select
id=
"languageInfo"
resultType=
"java.util.HashMap"
>
select id,name,code from t_language
</select>
<select
id=
"selectParent"
resultType=
"java.lang.String"
>
select concat(ifnull(concat(a1.parent_id,','),''),ifnull(concat(a.parent_id,','),''),a.id)
from t_area a
left join t_area a1 on a.parent_id = a1.id
where a.id = #{areaId}
</select>
</mapper>
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