From 4bdca32ea9a0cf248d0fd229c8458338f7db6ffa Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 15 Oct 2025 14:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/SmsPushEventController.java | 5 ----- .../com/czg/market/dto/SmsShopTemplateDTO.java | 16 +++++++++++++++- .../com/czg/market/entity/SmsShopTemplate.java | 4 ++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java index 96c0d291..379e4642 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/SmsPushEventController.java @@ -2,21 +2,16 @@ package com.czg.controller.admin; import com.czg.BaseQueryParam; import com.czg.market.dto.SmsPushEventDTO; -import com.czg.market.dto.SmsShopTemplateDTO; import com.czg.market.service.SmsPushEventService; -import com.czg.market.service.SmsShopTemplateService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.validator.group.InsertGroup; -import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 短信推送任务 * diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java index 028e1972..efdfd4ad 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsShopTemplateDTO.java @@ -10,6 +10,7 @@ import com.czg.validator.group.InsertGroup; import com.czg.validator.group.UpdateGroup; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Null; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -33,12 +34,25 @@ public class SmsShopTemplateDTO implements Serializable { private Long id; private Long shopId; + /** + * 模板名称 + */ + @NotNull(message = "模板名称不能为空", groups = {InsertGroup.class, UpdateGroup.class}) + @Size(max = 30, message = "模板名称最大长度为30个字", groups = {InsertGroup.class, UpdateGroup.class}) + private String title; /** * 模板内容 */ @NotNull(message = "模板内容不能为空", groups = {InsertGroup.class, UpdateGroup.class}) - private Long content; + @Size(max = 500, message = "模板内容最大长度为500个字", groups = {InsertGroup.class, UpdateGroup.class}) + private String content; + + /** + * 场景描述 + */ + @Size(max = 500, message = "场景描述最大长度为500个字", groups = {InsertGroup.class, UpdateGroup.class}) + private String sceneDetail; /** * 排序 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java index e0c12c90..26dd679f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsShopTemplate.java @@ -46,6 +46,10 @@ public class SmsShopTemplate implements Serializable { * 阿里云模板code */ private String templateCode; + /** + * 场景描述 + */ + private String sceneDetail; /** * 排序