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
6cbe2dd4
Commit
6cbe2dd4
authored
Mar 24, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改机构
parent
3964a800
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
6 deletions
+44
-6
TOrgan.java
src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java
+3
-4
TUser.java
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
+13
-0
TAreaServiceImpl.java
...energy/chnmuseum/party/service/impl/TAreaServiceImpl.java
+2
-1
TOrganController.java
...ergy/chnmuseum/party/web/controller/TOrganController.java
+1
-1
TAreaMapper.xml
src/main/resources/mapper/TAreaMapper.xml
+25
-0
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java
View file @
6cbe2dd4
...
...
@@ -74,23 +74,22 @@ public class TOrgan implements Serializable {
@NotNull
(
message
=
"修改时间不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
LocalDateTime
updateTime
;
@ApiModelProperty
(
"
省
"
)
@ApiModelProperty
(
"
区域
"
)
@TableField
(
"area_id"
)
@NotNull
(
message
=
"
省
不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
@NotNull
(
message
=
"
区域
不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
String
areaId
;
@ApiModelProperty
(
"icon"
)
@TableField
(
"icon"
)
@NotBlank
(
message
=
"icon不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
String
icon
;
@ApiModelProperty
(
"备注"
)
@TableField
(
"remarks"
)
@NotBlank
(
message
=
"备注不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
String
remarks
;
@ApiModelProperty
(
"级别"
)
@TableField
(
"level"
)
@NotNull
(
message
=
"区域不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
Integer
level
;
@ApiModelProperty
(
"下级机构"
)
...
...
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @
6cbe2dd4
...
...
@@ -138,4 +138,17 @@ public class TUser implements Serializable {
@TableField
(
exist
=
false
)
private
String
password
;
@TableField
(
exist
=
false
)
private
String
jwtToken
;
public
TUser
(
String
id
,
String
jwtToken
)
{
this
.
id
=
id
;
this
.
jwtToken
=
jwtToken
;
}
public
TUser
(
String
jwtToken
)
{
this
.
jwtToken
=
jwtToken
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TAreaServiceImpl.java
View file @
6cbe2dd4
...
...
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
...
...
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
@Service
public
class
TAreaServiceImpl
extends
ServiceImpl
<
TAreaMapper
,
TArea
>
implements
TAreaService
{
@
Autowired
@
Resource
private
TAreaMapper
tAreaMapper
;
@Override
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
View file @
6cbe2dd4
...
...
@@ -170,7 +170,7 @@ public class TOrganController extends BaseController {
@GetMapping
(
"/getTree"
)
@RequiresPermissions
(
"/organ/getTree"
)
@ApiOperation
(
value
=
"获取机构树"
,
notes
=
"获取机构树"
)
@MethodLog
(
operModule
=
OperModule
.
ORG
,
operType
=
OperType
.
SELECT
)
//
@MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
public
Map
<
String
,
Object
>
getTree
(
String
name
)
{
List
<
TOrgan
>
list
=
new
ArrayList
<>();
if
(
StringUtils
.
isBlank
(
name
))
{
...
...
src/main/resources/mapper/TAreaMapper.xml
0 → 100644
View file @
6cbe2dd4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.wisenergy.chnmuseum.party.mapper.TAreaMapper"
>
<!-- 通用查询映射结果 -->
<resultMap
id=
"BaseResultMap"
type=
"cn.wisenergy.chnmuseum.party.model.TArea"
>
<id
column=
"id"
property=
"id"
/>
<result
column=
"name"
property=
"name"
/>
<result
column=
"sname"
property=
"sname"
/>
<result
column=
"code"
property=
"code"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"parent_id"
property=
"parentId"
/>
<result
column=
"sort_position"
property=
"sortPosition"
/>
<result
column=
"longitude"
property=
"longitude"
/>
<result
column=
"latitude"
property=
"latitude"
/>
<result
column=
"full_name"
property=
"fullName"
/>
<result
column=
"remarks"
property=
"remarks"
/>
</resultMap>
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
id, name, sname, code, type, parent_id, sort_position, longitude, latitude, full_name, remarks
</sql>
</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