记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
38d4a59b
Commit
38d4a59b
authored
Aug 17, 2022
by
zhengfuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
做效验
parent
8c0d33f2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
KylinRecommendActiveParam.java
...et/service/kylin/dto/param/KylinRecommendActiveParam.java
+8
-0
KylinRecommendActiveRelationParam.java
...ce/kylin/dto/param/KylinRecommendActiveRelationParam.java
+1
-0
KylinRecommendActiveController.java
...roller/zhengzai/kylin/KylinRecommendActiveController.java
+11
-1
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinRecommendActiveParam.java
View file @
38d4a59b
...
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
...
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
...
@@ -38,12 +40,14 @@ public class KylinRecommendActiveParam implements Serializable {
...
@@ -38,12 +40,14 @@ public class KylinRecommendActiveParam implements Serializable {
*/
*/
@ApiModelProperty
(
value
=
"开启时间yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
value
=
"开启时间yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
@NotNull
(
message
=
"开启时间必传"
)
private
LocalDateTime
startTime
;
private
LocalDateTime
startTime
;
/**
/**
* 结束时间
* 结束时间
*/
*/
@ApiModelProperty
(
value
=
"结束时间yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
value
=
"结束时间yyyy-MM-dd HH:mm:ss"
)
@NotNull
(
message
=
"结束时间必传"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
endTime
;
private
LocalDateTime
endTime
;
...
@@ -51,18 +55,21 @@ public class KylinRecommendActiveParam implements Serializable {
...
@@ -51,18 +55,21 @@ public class KylinRecommendActiveParam implements Serializable {
* 活动名称
* 活动名称
*/
*/
@ApiModelProperty
(
value
=
"活动名称"
)
@ApiModelProperty
(
value
=
"活动名称"
)
@NotBlank
(
message
=
"活动名称必传"
)
private
String
activeName
;
private
String
activeName
;
/**
/**
* 1NFT2组合购3演出4商品
* 1NFT2组合购3演出4商品
*/
*/
@ApiModelProperty
(
value
=
"1NFT2组合购3演出4商品"
)
@ApiModelProperty
(
value
=
"1NFT2组合购3演出4商品"
)
@NotNull
(
message
=
"关联类型必传"
)
private
Integer
activeType
;
private
Integer
activeType
;
/**
/**
* 活动绑定id
* 活动绑定id
*/
*/
@ApiModelProperty
(
value
=
"活动绑定id"
)
@ApiModelProperty
(
value
=
"活动绑定id"
)
@NotBlank
(
message
=
"关联名称必传"
)
private
String
activeBindId
;
private
String
activeBindId
;
/**
/**
...
@@ -89,6 +96,7 @@ public class KylinRecommendActiveParam implements Serializable {
...
@@ -89,6 +96,7 @@ public class KylinRecommendActiveParam implements Serializable {
* 0开启,1未开启
* 0开启,1未开启
*/
*/
@ApiModelProperty
(
value
=
"0开启,1未开启"
)
@ApiModelProperty
(
value
=
"0开启,1未开启"
)
@NotNull
(
message
=
"状态必传"
)
private
Integer
status
;
private
Integer
status
;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinRecommendActiveRelationParam.java
View file @
38d4a59b
...
@@ -40,6 +40,7 @@ public class KylinRecommendActiveRelationParam implements Serializable {
...
@@ -40,6 +40,7 @@ public class KylinRecommendActiveRelationParam implements Serializable {
* 1NFT2组合购3演出4商品
* 1NFT2组合购3演出4商品
*/
*/
@ApiModelProperty
(
value
=
"1NFT2组合购3演出4商品"
)
@ApiModelProperty
(
value
=
"1NFT2组合购3演出4商品"
)
private
Integer
type
;
private
Integer
type
;
/**
/**
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRecommendActiveController.java
View file @
38d4a59b
...
@@ -14,6 +14,9 @@ import io.swagger.annotations.Api;
...
@@ -14,6 +14,9 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.validation.ObjectError
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -93,7 +96,14 @@ public class KylinRecommendActiveController extends BaseController {
...
@@ -93,7 +96,14 @@ public class KylinRecommendActiveController extends BaseController {
@PostMapping
(
"updateKylinRecommendActive"
)
@PostMapping
(
"updateKylinRecommendActive"
)
@ApiOperation
(
value
=
"修改活动"
)
@ApiOperation
(
value
=
"修改活动"
)
@ResponseBody
@ResponseBody
public
AjaxResult
updateKylinRecommendActive
(
@RequestBody
KylinRecommendActiveParam
kylinRecommendActiveParam
)
{
public
AjaxResult
updateKylinRecommendActive
(
@Validated
@RequestBody
KylinRecommendActiveParam
kylinRecommendActiveParam
,
BindingResult
result
)
{
/*BindingResult result = exception.getBindingResult();*/
if
(
result
!=
null
&&
result
.
hasErrors
())
{
List
<
ObjectError
>
errors
=
result
.
getAllErrors
();
if
(
errors
!=
null
)
{
return
AjaxResult
.
error
(
errors
.
get
(
0
).
getDefaultMessage
());
}
}
KylinRecommendActive
kylinRecommendActive
=
new
KylinRecommendActive
();
KylinRecommendActive
kylinRecommendActive
=
new
KylinRecommendActive
();
BeanUtils
.
copyProperties
(
kylinRecommendActiveParam
,
kylinRecommendActive
);
BeanUtils
.
copyProperties
(
kylinRecommendActiveParam
,
kylinRecommendActive
);
if
(
kylinRecommendActiveService
.
validateTime
(
kylinRecommendActive
)
==
0
)
{
if
(
kylinRecommendActiveService
.
validateTime
(
kylinRecommendActive
)
==
0
)
{
...
...
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