From 6a8583d634770903a3ba0b99eecc707d9b532a75 Mon Sep 17 00:00:00 2001 From: wangzhiwei Date: Mon, 5 Jan 2026 11:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/business/model/entity/EffectTemplate.java | 4 ++-- .../business/model/query/EffectTemplateQuery.java | 2 +- .../admin/business/model/req/EffectTemplateReq.java | 2 +- .../business/model/resp/EffectTemplateDetailResp.java | 5 ----- .../admin/business/model/resp/EffectTemplateResp.java | 9 +++------ .../service/impl/EffectTemplateServiceImpl.java | 4 +--- .../service/impl/SubtitleStyleServiceImpl.java | 2 +- .../continew/admin/common/util/LocalDateTimeUtil.java | 11 +++++++++++ 8 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 continew-admin-common/src/main/java/top/continew/admin/common/util/LocalDateTimeUtil.java diff --git a/continew-admin-business/src/main/java/top/continew/admin/business/model/entity/EffectTemplate.java b/continew-admin-business/src/main/java/top/continew/admin/business/model/entity/EffectTemplate.java index 8d22e13..df95f55 100644 --- a/continew-admin-business/src/main/java/top/continew/admin/business/model/entity/EffectTemplate.java +++ b/continew-admin-business/src/main/java/top/continew/admin/business/model/entity/EffectTemplate.java @@ -64,9 +64,9 @@ public class EffectTemplate extends BaseDO { private String subtitleText; /** - * 关联的字幕样式ID + * 关联的字幕样式JSON */ - private Long subtitleStyleId; + private String subtitleStyle; /** * 字幕默认X位置（可为固定值或表达式） diff --git a/continew-admin-business/src/main/java/top/continew/admin/business/model/query/EffectTemplateQuery.java b/continew-admin-business/src/main/java/top/continew/admin/business/model/query/EffectTemplateQuery.java index 841f020..4af7fce 100644 --- a/continew-admin-business/src/main/java/top/continew/admin/business/model/query/EffectTemplateQuery.java +++ b/continew-admin-business/src/main/java/top/continew/admin/business/model/query/EffectTemplateQuery.java @@ -19,7 +19,7 @@ public class EffectTemplateQuery implements Serializable { private String size; private Double length; private String subtitleText; - private Long subtitleStyleId; + private String subtitleStyle; private String subtitlePositionX; private String subtitlePositionY; private String coverUrl; diff --git a/continew-admin-business/src/main/java/top/continew/admin/business/model/req/EffectTemplateReq.java b/continew-admin-business/src/main/java/top/continew/admin/business/model/req/EffectTemplateReq.java index 6dd346b..14523da 100644 --- a/continew-admin-business/src/main/java/top/continew/admin/business/model/req/EffectTemplateReq.java +++ b/continew-admin-business/src/main/java/top/continew/admin/business/model/req/EffectTemplateReq.java @@ -59,7 +59,7 @@ public class EffectTemplateReq extends BaseReq { /** * 关联的字幕样式ID */ - private Long subtitleStyleId; + private String subtitleStyle; /** * 字幕默认X位置（可为固定值或表达式） diff --git a/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateDetailResp.java b/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateDetailResp.java index 05525f1..359f28a 100644 --- a/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateDetailResp.java +++ b/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateDetailResp.java @@ -59,11 +59,6 @@ public class EffectTemplateDetailResp extends BaseResp { */ private String subtitleText; - /** - * 关联的字幕样式ID - */ - private Long subtitleStyleId; - /** * 字幕默认X位置（可为固定值或表达式） */ diff --git a/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateResp.java b/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateResp.java index d3acf05..4bfe61f 100644 --- a/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateResp.java +++ b/continew-admin-business/src/main/java/top/continew/admin/business/model/resp/EffectTemplateResp.java @@ -47,9 +47,9 @@ public class EffectTemplateResp extends BaseResp { /** * 默认尺寸（{"width": w, "height": h}） */ - private String size_width; + private Integer sizeWidth; - private String size_height; + private Integer sizeHeight; /** * 默认持续时间（秒），0表示无限 @@ -61,10 +61,7 @@ public class EffectTemplateResp extends BaseResp { */ private String subtitleText; - /** - * 关联的字幕样式ID - */ - private Long subtitleStyleId; + private String subtitleStyle; /** * 字幕默认X位置（可为固定值或表达式） diff --git a/continew-admin-business/src/main/java/top/continew/admin/business/service/impl/EffectTemplateServiceImpl.java b/continew-admin-business/src/main/java/top/continew/admin/business/service/impl/EffectTemplateServiceImpl.java index 9ff5752..bd383b3 100644 --- a/continew-admin-business/src/main/java/top/continew/admin/business/service/impl/EffectTemplateServiceImpl.java +++ b/continew-admin-business/src/main/java/top/continew/admin/business/service/impl/EffectTemplateServiceImpl.java @@ -8,7 +8,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import top.continew.admin.business.mapper.EffectTemplateMapper; -import top.continew.admin.business.model.entity.Effect; import top.continew.admin.business.model.entity.EffectTemplate; import top.continew.admin.business.model.query.EffectTemplatePageQuery; import top.continew.admin.business.model.query.EffectTemplateQuery; @@ -16,7 +15,6 @@ import top.continew.admin.business.model.req.EffectTemplateReq; import top.continew.admin.business.model.resp.EffectTemplateDetailResp; import top.continew.admin.business.model.resp.EffectTemplateResp; import top.continew.admin.business.service.EffectTemplateService; -import top.continew.admin.common.util.helper.LoginHelper; import top.continew.admin.system.service.FileService; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; @@ -40,7 +38,7 @@ public class EffectTemplateServiceImpl extends BaseServiceImpl page = new Page<>(pageQuery.getPage(), pageQuery.getSize()); - Page result = subtitleStyleMapper.selectPage(page, wrapper); + Page result = subtitleStyleMapper.selectPage(page, wrapper); PageResp pageResp = new PageResp(); pageResp.setTotal(result.getTotal()); pageResp.setList(result.getRecords().stream().map(this::convertToResp).toList()); diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/util/LocalDateTimeUtil.java b/continew-admin-common/src/main/java/top/continew/admin/common/util/LocalDateTimeUtil.java new file mode 100644 index 0000000..a6590b0 --- /dev/null +++ b/continew-admin-common/src/main/java/top/continew/admin/common/util/LocalDateTimeUtil.java @@ -0,0 +1,11 @@ +package top.continew.admin.common.util; + +import org.springframework.data.convert.Jsr310Converters; + +import java.time.LocalDateTime; + +public class LocalDateTimeUtil { + public static LocalDateTime toLocalDateTime(String dateString) { + return Jsr310Converters.StringToLocalDateTimeConverter.INSTANCE.convert(dateString); + } +}