zxl
5 天以前 d6eb0db20437b43a1748c5cdeaeefcbc99145ac7
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
@@ -3,19 +3,23 @@
import cn.lili.base.Result;
import cn.lili.group.Add;
import cn.lili.group.Update;
import cn.lili.modules.lmk.domain.form.ActivityAuditRecordForm;
import cn.lili.modules.lmk.domain.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.CustomerBlackForm;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.CustomerBlackQuery;
import cn.lili.modules.lmk.service.ActivityAuditRecordService;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.CustomerBlackService;
import cn.lili.utils.HtmlUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@@ -34,16 +38,26 @@
    private final ActivityService activityService;
    private final ActivityAuditRecordService activityAuditRecordService;
    @PostMapping("/audit")
    public Result auditActivity(@RequestBody @Validated(Add.class) ActivityAuditRecordForm form){
        return activityAuditRecordService.addOrUpdateAuditActivity(form);
    }
    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    public Result add(@RequestBody @Validated(Add.class) ActivityForm form) {
        return activityService.add(form);
    public Result add(@RequestBody ActivityForm form) {
        form.setActivityContent(HtmlUtil.addVideoControls(form.getActivityContent()));
        return activityService.add(form,true);
    }
    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    public Result update(@RequestBody @Validated(Update.class) ActivityForm form) {
        return activityService.update(form);
    public Result update(@RequestBody  ActivityForm form) {
        form.setActivityContent(HtmlUtil.addVideoControls(form.getActivityContent()));
        return activityService.update(form,true);
    }
    @DeleteMapping("/{id}")