diff --git a/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index a96919b..eb5e62f 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -159,11 +159,12 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { private Integer status; /*用户登录用token**/ + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户登录用token",name="token") protected String token; /*用户过期时间**/ - @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") - protected Date expireTime; +// @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") +// protected Date expireTime; @TableField(exist = false) @Excel(name="标签",width = 50,orderNum = "15") @@ -257,7 +258,7 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { //生成一个token this.setToken(UUID.randomUUID().toString()); //过期时间 - this.setExpireTime(new Date(currentDate.getTime() + Constant.EXPIRE)); +// this.setExpireTime(new Date(currentDate.getTime() + Constant.EXPIRE)); return this.getToken(); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java index e3776f3..93cae66 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java @@ -32,12 +32,12 @@ public class MouldPatch extends TenantEntity { private String priceStr; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") - private Date startdate; + @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startDate") + private Date startDate; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") - private Date enddate; + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="endDate") + private Date endDate; @io.swagger.annotations.ApiModelProperty(value="EnumMouldPatchType",name="type") private Integer type; diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java new file mode 100644 index 0000000..526db0e --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java @@ -0,0 +1,75 @@ +package com.iformall.domain.po.sm; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.common.SortColumn; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.apache.commons.lang3.StringUtils; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@TableName(value = "user_mould_video") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class UserMouldVideo extends TenantEntity { + + protected Long id; + + @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; + + @io.swagger.annotations.ApiModelProperty(value="用户Id",name="userId") + private Long userId; + + @io.swagger.annotations.ApiModelProperty(value="EnumMouldVideoType",name="type") + private Integer type; + @io.swagger.annotations.ApiModelProperty(value="人物模板ID",name="personMouldId") + private Long personMouldId; + @io.swagger.annotations.ApiModelProperty(value="人物模板文件",name="personMouldPath") + private String personMouldPath; + @io.swagger.annotations.ApiModelProperty(value="声音模板ID",name="voiceMouldId") + private Long voiceMouldId; + @io.swagger.annotations.ApiModelProperty(value="声音模板文件",name="voiceMouldPath") + private String voiceMouldPath; + @io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork") + private String paperwork; + @io.swagger.annotations.ApiModelProperty(value="背景模板ID",name="backgroundMouldId") + private String backgroundMouldId; + @io.swagger.annotations.ApiModelProperty(value="背景模板文件",name="backgroundMouldPath") + private String backgroundMouldPath; + + @io.swagger.annotations.ApiModelProperty(value="名称",name="title") + private String title; + + @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") + private String remark; + + @io.swagger.annotations.ApiModelProperty(value="视频文件",name="videoId") + private String videoId; + @io.swagger.annotations.ApiModelProperty(value="",name="videoPath") + private String videoPath; + @io.swagger.annotations.ApiModelProperty(value="视频时长",name="videoTime") + private Integer videoTime; + + @io.swagger.annotations.ApiModelProperty(value="生成视频时间",name="createVideoDate") + private Date createVideoDate; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + +} diff --git a/suimangService/src/main/java/com/iformall/enums/EnumMouldVideoType.java b/suimangService/src/main/java/com/iformall/enums/EnumMouldVideoType.java new file mode 100644 index 0000000..a6f9fd6 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/enums/EnumMouldVideoType.java @@ -0,0 +1,50 @@ +package com.iformall.enums; + +import java.util.ArrayList; +import java.util.List; + +/** + * + */ +public enum EnumMouldVideoType { + + // 1:固定模板,2:自建模板, + + sys_mould(1, "固定模板"), + user_mould(2, "自建模板"), + ; + + public static EnumMouldVideoType getEnum(Integer code) { + for (EnumMouldVideoType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + public static List getAllCodes(){ + List codes = new ArrayList<>(); + for (EnumMouldVideoType value : values()) { + codes.add(value.getCode()); + } + return codes; + } + + private Integer code; + private String message; + + EnumMouldVideoType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } + +} diff --git a/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java b/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java new file mode 100644 index 0000000..e0c7db3 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/UserMouldVideoMapper.java @@ -0,0 +1,22 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.sm.UserMouldVideo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface UserMouldVideoMapper extends CommonMapper { + + List findList(UserMouldVideo record); + + int deleteById(@Param("id")Long id); + + /** + * c端列表查询,尽量减少字段 + * @param record + * @return + */ + List findCList(UserMouldVideo record); + +} diff --git a/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 95d5ce1..31c1cda 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -785,7 +785,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc wxCUserBasicInfoMapper.updateById(basicInfoUpd); basicInfo.setToken(basicInfoUpd.getToken()); - basicInfo.setExpireTime(basicInfoUpd.getExpireTime()); +// basicInfo.setExpireTime(basicInfoUpd.getExpireTime()); basicInfo.setLoginCount(basicInfoUpd.getLoginCount()); basicInfo.setActiveTime(basicInfoUpd.getActiveTime()); basicInfo.setUpdateDate(basicInfoUpd.getUpdateDate()); diff --git a/suimangService/src/main/resources/mapper/MouldPatchMapper.xml b/suimangService/src/main/resources/mapper/MouldPatchMapper.xml index 240ed42..f48a212 100644 --- a/suimangService/src/main/resources/mapper/MouldPatchMapper.xml +++ b/suimangService/src/main/resources/mapper/MouldPatchMapper.xml @@ -91,8 +91,8 @@ and `status` = #{status} - - and `create_date` between #{startdate} and #{enddate} + + and `create_date` between #{startDate} and #{endDate} diff --git a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml new file mode 100644 index 0000000..9239577 --- /dev/null +++ b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + `id`, `tenant_id`, `parent_tenant_id`, `user_id`, `type`, + `person_mould_id`, `person_mould_path`, `voice_mould_id`, `voice_mould_path`, `paperwork`, `background_mould_id`, `background_mould_path`, + `title`, `remark`, `video_id`, `video_path`, `video_time`, `create_video_date`, `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 `type` = #{type} + + + + and `person_mould_id` = #{personMouldId} + + + + and `voice_mould_id` = #{voiceMouldId} + + + + and `background_mould_id` = #{backgroundMouldId} + + + + and `title` like concat('%', #{title},'%') + + + + and `create_date` between #{startDate} and #{endDate} + + + + and id in + + #{idItem} + + + + order by ${sortColumns} + + + + + + update user_mould_video set is_del = 1,update_date = now() where id = #{id} + + + + +