From efea311b189da2f174ca3875f37a986907fcd53c Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 20 May 2021 16:57:25 +0800 Subject: [PATCH] tt --- .../com/iformall/domain/po/tt/TtCoupon.java | 5 +++- .../main/resources/mapper/TtCouponMapper.xml | 4 ++- .../controller/basic/UeditorController.java | 27 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 mallinkTTAdmin/src/main/java/com/iformall/controller/basic/UeditorController.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java index 42095ecee..200d35d56 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java @@ -60,6 +60,9 @@ public class TtCoupon extends TenantEntity { private String videoId; @io.swagger.annotations.ApiModelProperty(value="视频时长(秒)",name="videoTime") private String videoTime; + @io.swagger.annotations.ApiModelProperty(value="",name="videoUrl") + private String videoUrl; + @io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html") private String html; @@ -75,7 +78,7 @@ public class TtCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="原价",name="origPrice") private Integer origPrice; - @io.swagger.annotations.ApiModelProperty(value="是否可预览",name="isPreview") + @io.swagger.annotations.ApiModelProperty(value="是否可预览",name="isPreview")//弃用 private Integer isPreview; @io.swagger.annotations.ApiModelProperty(value="预览时长",name="previewDuration") private Integer previewDuration; diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml index 91c7c14d0..fd598536a 100644 --- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml @@ -13,6 +13,8 @@ + + @@ -46,7 +48,7 @@ c.`id`, c.`tenant_id`, c.`parent_tenant_id`, c.`type`, c.`cover_img`, c.`cover_picture`, c.`detail_picture`, - c.`title`, c.`sub_title`, c.`video_id`, c.`video_time`, c.`html`, c.`is_landscape`, c.`is_payment`, + c.`title`, c.`sub_title`, c.`video_id`, c.`video_time`,c.`video_url` c.`html`, c.`is_landscape`, c.`is_payment`, c.`sale_price`, c.`orig_price`, c.`is_preview`, c.`preview_duration`, c.`detail`, c.`false_sell_count`, c.`dy_title`, c.`inventory`, c.`remark`, c.`status`, c.`create_date`, c.`update_date`, c.`see_count`, c.`sell_count`, c.`assess_count`, c.`collect_count`, c.`is_del`, diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/UeditorController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/UeditorController.java new file mode 100644 index 000000000..37e3c9fb2 --- /dev/null +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/UeditorController.java @@ -0,0 +1,27 @@ +package com.iformall.controller.basic; + +import com.iformall.ueditor.ActionEnter; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + + +@RestController +@RequestMapping("/ue") +@Api(description = "网页bannner图接口") +public class UeditorController { + + @Autowired + private ActionEnter actionEnter; + + @ResponseBody + @RequestMapping("/ueditor/exec") + public Object exe(HttpServletRequest request){ + return actionEnter.exec(request); + } + +}