Commit 2c9d0e6b by xugaojun

代码优化、新增字段

parent 940a11fa
package com.gic.haoban.manage.api.dto.welcome;
import java.io.Serializable;
/**
* desc:加好友配置dto
*
* @author: YongEn
* @date: 2022/2/9
**/
public class FriendSettingDTO implements Serializable {
private static final long serialVersionUID = -8947246337650792859L;
/**
* 加好友配置id
*/
private Long friendSettingId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 欢迎语配置类型 :
* 1 发送好办欢迎语文案+小程序卡片(附带导购参数)
* 2 发送好办欢迎语文案+公众号二维码(附带导购参数)
* 3 发送好办欢迎语文案
* 4 不发送好办欢迎语,用企微欢迎语
*/
private Integer friendSettingType;
public Long getFriendSettingId() {
return friendSettingId;
}
public void setFriendSettingId(Long friendSettingId) {
this.friendSettingId = friendSettingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getFriendSettingType() {
return friendSettingType;
}
public void setFriendSettingType(Integer friendSettingType) {
this.friendSettingType = friendSettingType;
}
@Override
public String toString() {
return "FriendSettingDTO{" +
"friendSettingId=" + friendSettingId +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", friendSettingType=" + friendSettingType +
'}';
}
}
package com.gic.haoban.manage.api.dto.welcome;
import java.io.Serializable;
import java.util.List;
/**
* desc:欢迎语详情dto
*
* @author: YongEn
* @date: 2022/2/9
**/
public class WelcomeDetailDTO implements Serializable {
private static final long serialVersionUID = 3769230492381481354L;
/**
* 欢迎语id
*/
private String welcomeId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String welcomeContent;
/**
* 0关闭 1开启
*/
private Integer openFlag;
/**
* 适用部门, 以逗号分割
*/
private String suitDepartment;
/**
* 欢迎语媒体列表
*/
private List<WelcomeMediaDTO> welcomeMediaList;
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getWelcomeContent() {
return welcomeContent;
}
public void setWelcomeContent(String welcomeContent) {
this.welcomeContent = welcomeContent;
}
public Integer getOpenFlag() {
return openFlag;
}
public void setOpenFlag(Integer openFlag) {
this.openFlag = openFlag;
}
public String getSuitDepartment() {
return suitDepartment;
}
public void setSuitDepartment(String suitDepartment) {
this.suitDepartment = suitDepartment;
}
public List<WelcomeMediaDTO> getWelcomeMediaList() {
return welcomeMediaList;
}
public void setWelcomeMediaList(List<WelcomeMediaDTO> welcomeMediaList) {
this.welcomeMediaList = welcomeMediaList;
}
@Override
public String toString() {
return "WelcomeDetailDTO{" +
"welcomeId='" + welcomeId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", title='" + title + '\'' +
", welcomeContent='" + welcomeContent + '\'' +
", openFlag=" + openFlag +
", suitDepartment='" + suitDepartment + '\'' +
", welcomeMediaList=" + welcomeMediaList +
'}';
}
}
package com.gic.haoban.manage.api.dto.welcome;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* desc:欢迎语列表dto
*
* @author: YongEn
* @date: 2022/2/9
**/
public class WelcomeListDTO implements Serializable {
private static final long serialVersionUID = -2794283506358759903L;
/**
* 欢迎语id
*/
private String welcomeId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String welcomeContent;
/**
* 0关闭 1开启
*/
private Integer openFlag;
/**
* 更新时间
*/
private Date updateTime;
/**
* 适用部门id, 以逗号分割
*/
private String suitDepartment;
/**
* 适用部门名称, 以逗号分割
*/
private String suitDepartmentName;
/**
* 操作人id
*/
private String operatorId;
/**
* 操作人名称
*/
private String operatorName;
/**
* 欢迎语媒体列表
*/
private List<WelcomeMediaDTO> welcomeMediaList;
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getWelcomeContent() {
return welcomeContent;
}
public void setWelcomeContent(String welcomeContent) {
this.welcomeContent = welcomeContent;
}
public Integer getOpenFlag() {
return openFlag;
}
public void setOpenFlag(Integer openFlag) {
this.openFlag = openFlag;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getSuitDepartment() {
return suitDepartment;
}
public void setSuitDepartment(String suitDepartment) {
this.suitDepartment = suitDepartment;
}
public String getSuitDepartmentName() {
return suitDepartmentName;
}
public void setSuitDepartmentName(String suitDepartmentName) {
this.suitDepartmentName = suitDepartmentName;
}
public String getOperatorId() {
return operatorId;
}
public void setOperatorId(String operatorId) {
this.operatorId = operatorId;
}
public String getOperatorName() {
return operatorName;
}
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
public List<WelcomeMediaDTO> getWelcomeMediaList() {
return welcomeMediaList;
}
public void setWelcomeMediaList(List<WelcomeMediaDTO> welcomeMediaList) {
this.welcomeMediaList = welcomeMediaList;
}
@Override
public String toString() {
return "WelcomeListDTO{" +
"welcomeId='" + welcomeId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", title='" + title + '\'' +
", welcomeContent='" + welcomeContent + '\'' +
", openFlag=" + openFlag +
", updateTime=" + updateTime +
", suitDepartment='" + suitDepartment + '\'' +
", operatorId='" + operatorId + '\'' +
", operatorName='" + operatorName + '\'' +
", welcomeMediaList=" + welcomeMediaList +
'}';
}
}
package com.gic.haoban.manage.api.dto.welcome;
import java.io.Serializable;
/**
* desc:欢迎语媒体文件dto
*
* @author: YongEn
* @date: 2022/2/9
**/
public class WelcomeMediaDTO implements Serializable {
private static final long serialVersionUID = -7924288948457409336L;
/**
* 欢迎语媒体id
*/
private Long welcomeMediaId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 欢迎语id
*/
private String welcomeId;
/**
* 媒体标题
*/
private String mediaTitle;
/**
* 媒体类型 1图片 2视频 3文件 4链接
* @see com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum
*/
private Integer mediaType;
/**
* 媒体文件路径,保存上传路径
*/
private String mediaUrl;
public Long getWelcomeMediaId() {
return welcomeMediaId;
}
public void setWelcomeMediaId(Long welcomeMediaId) {
this.welcomeMediaId = welcomeMediaId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public String getMediaTitle() {
return mediaTitle;
}
public void setMediaTitle(String mediaTitle) {
this.mediaTitle = mediaTitle;
}
public Integer getMediaType() {
return mediaType;
}
public void setMediaType(Integer mediaType) {
this.mediaType = mediaType;
}
public String getMediaUrl() {
return mediaUrl;
}
public void setMediaUrl(String mediaUrl) {
this.mediaUrl = mediaUrl;
}
@Override
public String toString() {
return "WelcomeMediaDTO{" +
"welcomeMediaId=" + welcomeMediaId +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", welcomeId='" + welcomeId + '\'' +
", mediaType=" + mediaType +
", mediaUrl='" + mediaUrl + '\'' +
'}';
}
}
package com.gic.haoban.manage.api.enums;
import java.io.Serializable;
/**
* desc:加好友配置类型枚举类
*
* @author: YongEn
* @date: 2022/2/10
**/
public enum FriendSettingTypeEnum implements Serializable {
/**
*
*/
TEXT_AND_MINI_PROGRAM(1, "发送好办欢迎语文案+小程序卡片(附带导购参数)"),
TEXT_AND_QRCODE(2, "发送好办欢迎语文案+公众号二维码(附带导购参数)"),
TEXT(3, "发送好办欢迎语文案"),
NOT_TEXT(4, "不发送好办欢迎语,用企微欢迎语"),
;
private final Integer code;
private final String desc;
FriendSettingTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
}
package com.gic.haoban.manage.api.enums;
import java.io.Serializable;
/**
* desc:欢迎语媒体文件类型枚举类
*
* @author: YongEn
* @date: 2022/2/9
**/
public enum WelcomeMediaTypeEnum implements Serializable {
/**
* 图片
*/
IMAGE(1, "图片"),
VIDEO(2, "视频"),
FILE(3, "文件"),
LINK(4, "链接"),
;
private final Integer code;
private final String desc;
WelcomeMediaTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
}
......@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.service.entity.TabWelcome;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -31,4 +32,14 @@ public interface TabHaobanWelcomeMapper {
* @date : 2022/2/9
*/
List<TabWelcome> listByWxEnterpriseId(String wxEnterpriseId);
/**
* desc: 根据微信企业id查询数量
*
* @param wxEnterpriseId 微信企业id
* @return : {@link long}
* @author : YongEn
* @date : 2022/2/10
*/
long countByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
}
\ No newline at end of file
......@@ -24,7 +24,11 @@ public class TabHaobanWelcomeMedia implements Serializable {
*/
private String welcomeId;
/**
* 媒体类型 1图片 2视频 3文件
* 媒体标题
*/
private String mediaTitle;
/**
* 媒体类型 1图片 2视频 3文件 4链接
*/
private Integer mediaType;
/**
......@@ -69,6 +73,14 @@ public class TabHaobanWelcomeMedia implements Serializable {
this.welcomeId = welcomeId;
}
public String getMediaTitle() {
return mediaTitle;
}
public void setMediaTitle(String mediaTitle) {
this.mediaTitle = mediaTitle;
}
public Integer getMediaType() {
return mediaType;
}
......@@ -109,4 +121,18 @@ public class TabHaobanWelcomeMedia implements Serializable {
this.deleteFlag = deleteFlag;
}
@Override
public String toString() {
return "TabHaobanWelcomeMedia{" +
"welcomeMediaId=" + welcomeMediaId +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", welcomeId='" + welcomeId + '\'' +
", mediaTitle='" + mediaTitle + '\'' +
", mediaType=" + mediaType +
", mediaUrl='" + mediaUrl + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", deleteFlag=" + deleteFlag +
'}';
}
}
......@@ -61,6 +61,10 @@ public class TabWelcome implements Serializable {
* 适用部门, 以逗号分割
*/
private String suitDepartment;
/**
* 适用员工, 以逗号分割
*/
private String suitStaff;
/**
* 操作人id
......@@ -148,6 +152,14 @@ public class TabWelcome implements Serializable {
return suitDepartment;
}
public String getSuitStaff() {
return suitStaff;
}
public void setSuitStaff(String suitStaff) {
this.suitStaff = suitStaff;
}
public void setSuitDepartment(String suitDepartment) {
this.suitDepartment = suitDepartment;
}
......
......@@ -7,4 +7,54 @@ package com.gic.haoban.manage.service.pojo.bo.welcome;
* @date: 2022/2/8
**/
public class FriendSettingDetailBO {
/**
* 加好友配置id
*/
private Long friendSettingId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 欢迎语配置类型 :
* 1 发送好办欢迎语文案+小程序卡片(附带导购参数)
* 2 发送好办欢迎语文案+公众号二维码(附带导购参数)
* 3 发送好办欢迎语文案
* 4 不发送好办欢迎语,用企微欢迎语
* @see com.gic.haoban.manage.api.enums.FriendSettingTypeEnum
*/
private Integer friendSettingType;
public Long getFriendSettingId() {
return friendSettingId;
}
public void setFriendSettingId(Long friendSettingId) {
this.friendSettingId = friendSettingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getFriendSettingType() {
return friendSettingType;
}
public void setFriendSettingType(Integer friendSettingType) {
this.friendSettingType = friendSettingType;
}
@Override
public String toString() {
return "FriendSettingDetailBO{" +
"friendSettingId=" + friendSettingId +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", friendSettingType=" + friendSettingType +
'}';
}
}
......@@ -7,4 +7,53 @@ package com.gic.haoban.manage.service.pojo.bo.welcome;
* @date: 2022/2/8
**/
public class SaveFriendSettingBO {
/**
* 加好友配置id
*/
private Long friendSettingId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 欢迎语配置类型 :
* 1 发送好办欢迎语文案+小程序卡片(附带导购参数)
* 2 发送好办欢迎语文案+公众号二维码(附带导购参数)
* 3 发送好办欢迎语文案
* 4 不发送好办欢迎语,用企微欢迎语
*/
private Integer friendSettingType;
public Long getFriendSettingId() {
return friendSettingId;
}
public void setFriendSettingId(Long friendSettingId) {
this.friendSettingId = friendSettingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getFriendSettingType() {
return friendSettingType;
}
public void setFriendSettingType(Integer friendSettingType) {
this.friendSettingType = friendSettingType;
}
@Override
public String toString() {
return "SaveFriendSettingBO{" +
"friendSettingId=" + friendSettingId +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", friendSettingType=" + friendSettingType +
'}';
}
}
package com.gic.haoban.manage.service.pojo.bo.welcome;
import java.util.List;
/**
* desc:保存欢迎语bo
*
......@@ -7,4 +9,101 @@ package com.gic.haoban.manage.service.pojo.bo.welcome;
* @date: 2022/2/8
**/
public class SaveWelcomeBO {
/**
* 欢迎语id
*/
private String welcomeId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String welcomeContent;
/**
* 适用部门, 以逗号分割
*/
private String suitDepartment;
/**
* 适用员工, 以逗号分割
*/
private String suitStaff;
/**
* 欢迎语媒体列表
*/
private List<SaveWelcomeMediaBO> mediaList;
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getWelcomeContent() {
return welcomeContent;
}
public void setWelcomeContent(String welcomeContent) {
this.welcomeContent = welcomeContent;
}
public String getSuitDepartment() {
return suitDepartment;
}
public void setSuitDepartment(String suitDepartment) {
this.suitDepartment = suitDepartment;
}
public String getSuitStaff() {
return suitStaff;
}
public void setSuitStaff(String suitStaff) {
this.suitStaff = suitStaff;
}
public List<SaveWelcomeMediaBO> getMediaList() {
return mediaList;
}
public void setMediaList(List<SaveWelcomeMediaBO> mediaList) {
this.mediaList = mediaList;
}
@Override
public String toString() {
return "SaveWelcomeBO{" +
"welcomeId='" + welcomeId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", title='" + title + '\'' +
", welcomeContent='" + welcomeContent + '\'' +
", suitDepartment='" + suitDepartment + '\'' +
", suitStaff='" + suitStaff + '\'' +
", mediaList=" + mediaList +
'}';
}
}
package com.gic.haoban.manage.service.pojo.bo.welcome;
/**
* desc:保存欢迎语媒体bo
*
* @author: YongEn
* @date: 2022/2/10
**/
public class SaveWelcomeMediaBO {
/**
* 媒体标题
*/
private String mediaTitle;
/**
* 媒体路径
*/
private String mediaUrl;
/**
* 媒体类型
* @see com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum
*/
private Integer mediaType;
public String getMediaTitle() {
return mediaTitle;
}
public void setMediaTitle(String mediaTitle) {
this.mediaTitle = mediaTitle;
}
public String getMediaUrl() {
return mediaUrl;
}
public void setMediaUrl(String mediaUrl) {
this.mediaUrl = mediaUrl;
}
public Integer getMediaType() {
return mediaType;
}
public void setMediaType(Integer mediaType) {
this.mediaType = mediaType;
}
@Override
public String toString() {
return "SaveWelcomeMediaBO{" +
"mediaTitle='" + mediaTitle + '\'' +
", mediaUrl='" + mediaUrl + '\'' +
", mediaType=" + mediaType +
'}';
}
}
......@@ -34,6 +34,10 @@ public class WelcomeDetailBO {
*/
private String suitDepartment;
/**
* 适用员工, 以逗号分割
*/
private String suitStaff;
/**
* 欢迎语媒体列表
*/
private List<WelcomeMediaBO> welcomeMediaList;
......@@ -86,6 +90,14 @@ public class WelcomeDetailBO {
this.suitDepartment = suitDepartment;
}
public String getSuitStaff() {
return suitStaff;
}
public void setSuitStaff(String suitStaff) {
this.suitStaff = suitStaff;
}
public List<WelcomeMediaBO> getWelcomeMediaList() {
return welcomeMediaList;
}
......
......@@ -39,6 +39,10 @@ public class WelcomeListBO {
*/
private String suitDepartment;
/**
* 适用员工, 以逗号分割
*/
private String suitStaff;
/**
* 操作人id
*/
private String operatorId;
......@@ -99,6 +103,14 @@ public class WelcomeListBO {
this.suitDepartment = suitDepartment;
}
public String getSuitStaff() {
return suitStaff;
}
public void setSuitStaff(String suitStaff) {
this.suitStaff = suitStaff;
}
public List<WelcomeMediaBO> getWelcomeMediaList() {
return welcomeMediaList;
}
......
......@@ -20,7 +20,11 @@ public class WelcomeMediaBO {
*/
private String welcomeId;
/**
* 媒体类型 1图片 2视频 3文件
* 媒体标题
*/
private String mediaTitle;
/**
* 媒体类型 1图片 2视频 3文件 4链接
*/
private Integer mediaType;
/**
......@@ -52,6 +56,14 @@ public class WelcomeMediaBO {
this.welcomeId = welcomeId;
}
public String getMediaTitle() {
return mediaTitle;
}
public void setMediaTitle(String mediaTitle) {
this.mediaTitle = mediaTitle;
}
public Integer getMediaType() {
return mediaType;
}
......
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.impl;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanFriendSettingMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMediaMapper;
import com.gic.haoban.manage.service.entity.TabWelcome;
import com.gic.haoban.manage.service.pojo.bo.welcome.*;
import com.gic.haoban.manage.service.service.WelcomeService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,9 +27,18 @@ public class WelcomeServiceImpl implements WelcomeService {
@Autowired
private TabHaobanFriendSettingMapper friendSettingMapper;
private static final long WELCOME_LIMIT = 50;
@Override
public Boolean saveWelcome(SaveWelcomeBO bo) {
// 校验欢迎语数量
long count = welcomeMapper.countByWxEnterpriseId(bo.getWxEnterpriseId());
if (count >= WELCOME_LIMIT) {
return Boolean.FALSE;
}
// 构建实体类
TabWelcome welcome = new TabWelcome();
return null;
}
......
......@@ -11,14 +11,16 @@
<result column="open_flag" jdbcType="INTEGER" property="openFlag"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="suit_staff" jdbcType="VARCHAR" property="suitStaff"/>
<result column="suit_department" jdbcType="VARCHAR" property="suitDepartment"/>
<result column="operator_id" jdbcType="VARCHAR" property="operatorId"/>
<result column="operator_name" jdbcType="VARCHAR" property="operatorName"/>
</resultMap>
<sql id="Base_Column_List">
welcome_id, wx_enterprise_id, title, welcome_content,welcome_img,open_flag, status_flag,
create_time, update_time, suit_department, operator_id, operator_name
welcome_id
, wx_enterprise_id, title, welcome_content,welcome_img,open_flag, status_flag,
create_time, update_time, suit_department, suit_staff, operator_id, operator_name
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
......@@ -37,7 +39,7 @@
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title,
welcome_content, welcome_img, open_flag, status_flag, create_time,
update_time, suit_department, operator_id, operator_name)
update_time, suit_department, suit_staff, operator_id, operator_name)
values (#{welcomeId,jdbcType=VARCHAR},
#{wxEnterpriseId,jdbcType=VARCHAR},
#{title,jdbcType=VARCHAR},
......@@ -48,9 +50,9 @@
#{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP},
#{suitDepartment,jdbcType=VARCHAR},
#{suitStaff,jdbcType=VARCHAR},
#{operatorId,jdbcType=VARCHAR},
#{operatorName,jdbcType=VARCHAR}
)
#{operatorName,jdbcType=VARCHAR})
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
......@@ -83,6 +85,9 @@
<if test="suitDepartment != null">
suit_department = #{suitDepartment,jdbcType=TIMESTAMP},
</if>
<if test="suitStaff != null">
suit_staff = #{suitStaff,jdbcType=TIMESTAMP},
</if>
<if test="operatorId != null">
operator_id = #{operatorId,jdbcType=TIMESTAMP},
</if>
......@@ -109,4 +114,11 @@
and status_flag=1
</select>
<select id="countByWxEnterpriseId" resultType="java.lang.Long">
select count(*)
from tab_haoban_welcome
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
</mapper>
\ No newline at end of file
......@@ -6,6 +6,7 @@
<result property="welcomeMediaId" column="welcome_media_id" jdbcType="INTEGER"/>
<result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
<result property="welcomeId" column="welcome_id" jdbcType="VARCHAR"/>
<result property="mediaTitle" column="media_title" jdbcType="VARCHAR"/>
<result property="mediaType" column="media_type" jdbcType="INTEGER"/>
<result property="mediaUrl" column="media_url" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
......@@ -16,7 +17,7 @@
<!--查询单个-->
<select id="queryById" resultMap="TabHaobanWelcomeMediaMap">
select
welcome_media_id, wx_enterprise_id, welcome_id, media_type, media_url, create_time, update_time, delete_flag
welcome_media_id, wx_enterprise_id, welcome_id, media_title, media_type, media_url, create_time, update_time, delete_flag
from haoban3.tab_haoban_welcome_media
where welcome_media_id = #{welcomeMediaId}
</select>
......@@ -24,7 +25,7 @@
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="TabHaobanWelcomeMediaMap">
select
welcome_media_id, wx_enterprise_id, welcome_id, media_type, media_url, create_time, update_time, delete_flag
welcome_media_id, wx_enterprise_id, welcome_id, media_title, media_type, media_url, create_time, update_time, delete_flag
from haoban3.tab_haoban_welcome_media
limit #{offset}, #{limit}
</select>
......@@ -32,7 +33,7 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultMap="TabHaobanWelcomeMediaMap">
select
welcome_media_id, wx_enterprise_id, welcome_id, media_type, media_url, create_time, update_time, delete_flag
welcome_media_id, wx_enterprise_id, welcome_id, media_title, media_type, media_url, create_time, update_time, delete_flag
from haoban3.tab_haoban_welcome_media
<where>
<if test="welcomeMediaId != null">
......@@ -44,6 +45,9 @@
<if test="welcomeId != null and welcomeId != ''">
and welcome_id = #{welcomeId}
</if>
<if test="mediaTitle != null">
and media_title = #{mediaTitle}
</if>
<if test="mediaType != null">
and media_type = #{mediaType}
</if>
......@@ -64,8 +68,8 @@
<!--新增所有列-->
<insert id="insert" keyProperty="welcomeMediaId" useGeneratedKeys="true">
insert into haoban3.tab_haoban_welcome_media(wx_enterprise_id, welcome_id, media_type, media_url, create_time, update_time, delete_flag)
values (#{wxEnterpriseId}, #{welcomeId}, #{mediaType}, #{mediaUrl}, #{createTime}, #{updateTime}, #{deleteFlag})
insert into haoban3.tab_haoban_welcome_media(wx_enterprise_id, welcome_id, media_title, media_type, media_url, create_time, update_time, delete_flag)
values (#{wxEnterpriseId}, #{welcomeId}, #{mediaTitle}, #{mediaType}, #{mediaUrl}, #{createTime}, #{updateTime}, #{deleteFlag})
</insert>
<!--通过主键修改数据-->
......@@ -78,6 +82,9 @@
<if test="welcomeId != null and welcomeId != ''">
welcome_id = #{welcomeId},
</if>
<if test="mediaTitle != null">
media_title = #{mediaTitle},
</if>
<if test="mediaType != null">
media_type = #{mediaType},
</if>
......
package com.gic.haoban.manage.web.controller;
import com.gic.commons.webapi.reponse.RestResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.gic.haoban.manage.api.dto.welcome.FriendSettingDTO;
import com.gic.haoban.manage.api.dto.welcome.WelcomeDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.WelcomeListDTO;
import com.gic.haoban.manage.web.qo.welcome.ListWelcomeQO;
import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* desc:欢迎语controller
......@@ -16,32 +22,37 @@ import org.springframework.web.bind.annotation.RestController;
public class WelcomeController extends WebBaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
public RestResponse<Boolean> saveWelcome() {
public RestResponse<Boolean> saveWelcome(@RequestBody SaveWelcomeQO qo) {
// 保存欢迎语
return null;
}
public RestResponse removeWelcome() {
@RequestMapping(value = "/remove", method = RequestMethod.GET)
public RestResponse<Boolean> removeWelcome(@RequestParam("welcomeId") Long welcomeId) {
// 删除欢迎语
return null;
}
public RestResponse listWelcome() {
@RequestMapping(value = "/list", method = RequestMethod.POST)
public RestResponse<List<WelcomeListDTO>> listWelcome(@RequestBody ListWelcomeQO qo) {
// 查询欢迎语列表
return null;
}
public RestResponse getWelcome() {
@RequestMapping(value = "/get", method = RequestMethod.GET)
public RestResponse<WelcomeDetailDTO> getWelcome(@RequestParam("welcomeId") Long welcomeId) {
// 获取欢迎语
return null;
}
public RestResponse saveFriendSetting() {
@RequestMapping(value = "/save/friend-setting", method = RequestMethod.POST)
public RestResponse<Boolean> saveFriendSetting(@RequestBody SaveFriendSettingQO qo) {
// 保存加好友配置
return null;
}
public RestResponse getFriendSetting() {
@RequestMapping(value = "/get/friend-setting", method = RequestMethod.GET)
public RestResponse<FriendSettingDTO> getFriendSetting(@RequestParam("wxEnterpriseId") String wxEnterpriseId) {
// 获取加好友配置
return null;
}
......
package com.gic.haoban.manage.web.qo.welcome;
import java.io.Serializable;
/**
* desc:列表查询欢迎语qo
*
* @author: YongEn
* @date: 2022/2/9
**/
public class ListWelcomeQO implements Serializable {
private static final long serialVersionUID = 5543264430718991071L;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 标题
*/
private String title;
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
@Override
public String toString() {
return "ListWelcomeQO{" +
"wxEnterpriseId='" + wxEnterpriseId + '\'' +
", title='" + title + '\'' +
'}';
}
}
package com.gic.haoban.manage.web.qo.welcome;
import java.io.Serializable;
/**
* desc:保存加好友配置qo
*
* @author: YongEn
* @date: 2022/2/9
**/
public class SaveFriendSettingQO implements Serializable {
private static final long serialVersionUID = 6560502831024559400L;
/**
* 加好友配置id
*/
private Long friendSettingId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 欢迎语配置类型 :
* 1 发送好办欢迎语文案+小程序卡片(附带导购参数)
* 2 发送好办欢迎语文案+公众号二维码(附带导购参数)
* 3 发送好办欢迎语文案
* 4 不发送好办欢迎语,用企微欢迎语
*/
private Integer friendSettingType;
public Long getFriendSettingId() {
return friendSettingId;
}
public void setFriendSettingId(Long friendSettingId) {
this.friendSettingId = friendSettingId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getFriendSettingType() {
return friendSettingType;
}
public void setFriendSettingType(Integer friendSettingType) {
this.friendSettingType = friendSettingType;
}
@Override
public String toString() {
return "SaveFriendSettingQO{" +
"friendSettingId=" + friendSettingId +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", friendSettingType=" + friendSettingType +
'}';
}
}
package com.gic.haoban.manage.web.qo.welcome;
import java.io.Serializable;
/**
* desc:保存欢迎语媒体qo
*
* @author: YongEn
* @date: 2022/2/10
**/
public class SaveWelcomeMediaQO implements Serializable {
private static final long serialVersionUID = -1182086560980625256L;
/**
* 媒体标题
*/
private String mediaTitle;
/**
* 媒体路径
*/
private String mediaUrl;
/**
* 媒体类型
* @see com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum
*/
private Integer mediaType;
public String getMediaTitle() {
return mediaTitle;
}
public void setMediaTitle(String mediaTitle) {
this.mediaTitle = mediaTitle;
}
public String getMediaUrl() {
return mediaUrl;
}
public void setMediaUrl(String mediaUrl) {
this.mediaUrl = mediaUrl;
}
public Integer getMediaType() {
return mediaType;
}
public void setMediaType(Integer mediaType) {
this.mediaType = mediaType;
}
@Override
public String toString() {
return "SaveWelcomeMediaQO{" +
"mediaTitle='" + mediaTitle + '\'' +
", mediaUrl='" + mediaUrl + '\'' +
", mediaType=" + mediaType +
'}';
}
}
package com.gic.haoban.manage.web.qo.welcome;
import java.io.Serializable;
import java.util.List;
/**
* desc:保存欢迎语qo
*
* @author: YongEn
* @date: 2022/2/9
**/
public class SaveWelcomeQO implements Serializable {
private static final long serialVersionUID = -595985005842610284L;
/**
* 欢迎语id
*/
private String welcomeId;
/**
* 微信企业id
*/
private String wxEnterpriseId;
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String welcomeContent;
/**
* 适用部门, 以逗号分割
*/
private String suitDepartment;
/**
* 适用员工, 以逗号分割
*/
private String suitStaff;
/**
* 媒体列表
*/
private List<SaveWelcomeMediaQO> mediaList;
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getWelcomeContent() {
return welcomeContent;
}
public void setWelcomeContent(String welcomeContent) {
this.welcomeContent = welcomeContent;
}
public String getSuitDepartment() {
return suitDepartment;
}
public void setSuitDepartment(String suitDepartment) {
this.suitDepartment = suitDepartment;
}
public String getSuitStaff() {
return suitStaff;
}
public void setSuitStaff(String suitStaff) {
this.suitStaff = suitStaff;
}
public List<SaveWelcomeMediaQO> getMediaList() {
return mediaList;
}
public void setMediaList(List<SaveWelcomeMediaQO> mediaList) {
this.mediaList = mediaList;
}
@Override
public String toString() {
return "SaveWelcomeQO{" +
"welcomeId='" + welcomeId + '\'' +
", wxEnterpriseId='" + wxEnterpriseId + '\'' +
", title='" + title + '\'' +
", welcomeContent='" + welcomeContent + '\'' +
", suitDepartment='" + suitDepartment + '\'' +
", mediaList=" + mediaList +
'}';
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment