记得上下班打卡 | git大法好,push需谨慎

Commit d5984c49 authored by jiangxiulong's avatar jiangxiulong

style

parent 0d30017f
......@@ -37,32 +37,34 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation(value = "增加活动")
@ResponseBody
public AjaxResult addKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
KylinRecommendActive kylinRecommendActive=new KylinRecommendActive();
KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if(kylinRecommendActiveService.validateTime(kylinRecommendActive)==0){
List<KylinRecommendActiveRelation> list=new ArrayList<KylinRecommendActiveRelation>();
if(kylinRecommendActiveParam.getList()!=null){
kylinRecommendActiveParam.getList().forEach(r->{
KylinRecommendActiveRelation kylinRecommendActiveRelation=new KylinRecommendActiveRelation();
if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
List<KylinRecommendActiveRelation> list = new ArrayList<KylinRecommendActiveRelation>();
if (kylinRecommendActiveParam.getList() != null) {
kylinRecommendActiveParam.getList().forEach(r -> {
KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
BeanUtils.copyProperties(r, kylinRecommendActiveRelation);
list.add(kylinRecommendActiveRelation);
});
}
kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive,list);
kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive, list);
return AjaxResult.success("操作成功", "");
}else{
} else {
return AjaxResult.error("该时间段已经重复,请重新选择");
}
}
@PostMapping("addKylinRecommendActiveRelation")
@ApiOperation(value = "增加活动推荐")
@ResponseBody
public AjaxResult addKylinRecommendActiveRelation(@RequestBody KylinRecommendActiveRelationParam kylinRecommendActiveParam) {
KylinRecommendActiveRelation kylinRecommendActiveRelation=new KylinRecommendActiveRelation();
BeanUtils.copyProperties(kylinRecommendActiveParam , kylinRecommendActiveRelation);
KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActiveRelation);
kylinRecommendActiveRelationService.addKylinRecommendActiveRelation(kylinRecommendActiveRelation);
return AjaxResult.success("操作成功", "");
}
@PostMapping("delKylinRecommendActiveRelation")
@ApiOperation(value = "删除活动推荐(传入互动推荐里面的mid)")
@ResponseBody
......@@ -76,23 +78,25 @@ public class KylinRecommendActiveController extends BaseController {
@ApiOperation(value = "修改活动")
@ResponseBody
public AjaxResult updateKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
KylinRecommendActive kylinRecommendActive=new KylinRecommendActive();
KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
if(kylinRecommendActiveService.validateTime(kylinRecommendActive)==0){
if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
kylinRecommendActiveService.updateKylinRecommendActive(kylinRecommendActive);
return AjaxResult.success("操作成功", "");
}else{
} else {
return AjaxResult.error("该时间段已经重复,请重新选择");
}
}
@PostMapping("pageActive")
@ApiOperation(value = "分页活动")
@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 getDataTable( kylinRecommendActiveService.pageKylinAcitve(pageSize,pageNum));
return getDataTable(kylinRecommendActiveService.pageKylinAcitve(pageSize, pageNum));
}
@PostMapping("getActiveById")
@ApiOperation(value = "通过id获得活动")
@ResponseBody
......
......@@ -84,6 +84,7 @@ public class KylinRecommendActive implements Serializable {
private String name;
private static final KylinRecommendActive obj = new KylinRecommendActive();
public static KylinRecommendActive getNew() {
try {
return (KylinRecommendActive) obj.clone();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment