From 82c8f4fcb95bca8e6d6ddbdf6d843e54748fed27 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 May 2021 19:16:54 +0800 Subject: [PATCH] tt --- .../com/iformall/domain/po/tt/TtCoupon.java | 6 +- .../iformall/domain/po/tt/TtUserCollect.java | 20 ++++++ .../domain/po/tt/TtUserCollectFollow.java | 32 +++++++++ .../iformall/domain/po/tt/TtUserFollow.java | 18 +++++ .../iformall/domain/po/tt/TtVideoLibrary.java | 42 +++++++++++ .../iformall/mapper/TtUserCollectMapper.java | 14 ++++ .../iformall/mapper/TtUserFollowMapper.java | 14 ++++ .../iformall/mapper/TtVideoLibraryMapper.java | 14 ++++ .../resources/mapper/TtUserCollectMapper.xml | 67 ++++++++++++++++++ .../resources/mapper/TtUserFollowMapper.xml | 67 ++++++++++++++++++ .../resources/mapper/TtVideoLibraryMapper.xml | 64 +++++++++++++++++ .../controller/tt/TtCouponController.java | 16 +++-- .../controller/video/VideoController.java | 70 +++++++------------ 13 files changed, 392 insertions(+), 52 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollect.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserFollow.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/tt/TtVideoLibrary.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/TtUserCollectMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/TtUserFollowMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/TtVideoLibraryMapper.java create mode 100644 mallinkService/src/main/resources/mapper/TtUserCollectMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/TtUserFollowMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/TtVideoLibraryMapper.xml 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 97639ad06..7bb43543c 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 @@ -13,6 +13,7 @@ import lombok.ToString; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; @TableName(value = "tt_coupon") @Data @@ -133,9 +134,12 @@ public class TtCoupon extends TenantEntity { private TtCoupon couponCoumn; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "columnCoupons") private List columnCoupons; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") + private Map flowParams; + public String getSalePriceStr() { if(salePrice!=null) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollect.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollect.java new file mode 100644 index 000000000..277271a64 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollect.java @@ -0,0 +1,20 @@ +package com.iformall.domain.po.tt; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + + +@TableName(value = "tt_user_collect") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class TtUserCollect extends TtUserCollectFollow { + + + @io.swagger.annotations.ApiModelProperty(value="",name="couponId") + private Long couponId; + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java new file mode 100644 index 000000000..b374c4e0f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserCollectFollow.java @@ -0,0 +1,32 @@ +package com.iformall.domain.po.tt; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class TtUserCollectFollow extends TenantEntity { + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") + private Date startdate; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") + private Date enddate; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserFollow.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserFollow.java new file mode 100644 index 000000000..e7e8378e6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUserFollow.java @@ -0,0 +1,18 @@ +package com.iformall.domain.po.tt; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + + +@TableName(value = "tt_user_follow") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class TtUserFollow extends TtUserCollectFollow { + + @io.swagger.annotations.ApiModelProperty(value="",name="merchernId") + private Long merchernId; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtVideoLibrary.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtVideoLibrary.java new file mode 100644 index 000000000..43ec165d4 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtVideoLibrary.java @@ -0,0 +1,42 @@ +package com.iformall.domain.po.tt; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.Date; + +@TableName(value = "tt_video_library") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class TtVideoLibrary extends TenantEntity { + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="封面图",name="preview") + private String preview; + @io.swagger.annotations.ApiModelProperty(value="",name="name") + private String name; + @io.swagger.annotations.ApiModelProperty(value="时长",name="duration") + private Integer duration; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") + private Date startdate; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") + private Date enddate; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtUserCollectMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtUserCollectMapper.java new file mode 100644 index 000000000..817a6e26d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/TtUserCollectMapper.java @@ -0,0 +1,14 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.tt.TtUserCollect; + +import java.util.List; + +public interface TtUserCollectMapper extends CommonMapper { + + List findList(TtUserCollect collect); + + int deleteById(Long id); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtUserFollowMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtUserFollowMapper.java new file mode 100644 index 000000000..c8622e054 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/TtUserFollowMapper.java @@ -0,0 +1,14 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.tt.TtUserFollow; + +import java.util.List; + +public interface TtUserFollowMapper extends CommonMapper { + + List findList(TtUserFollow collect); + + int deleteById(Long id); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtVideoLibraryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtVideoLibraryMapper.java new file mode 100644 index 000000000..7a458cf13 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/TtVideoLibraryMapper.java @@ -0,0 +1,14 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.tt.TtVideoLibrary; + +import java.util.List; + +public interface TtVideoLibraryMapper extends CommonMapper { + + List findList(TtVideoLibrary video); + + int deleteById(Long id); + +} diff --git a/mallinkService/src/main/resources/mapper/TtUserCollectMapper.xml b/mallinkService/src/main/resources/mapper/TtUserCollectMapper.xml new file mode 100644 index 000000000..2abff1ac0 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/TtUserCollectMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + `id`, `tenant_id`, `parent_tenant_id`, `user_id`, `coupon_id`, `create_date`, `update_date` + + + + where `is_del` = 0 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `user_id` = #{userId} + + + + and `coupon_id` = #{couponId} + + + + and `create_date` >= #{startdate} + + + and `create_date` <= #{enddate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + update tt_user_collect set is_del = 1,update_date=now() where id = #{id} + + + diff --git a/mallinkService/src/main/resources/mapper/TtUserFollowMapper.xml b/mallinkService/src/main/resources/mapper/TtUserFollowMapper.xml new file mode 100644 index 000000000..27ffaa71b --- /dev/null +++ b/mallinkService/src/main/resources/mapper/TtUserFollowMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + `id`, `tenant_id`, `parent_tenant_id`, `user_id`, `merchern_id`, `create_date`, `update_date` + + + + where `is_del` = 0 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `user_id` = #{userId} + + + + and `merchern_id` = #{merchernId} + + + + and `create_date` >= #{startdate} + + + and `create_date` <= #{enddate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + update tt_user_follow set is_del = 1,update_date=now() where id = #{id} + + + diff --git a/mallinkService/src/main/resources/mapper/TtVideoLibraryMapper.xml b/mallinkService/src/main/resources/mapper/TtVideoLibraryMapper.xml new file mode 100644 index 000000000..c9c671ca3 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/TtVideoLibraryMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + `id`, `tenant_id`, `parent_tenant_id`, `preview`, `name`, `duration`, `create_date`, `update_date` + + + + where `is_del` = 0 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `title` like concat('%', #{name},'%') + + + + and `create_date` >= #{startdate} + + + and `create_date` <= #{enddate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + update tt_video_library set is_del = 1,update_date=now() where id = #{id} + + + diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java index 07d12e2bb..77f441ba4 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.tt.TtCoupon; import com.iformall.enums.*; +import com.iformall.service.WxFlowService; import com.iformall.service.tt.TtCouponService; import com.iformall.utils.RedisLock; import io.swagger.annotations.Api; @@ -28,6 +29,9 @@ public class TtCouponController extends BaseController { @Autowired private TtCouponService ttCouponService; + @Autowired + private WxFlowService wxFlowService; + @Autowired RedisLock redisLock; @@ -57,12 +61,12 @@ public class TtCouponController extends BaseController { } //启动投放审批 -// if(record.getFlowParams() !=null && record.getFlowParams().size()>0) { -// record.getFlowParams().put("businessId",record.getId()); -// wxFlowService.start(record.getFlowParams(), getUserId(), getUser().getName(), tenantEntity); -// //修改coupon applyStatus状态为审核中 -// record.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); -// } + if(record.getFlowParams() !=null && record.getFlowParams().size()>0) { + record.getFlowParams().put("businessId",record.getId()); + wxFlowService.start(record.getFlowParams(), getUserId(), getUser().getName(), tenantEntity); + //修改coupon applyStatus状态为审核中 + record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_EXAMINE.getCode()); + } return resultData; } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 597d9d55e..35635f3e4 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -1,41 +1,9 @@ package com.iformall.controller.video; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; -import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxMallBuilding; -import com.iformall.domain.po.WxMallFloor; -import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; -import com.iformall.domain.po.WxShop; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.base.BaseEntity.SortField; -import com.iformall.enums.EnumContractOperationType; -import com.iformall.enums.EnumContractType; -import com.iformall.enums.EnumFlowContractType; -import com.iformall.enums.EnumFlowKey; -import com.iformall.enums.EnumIsPreview; -import com.iformall.enums.EnumRentContractAppStatus; -import com.iformall.enums.EnumRentContractStatus; -import com.iformall.enums.EnumRentShopType; -import com.iformall.enums.EnumRentStartType; -import com.iformall.exception.MallinkException; -import com.iformall.mapper.WxPropertyContractMapper; -import com.iformall.service.WxBillPropertyService; -import com.iformall.service.WxMallBuildingService; -import com.iformall.service.WxMallFloorService; -import com.iformall.service.WxPropertyContractService; -import com.iformall.service.WxRentPropertyContractService; -import com.iformall.service.WxShopService; import com.iformall.video.VideoFactory; import com.iformall.video.entity.VideUploadResult; @@ -43,20 +11,12 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -69,7 +29,7 @@ public class VideoController extends BaseController { @Autowired VideoFactory videoFactory; - + @Autowired String videoType; @@ -80,7 +40,7 @@ public class VideoController extends BaseController { VideUploadResult result = videoFactory.getExcutor(videoType).uploadLocalVideo("123123213", "/root/111.mp4"); return new ResultData(result); } - + /** * 上传视频 * @@ -90,10 +50,9 @@ public class VideoController extends BaseController { */ @PostMapping(value = "/upload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传视频") - @SystemControllerLog(description = "文件上传") - public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq,@RequestParam Map param) { + public ResultData upload(@RequestParam("file") MultipartFile multiReq,@RequestParam Map param) { try { - String title = param.get("title"); + String title = param.get("title"); VideUploadResult result = videoFactory.getExcutor(videoType).uploadLocalVideo(title, multiReq.getInputStream()); return new ResultData(result); } catch (Exception e) { @@ -102,4 +61,25 @@ public class VideoController extends BaseController { } } + /** + * 上传视频 + * + * @param multiReq + * @return + * @throws Exception + */ + @GetMapping(value = "/uploadProgress") + @ApiOperation("上传视频进度") + @ApiImplicitParams({ + @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) + public ResultData uploadProgress(String videoId) { + try { + String result = videoFactory.getExcutor(videoType).getVedioUploadProgress(videoId); + return new ResultData(result); + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); + } + } + }