记得上下班打卡 | 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
d5984c49
Commit
d5984c49
authored
Aug 05, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style
parent
0d30017f
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
62 deletions
+67
-62
KylinRecommendActiveController.java
...roller/zhengzai/kylin/KylinRecommendActiveController.java
+20
-16
KylinRecommendActiveServiceImpl.java
...i/kylin/service/impl/KylinRecommendActiveServiceImpl.java
+46
-46
KylinRecommendActive.java
.../liquidnet/service/kylin/entity/KylinRecommendActive.java
+1
-0
No files found.
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 @
d5984c49
...
@@ -37,32 +37,34 @@ public class KylinRecommendActiveController extends BaseController {
...
@@ -37,32 +37,34 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation
(
value
=
"增加活动"
)
@ApiOperation
(
value
=
"增加活动"
)
@ResponseBody
@ResponseBody
public
AjaxResult
addKylinRecommendActive
(
@RequestBody
KylinRecommendActiveParam
kylinRecommendActiveParam
)
{
public
AjaxResult
addKylinRecommendActive
(
@RequestBody
KylinRecommendActiveParam
kylinRecommendActiveParam
)
{
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
)
{
List
<
KylinRecommendActiveRelation
>
list
=
new
ArrayList
<
KylinRecommendActiveRelation
>();
List
<
KylinRecommendActiveRelation
>
list
=
new
ArrayList
<
KylinRecommendActiveRelation
>();
if
(
kylinRecommendActiveParam
.
getList
()!=
null
)
{
if
(
kylinRecommendActiveParam
.
getList
()
!=
null
)
{
kylinRecommendActiveParam
.
getList
().
forEach
(
r
->
{
kylinRecommendActiveParam
.
getList
().
forEach
(
r
->
{
KylinRecommendActiveRelation
kylinRecommendActiveRelation
=
new
KylinRecommendActiveRelation
();
KylinRecommendActiveRelation
kylinRecommendActiveRelation
=
new
KylinRecommendActiveRelation
();
BeanUtils
.
copyProperties
(
r
,
kylinRecommendActiveRelation
);
BeanUtils
.
copyProperties
(
r
,
kylinRecommendActiveRelation
);
list
.
add
(
kylinRecommendActiveRelation
);
list
.
add
(
kylinRecommendActiveRelation
);
});
});
}
}
kylinRecommendActiveService
.
addKylinRecommendActive
(
kylinRecommendActive
,
list
);
kylinRecommendActiveService
.
addKylinRecommendActive
(
kylinRecommendActive
,
list
);
return
AjaxResult
.
success
(
"操作成功"
,
""
);
return
AjaxResult
.
success
(
"操作成功"
,
""
);
}
else
{
}
else
{
return
AjaxResult
.
error
(
"该时间段已经重复,请重新选择"
);
return
AjaxResult
.
error
(
"该时间段已经重复,请重新选择"
);
}
}
}
}
@PostMapping
(
"addKylinRecommendActiveRelation"
)
@PostMapping
(
"addKylinRecommendActiveRelation"
)
@ApiOperation
(
value
=
"增加活动推荐"
)
@ApiOperation
(
value
=
"增加活动推荐"
)
@ResponseBody
@ResponseBody
public
AjaxResult
addKylinRecommendActiveRelation
(
@RequestBody
KylinRecommendActiveRelationParam
kylinRecommendActiveParam
)
{
public
AjaxResult
addKylinRecommendActiveRelation
(
@RequestBody
KylinRecommendActiveRelationParam
kylinRecommendActiveParam
)
{
KylinRecommendActiveRelation
kylinRecommendActiveRelation
=
new
KylinRecommendActiveRelation
();
KylinRecommendActiveRelation
kylinRecommendActiveRelation
=
new
KylinRecommendActiveRelation
();
BeanUtils
.
copyProperties
(
kylinRecommendActiveParam
,
kylinRecommendActiveRelation
);
BeanUtils
.
copyProperties
(
kylinRecommendActiveParam
,
kylinRecommendActiveRelation
);
kylinRecommendActiveRelationService
.
addKylinRecommendActiveRelation
(
kylinRecommendActiveRelation
);
kylinRecommendActiveRelationService
.
addKylinRecommendActiveRelation
(
kylinRecommendActiveRelation
);
return
AjaxResult
.
success
(
"操作成功"
,
""
);
return
AjaxResult
.
success
(
"操作成功"
,
""
);
}
}
@PostMapping
(
"delKylinRecommendActiveRelation"
)
@PostMapping
(
"delKylinRecommendActiveRelation"
)
@ApiOperation
(
value
=
"删除活动推荐(传入互动推荐里面的mid)"
)
@ApiOperation
(
value
=
"删除活动推荐(传入互动推荐里面的mid)"
)
@ResponseBody
@ResponseBody
...
@@ -76,23 +78,25 @@ public class KylinRecommendActiveController extends BaseController {
...
@@ -76,23 +78,25 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation
(
value
=
"修改活动"
)
@ApiOperation
(
value
=
"修改活动"
)
@ResponseBody
@ResponseBody
public
AjaxResult
updateKylinRecommendActive
(
@RequestBody
KylinRecommendActiveParam
kylinRecommendActiveParam
)
{
public
AjaxResult
updateKylinRecommendActive
(
@RequestBody
KylinRecommendActiveParam
kylinRecommendActiveParam
)
{
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
)
{
kylinRecommendActiveService
.
updateKylinRecommendActive
(
kylinRecommendActive
);
kylinRecommendActiveService
.
updateKylinRecommendActive
(
kylinRecommendActive
);
return
AjaxResult
.
success
(
"操作成功"
,
""
);
return
AjaxResult
.
success
(
"操作成功"
,
""
);
}
else
{
}
else
{
return
AjaxResult
.
error
(
"该时间段已经重复,请重新选择"
);
return
AjaxResult
.
error
(
"该时间段已经重复,请重新选择"
);
}
}
}
}
@PostMapping
(
"pageActive"
)
@PostMapping
(
"pageActive"
)
@ApiOperation
(
value
=
"分页活动"
)
@ApiOperation
(
value
=
"分页活动"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
pageActive
(
@RequestParam
(
name
=
"pageSize"
,
required
=
true
)
int
pageSize
,
@RequestParam
(
name
=
"pageNum"
,
required
=
true
)
int
pageNum
)
{
public
TableDataInfo
pageActive
(
@RequestParam
(
name
=
"pageSize"
,
required
=
true
)
int
pageSize
,
@RequestParam
(
name
=
"pageNum"
,
required
=
true
)
int
pageNum
)
{
//return AjaxResult.success(kylinAcitveService.pageKylinAcitve(pageSize,pageNum));
//return AjaxResult.success(kylinAcitveService.pageKylinAcitve(pageSize,pageNum));
return
getDataTable
(
kylinRecommendActiveService
.
pageKylinAcitve
(
pageSize
,
pageNum
));
return
getDataTable
(
kylinRecommendActiveService
.
pageKylinAcitve
(
pageSize
,
pageNum
));
}
}
@PostMapping
(
"getActiveById"
)
@PostMapping
(
"getActiveById"
)
@ApiOperation
(
value
=
"通过id获得活动"
)
@ApiOperation
(
value
=
"通过id获得活动"
)
@ResponseBody
@ResponseBody
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRecommendActiveServiceImpl.java
View file @
d5984c49
This diff is collapsed.
Click to expand it.
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRecommendActive.java
View file @
d5984c49
...
@@ -84,6 +84,7 @@ public class KylinRecommendActive implements Serializable {
...
@@ -84,6 +84,7 @@ public class KylinRecommendActive implements Serializable {
private
String
name
;
private
String
name
;
private
static
final
KylinRecommendActive
obj
=
new
KylinRecommendActive
();
private
static
final
KylinRecommendActive
obj
=
new
KylinRecommendActive
();
public
static
KylinRecommendActive
getNew
()
{
public
static
KylinRecommendActive
getNew
()
{
try
{
try
{
return
(
KylinRecommendActive
)
obj
.
clone
();
return
(
KylinRecommendActive
)
obj
.
clone
();
...
...
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