Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SiEn
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
SiEn
Commits
85a20cd4
Commit
85a20cd4
authored
Oct 29, 2020
by
lpx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 优化
parent
d67a2815
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
20 deletions
+7
-20
api-app/src/main/java/com/jumeirah/api/app/controller/PlainTypeController.java
+1
-1
api-app/src/main/java/com/jumeirah/api/app/entity/bo/PlainTypeBo.java
+2
-7
common/src/main/java/com/jumeirah/common/entity/PlainType.java
+3
-10
common/src/main/java/com/jumeirah/common/vo/PlainTypeQueryVo.java
+1
-2
No files found.
api-app/src/main/java/com/jumeirah/api/app/controller/PlainTypeController.java
View file @
85a20cd4
...
...
@@ -55,7 +55,7 @@ public class PlainTypeController extends BaseController {
PlainTypeBo
plainTypeBo
;
for
(
List
<
PlainType
>
listTemp:
resultMap
.
values
())
{
plainTypeBo
=
new
PlainTypeBo
();
plainTypeBo
.
setT
itle
(
listTemp
.
get
(
0
).
getSeriesNam
e
())
plainTypeBo
.
setT
ype
(
listTemp
.
get
(
0
).
getSeriesTyp
e
())
.
setPlainTypeList
(
listTemp
);
plainTypeBoList
.
add
(
plainTypeBo
);
}
...
...
api-app/src/main/java/com/jumeirah/api/app/entity/bo/PlainTypeBo.java
View file @
85a20cd4
package
com
.
jumeirah
.
api
.
app
.
entity
.
bo
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.jumeirah.common.entity.PlainType
;
import
io.geekidea.springbootplus.framework.common.entity.BaseEntity
;
import
io.geekidea.springbootplus.framework.core.validator.groups.Update
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
/**
...
...
@@ -28,8 +23,8 @@ import java.util.List;
public
class
PlainTypeBo
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
"系列
名称
"
)
private
String
titl
e
;
@ApiModelProperty
(
"系列
类型,0-尊享系列 , 1-奢享系列 ,2-普通系列
"
)
private
Integer
typ
e
;
@ApiModelProperty
(
"系列名称"
)
private
List
<
PlainType
>
plainTypeList
;
...
...
common/src/main/java/com/jumeirah/common/entity/PlainType.java
View file @
85a20cd4
package
com
.
jumeirah
.
common
.
entity
;
import
io.geekidea.springbootplus.framework.common.entity.BaseEntity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.Version
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.geekidea.springbootplus.framework.common.entity.BaseEntity
;
import
io.geekidea.springbootplus.framework.core.validator.groups.Update
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -12,9 +12,6 @@ import lombok.experimental.Accessors;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
io.geekidea.springbootplus.framework.core.validator.groups.Update
;
import
java.sql.Timestamp
;
/**
...
...
@@ -36,13 +33,9 @@ public class PlainType extends BaseEntity {
private
Long
id
;
@NotNull
(
message
=
"系列类型不能为空"
)
@ApiModelProperty
(
"系列类型"
)
@ApiModelProperty
(
"系列类型
,0-尊享系列 , 1-奢享系列 ,2-普通系列
"
)
private
Integer
seriesType
;
@ApiModelProperty
(
"系列名称"
)
private
String
seriesName
;
@NotBlank
(
message
=
"飞机名称不能为空"
)
@ApiModelProperty
(
"飞机名称"
)
private
String
name
;
...
...
common/src/main/java/com/jumeirah/common/vo/PlainTypeQueryVo.java
View file @
85a20cd4
...
...
@@ -6,7 +6,6 @@ import lombok.Data;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <pre>
...
...
@@ -25,7 +24,7 @@ public class PlainTypeQueryVo implements Serializable {
@ApiModelProperty
(
"主键ID"
)
private
Long
id
;
@ApiModelProperty
(
"系列类型"
)
@ApiModelProperty
(
"系列类型
,0-尊享系列 , 1-奢享系列 ,2-普通系列
"
)
private
Integer
seriesType
;
@ApiModelProperty
(
"飞机名称"
)
...
...
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