Commit c49dd62c authored by hanfeng's avatar hanfeng

修改峰会

parent 025d85ed
...@@ -24,13 +24,14 @@ public class ActivityShow { ...@@ -24,13 +24,14 @@ public class ActivityShow {
@ApiModelProperty("活动id") @ApiModelProperty("活动id")
private Integer activityId; private Integer activityId;
@Column(name = "type")
@ApiModelProperty("1-图片;2-视频")
private Integer type;
@Column(name = "path") @Column(name = "video_path")
@ApiModelProperty("图片或视频路径") @ApiModelProperty("视频路径(逗号分割)")
private String path; private String videoPath;
@Column(name = "picture_path")
@ApiModelProperty("图片路径(逗号分割)")
private String picturePath;
@Column(name = "crt_time") @Column(name = "crt_time")
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
...@@ -41,4 +42,6 @@ public class ActivityShow { ...@@ -41,4 +42,6 @@ public class ActivityShow {
private Integer isDel; private Integer isDel;
} }
...@@ -24,7 +24,9 @@ public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> { ...@@ -24,7 +24,9 @@ public class ActivityShowBiz extends BaseBiz<ActivityShowMapper, ActivityShow> {
private ActivityBiz activityBiz; private ActivityBiz activityBiz;
public ActivityShowDto getOne(Integer activityId) { public ActivityShowDto getOne(Integer activityId) {
return mapper.getOne(activityId); ActivityShow activityShow = new ActivityShow();
activityShow.setActivityId(activityId);
return mapper.getOne(activityId);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
...@@ -17,8 +17,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -17,8 +17,7 @@ import org.springframework.web.bind.annotation.*;
public class ActivityShowController extends BaseController<ActivityShowBiz, ActivityShow> { public class ActivityShowController extends BaseController<ActivityShowBiz, ActivityShow> {
@GetMapping("/one/{activityId}") @GetMapping("/one/{activityId}")
public ObjectRestResponse getOne(@PathVariable Integer activityId){ public ObjectRestResponse getOne(@PathVariable Integer activityId){
return ObjectRestResponse.succ(baseBiz.getOne(activityId));
return ObjectRestResponse.succ( baseBiz.getOne(activityId));
} }
......
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