From 9bb304e85d71431d8c16a7baed0dd16da30fb579 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 14 七月 2025 09:00:29 +0800
Subject: [PATCH] 活动接口更新
---
framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java | 3 +++
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 5 +----
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java | 18 ++++++++++++++++--
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
index afca6b5..67955ad 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
@@ -8,6 +8,7 @@
import cn.lili.modules.lmk.domain.entity.CustomerBlack;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonRawValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -90,8 +91,10 @@
/** 娲诲姩鍐呭 */
@NotBlank(message = "娲诲姩璇︾粏鍐呭涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty(value = "娲诲姩璇︾粏鍐呭锛堟敮鎸佸瘜鏂囨湰锛�", example = "<p>娲诲姩娴佺▼锛�...</p>")
+ @JsonRawValue
private String activityContent;
+
/** 娲诲姩鍙戝竷 */
@ApiModelProperty(value = "娲诲姩鍙戝竷", example = "")
private Boolean publish;
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 09313f2..32ad58f 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -46,7 +46,7 @@
public Result add(ActivityForm form,Boolean isManager) {
Activity entity = ActivityForm.getEntityByForm(form, null);
- System.out.println(entity);
+
//榛樿鏂板娲诲姩涓�
entity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
//榛樿涓嶄负鎺ㄨ崘
@@ -79,9 +79,6 @@
mangerSaveOrUpdate(isManager,entity);
baseMapper.updateById(entity);
-
- //鐩存帴閲嶆柊鐢熸垚涓�鏉″鏍歌褰�
- BeanUtils.copyProperties(form, entity);
return Result.ok("淇敼鎴愬姛");
}
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
index df6a805..8ae3b7c 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
@@ -18,6 +18,7 @@
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;
@@ -45,13 +46,26 @@
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
- public Result add(@RequestBody @Validated(Add.class) ActivityForm form) {
+ public Result add(@RequestBody ActivityForm form) {
+ form.setActivityContent(addVideoControls(form.getActivityContent()));
return activityService.add(form,true);
}
+ public static String addVideoControls(String html) {
+ if (html == null || html.isEmpty()) {
+ return html;
+ }
+
+ // 鍖归厤鎵�鏈夋湭鍖呭惈 controls 灞炴�х殑 <video> 鏍囩
+ String regex = "<video\\b(?![^>]*\\bcontrols\\b)([^>]*)>";
+ String replacement = "<video controls=\"controls\"$1>";
+
+ return html.replaceAll(regex, replacement);
+ }
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) ActivityForm form) {
+ public Result update(@RequestBody ActivityForm form) {
+ form.setActivityContent(addVideoControls(form.getActivityContent()));
return activityService.update(form,true);
}
--
Gitblit v1.8.0