Commit 1281e78a by jinxin

Merge remote-tracking branch 'origin/master' into feature/无效接口删除

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxErrorLogApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/QywxErrorLogService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TabQywxErrorLogServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxErrorLogApiServiceImpl.java
#	haoban-manage3-service/src/main/resources/mapper/TabQywxErrorLogMapper.xml
parents d88c24f5 6886e2ee
...@@ -18,6 +18,9 @@ public class Manage3Constants { ...@@ -18,6 +18,9 @@ public class Manage3Constants {
* 链接前缀 * 链接前缀
*/ */
public static final String DT = "DT"; public static final String DT = "DT";
// 群活码
public static final String QHM = "QHM";
/** /**
* 企微最大分页 * 企微最大分页
*/ */
......
...@@ -14,45 +14,44 @@ public class QywxErrorLogDTO implements Serializable { ...@@ -14,45 +14,44 @@ public class QywxErrorLogDTO implements Serializable {
private Long id; private Long id;
private String wxEnterpriseId; private String wxEnterpriseId;
private String corpid;
private String qywxInterface;
private String scenario; private String scenario;
private String errorContent; private String errorContent;
private String weworkErrorUrl;
private String traceId; private String traceId;
private Integer qywxErrorType; private Integer qywxErrorType;
private Date createTime; private Date createTime;
private String memberId ;
private String externalUserId ;
public Long getId() { public String getMemberId() {
return id; return memberId;
} }
public void setId(Long id) { public String getExternalUserId() {
this.id = id; return externalUserId;
} }
public String getWxEnterpriseId() { public void setMemberId(String memberId) {
return wxEnterpriseId; this.memberId = memberId;
} }
public void setWxEnterpriseId(String wxEnterpriseId) { public void setExternalUserId(String externalUserId) {
this.wxEnterpriseId = wxEnterpriseId; this.externalUserId = externalUserId;
} }
public String getCorpid() { public Long getId() {
return corpid; return id;
} }
public void setCorpid(String corpid) { public void setId(Long id) {
this.corpid = corpid; this.id = id;
} }
public String getQywxInterface() { public String getWxEnterpriseId() {
return qywxInterface; return wxEnterpriseId;
} }
public void setQywxInterface(String qywxInterface) { public void setWxEnterpriseId(String wxEnterpriseId) {
this.qywxInterface = qywxInterface; this.wxEnterpriseId = wxEnterpriseId;
} }
public String getScenario() { public String getScenario() {
...@@ -71,14 +70,6 @@ public class QywxErrorLogDTO implements Serializable { ...@@ -71,14 +70,6 @@ public class QywxErrorLogDTO implements Serializable {
this.errorContent = errorContent; this.errorContent = errorContent;
} }
public String getWeworkErrorUrl() {
return weworkErrorUrl;
}
public void setWeworkErrorUrl(String weworkErrorUrl) {
this.weworkErrorUrl = weworkErrorUrl;
}
public String getTraceId() { public String getTraceId() {
return traceId; return traceId;
} }
......
...@@ -102,6 +102,25 @@ public class StaffDTO implements Serializable { ...@@ -102,6 +102,25 @@ public class StaffDTO implements Serializable {
private Integer activeStatus; private Integer activeStatus;
private String enterpriseId; private String enterpriseId;
private String storeId; private String storeId;
private int openConcatFlag = 0 ;
private String ownerRemark ;
public String getOwnerRemark() {
return ownerRemark;
}
public void setOwnerRemark(String ownerRemark) {
this.ownerRemark = ownerRemark;
}
public int getOpenConcatFlag() {
return openConcatFlag;
}
public void setOpenConcatFlag(int openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
public String getDefaultGicEid() { public String getDefaultGicEid() {
return defaultGicEid; return defaultGicEid;
......
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
public class ChatEventDTO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -155687993581919178L;
private String changeType;
private String chatId;
private String updateDetail;
private Integer joinScene;
private Integer quitScene;
private Integer memChangeCnt;
private String corpid;
public String getChangeType() {
return changeType;
}
public void setChangeType(String changeType) {
this.changeType = changeType;
}
public String getChatId() {
return chatId;
}
public String getUpdateDetail() {
return updateDetail;
}
public Integer getJoinScene() {
return joinScene;
}
public Integer getQuitScene() {
return quitScene;
}
public Integer getMemChangeCnt() {
return memChangeCnt;
}
public String getCorpid() {
return corpid;
}
public void setChatId(String chatId) {
this.chatId = chatId;
}
public void setUpdateDetail(String updateDetail) {
this.updateDetail = updateDetail;
}
public void setJoinScene(Integer joinScene) {
this.joinScene = joinScene;
}
public void setQuitScene(Integer quitScene) {
this.quitScene = quitScene;
}
public void setMemChangeCnt(Integer memChangeCnt) {
this.memChangeCnt = memChangeCnt;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
}
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
/**
*
* @ClassName: TabHaobanGroupChatPlanOwnerLog
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:29:51
* @Modify
* @CopyRight
*/
public class ChatOwnerTotalDTO implements Serializable {
private static final long serialVersionUID = 21697825515700L;
private Long planId;
private String planName;
private java.util.Date startTime;
private java.util.Date endTime;
private int sendCount;
private int notSendCount;
// 计划状态 1进行中 2已结束
private int planStatus;
public int getPlanStatus() {
return planStatus;
}
public void setPlanStatus(int planStatus) {
this.planStatus = planStatus;
}
public Long getPlanId() {
return planId;
}
public String getPlanName() {
return planName;
}
public java.util.Date getStartTime() {
return startTime;
}
public java.util.Date getEndTime() {
return endTime;
}
public int getSendCount() {
return sendCount;
}
public int getNotSendCount() {
return notSendCount;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public void setPlanName(String planName) {
this.planName = planName;
}
public void setStartTime(java.util.Date startTime) {
this.startTime = startTime;
}
public void setEndTime(java.util.Date endTime) {
this.endTime = endTime;
}
public void setSendCount(int sendCount) {
this.sendCount = sendCount;
}
public void setNotSendCount(int notSendCount) {
this.notSendCount = notSendCount;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
import java.util.Date;
/**
*
* @ClassName: TabHaobanGroupChat
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 13:35:28
* @Modify
* @CopyRight
*/
public class GroupChatDTO implements Serializable {
private static final long serialVersionUID = 13124020287100L;
/**主键*/
private Long groupChatId;
private String wxEnterpriseId;
/**群名称*/
private String name;
/**群主*/
private String staffId;
/**群id(企微)*/
private String wxChatId;
/**群创建时间*/
private java.util.Date chatAddTime;
/**群解散时间*/
private java.util.Date chatDissolveTime;
/**群公告*/
private String chatNotice;
/**群状态*/
private Integer chatStatus;
private java.util.Date createTime;
private java.util.Date updateTime;
/**是否删除1是0否*/
private Integer deleteFlag;
/**群成员数*/
private Integer totalCount;
/**群客户数*/
private Integer totalMemberCount;
/**新增总客户数*/
private Integer addMemberCount;
/**新增总成员数*/
private Integer addCount;
/**流失总成员数*/
private Integer quitCount;
/**流失总客户数*/
private Integer quitMemberCount;
/**gic企业ID*/
private String enterpriseId;
/**gic侧状态1可用,2不可用*/
private Integer gicFlag;
private String staffName;
private String staffImage;
private String originalStaffId;
private String originalStaffName;
private Date offTime;
// 1已关联导购 0未关联导购
private int clerkRelationFlag = 0;
private int openConcatFlag = 0;
// 群主未激活、开通联系我说明
private String ownerRemark;
// 群主所有群能加到活码标识1可以0不可以
private int ownerAddFlag = 1;
// 活码加人状态1正常 2已满不可以加人>200
private int hmAddStatus = 1 ;
private String chatRemark ;
private int initFlag ;
public int getInitFlag() {
return initFlag;
}
public void setInitFlag(int initFlag) {
this.initFlag = initFlag;
}
public String getChatRemark() {
return chatRemark;
}
public void setChatRemark(String chatRemark) {
this.chatRemark = chatRemark;
}
public int getHmAddStatus() {
return hmAddStatus;
}
public void setHmAddStatus(int hmAddStatus) {
this.hmAddStatus = hmAddStatus;
}
public String getOwnerRemark() {
return ownerRemark;
}
public String getOriginalStaffName() {
return originalStaffName;
}
public int getOwnerAddFlag() {
return ownerAddFlag;
}
public void setOwnerRemark(String ownerRemark) {
this.ownerRemark = ownerRemark;
}
public void setOwnerAddFlag(int ownerAddFlag) {
this.ownerAddFlag = ownerAddFlag;
}
public void setOriginalStaffName(String originalStaffName) {
this.originalStaffName = originalStaffName;
}
public int getOpenConcatFlag() {
return openConcatFlag;
}
public void setOpenConcatFlag(int openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
public int getClerkRelationFlag() {
return clerkRelationFlag;
}
public void setClerkRelationFlag(int clerkRelationFlag) {
this.clerkRelationFlag = clerkRelationFlag;
}
public String getStaffImage() {
return staffImage;
}
public void setStaffImage(String staffImage) {
this.staffImage = staffImage;
}
public Date getOffTime() {
return offTime;
}
public void setOffTime(Date offTime) {
this.offTime = offTime;
}
public String getOriginalStaffId() {
return originalStaffId;
}
public void setOriginalStaffId(String originalStaffId) {
this.originalStaffId = originalStaffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setGroupChatId(Long groupChatId) {
this.groupChatId = groupChatId;
}
public Long getGroupChatId() {
return groupChatId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffId() {
return staffId;
}
public void setWxChatId(String wxChatId) {
this.wxChatId = wxChatId;
}
public String getWxChatId() {
return wxChatId;
}
public void setChatAddTime(java.util.Date chatAddTime) {
this.chatAddTime = chatAddTime;
}
public java.util.Date getChatAddTime() {
return chatAddTime;
}
public void setChatDissolveTime(java.util.Date chatDissolveTime) {
this.chatDissolveTime = chatDissolveTime;
}
public java.util.Date getChatDissolveTime() {
return chatDissolveTime;
}
public void setChatNotice(String chatNotice) {
this.chatNotice = chatNotice;
}
public String getChatNotice() {
return chatNotice;
}
public void setChatStatus(Integer chatStatus) {
this.chatStatus = chatStatus;
}
public Integer getChatStatus() {
return chatStatus;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setTotalCount(Integer totalCount) {
this.totalCount = totalCount;
}
public Integer getTotalCount() {
return totalCount;
}
public void setTotalMemberCount(Integer totalMemberCount) {
this.totalMemberCount = totalMemberCount;
}
public Integer getTotalMemberCount() {
return totalMemberCount;
}
public void setAddMemberCount(Integer addMemberCount) {
this.addMemberCount = addMemberCount;
}
public Integer getAddMemberCount() {
return addMemberCount;
}
public void setAddCount(Integer addCount) {
this.addCount = addCount;
}
public Integer getAddCount() {
return addCount;
}
public void setQuitCount(Integer quitCount) {
this.quitCount = quitCount;
}
public Integer getQuitCount() {
return quitCount;
}
public void setQuitMemberCount(Integer quitMemberCount) {
this.quitMemberCount = quitMemberCount;
}
public Integer getQuitMemberCount() {
return quitMemberCount;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public Integer getGicFlag() {
return gicFlag;
}
public void setGicFlag(Integer gicFlag) {
this.gicFlag = gicFlag;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable ;
/**
*
* @ClassName: TabHaobanGroupChatData
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:48:46
* @Modify
* @CopyRight
*/
public class GroupChatDataDTO implements Serializable{
private static final long serialVersionUID = 21417308241400L;
private Long dataId;
private String wxEnterpriseId;
private String staffId;
private String staffName ;
/**统计日期*/
private java.util.Date date;
/**新增客户群数量*/
private Integer newChatCnt;
/**截至当天客户群总数量*/
private Integer chatTotal;
/**截至当天有发过消息的客户群数量*/
private Integer chatHasMsg;
/**客户群新增群人数*/
private Integer newMemberCnt;
/**截至当天客户群总人数*/
private Integer memberTotal;
/**截至当天有发过消息的群成员数*/
private Integer memberHasMsg;
/**截至当天客户群消息总数*/
private Integer msgTotal;
/**截至当天新增迁移群数(仅教培行业返回)*/
private Integer migrateTraineeChatCnt;
private java.util.Date createTime;
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setDataId(Long dataId){
this.dataId = dataId;
}
public Long getDataId(){
return dataId;
}
public void setWxEnterpriseId(String wxEnterpriseId){
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId(){
return wxEnterpriseId;
}
public void setStaffId(String staffId){
this.staffId = staffId;
}
public String getStaffId(){
return staffId;
}
public void setDate(java.util.Date date){
this.date = date;
}
public java.util.Date getDate(){
return date;
}
public void setNewChatCnt(Integer newChatCnt){
this.newChatCnt = newChatCnt;
}
public Integer getNewChatCnt(){
return newChatCnt;
}
public void setChatTotal(Integer chatTotal){
this.chatTotal = chatTotal;
}
public Integer getChatTotal(){
return chatTotal;
}
public void setChatHasMsg(Integer chatHasMsg){
this.chatHasMsg = chatHasMsg;
}
public Integer getChatHasMsg(){
return chatHasMsg;
}
public void setNewMemberCnt(Integer newMemberCnt){
this.newMemberCnt = newMemberCnt;
}
public Integer getNewMemberCnt(){
return newMemberCnt;
}
public void setMemberTotal(Integer memberTotal){
this.memberTotal = memberTotal;
}
public Integer getMemberTotal(){
return memberTotal;
}
public void setMemberHasMsg(Integer memberHasMsg){
this.memberHasMsg = memberHasMsg;
}
public Integer getMemberHasMsg(){
return memberHasMsg;
}
public void setMsgTotal(Integer msgTotal){
this.msgTotal = msgTotal;
}
public Integer getMsgTotal(){
return msgTotal;
}
public void setMigrateTraineeChatCnt(Integer migrateTraineeChatCnt){
this.migrateTraineeChatCnt = migrateTraineeChatCnt;
}
public Integer getMigrateTraineeChatCnt(){
return migrateTraineeChatCnt;
}
public void setCreateTime(java.util.Date createTime){
this.createTime = createTime;
}
public java.util.Date getCreateTime(){
return createTime;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
import java.util.List;
/**
*
* @ClassName: TabHaobanGroupChatHm
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:30:48
* @Modify
* @CopyRight
*/
public class GroupChatHmDTO implements Serializable {
private static final long serialVersionUID = 21518878229500L;
private Long chatHmId;
private String chatHmCode;
private String wxEnterpriseId;
private String enterpriseId;
private String name;
private String remark;
/**0-否;1-是*/
private Integer autoCreateRoom;
/**自动建群的群起始序号*/
private Integer roomBaseId;
/**自动建群的群名前缀*/
private String roomBaseName;
private String wxConfigId;
private String wxQrCode;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private Integer deleteFlag;
private java.util.Date createTime;
private java.util.Date updateTime;
/**关联群数量*/
private Integer chatCount;
/**关联群id列表*/
private List<Long> chatIdList;
/**已关联链接数*/
private Integer linkCount;
// 1有效 2作废
private Integer statusFlag ;
// 可以群数
private Integer usableChatCount;
public Integer getUsableChatCount() {
return usableChatCount;
}
public void setUsableChatCount(Integer usableChatCount) {
this.usableChatCount = usableChatCount;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public void setChatHmId(Long chatHmId) {
this.chatHmId = chatHmId;
}
public Long getChatHmId() {
return chatHmId;
}
public void setChatHmCode(String chatHmCode) {
this.chatHmCode = chatHmCode;
}
public String getChatHmCode() {
return chatHmCode;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemark() {
return remark;
}
public void setAutoCreateRoom(Integer autoCreateRoom) {
this.autoCreateRoom = autoCreateRoom;
}
public Integer getAutoCreateRoom() {
return autoCreateRoom;
}
public void setRoomBaseId(Integer roomBaseId) {
this.roomBaseId = roomBaseId;
}
public Integer getRoomBaseId() {
return roomBaseId;
}
public void setRoomBaseName(String roomBaseName) {
this.roomBaseName = roomBaseName;
}
public String getRoomBaseName() {
return roomBaseName;
}
public void setWxConfigId(String wxConfigId) {
this.wxConfigId = wxConfigId;
}
public String getWxConfigId() {
return wxConfigId;
}
public void setWxQrCode(String wxQrCode) {
this.wxQrCode = wxQrCode;
}
public String getWxQrCode() {
return wxQrCode;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getCreatorName() {
return creatorName;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public String getModifierId() {
return modifierId;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public String getModifierName() {
return modifierName;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
public void setChatCount(Integer chatCount) {
this.chatCount = chatCount;
}
public Integer getChatCount() {
return chatCount;
}
public List<Long> getChatIdList() {
return chatIdList;
}
public void setChatIdList(List<Long> chatIdList) {
this.chatIdList = chatIdList;
}
public void setLinkCount(Integer linkCount) {
this.linkCount = linkCount;
}
public Integer getLinkCount() {
return linkCount;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
/**
*
* @ClassName: TabHaobanGroupChatOwner
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月04日 10:08:25
* @Modify
* @CopyRight
*/
public class GroupChatOwnerDTO implements Serializable {
private static final long serialVersionUID = 237823065250200L;
/**成员ID*/
private String staffId;
private String staffName ;
private String wxEnterpriseId;
/**群数量*/
private Integer chatCount;
/**
* 微信用户id
*/
private String wxUserId;
private String wxOpenUserId;
private java.util.Date createTime;
private java.util.Date updateTime;
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getWxOpenUserId() {
return wxOpenUserId;
}
public void setWxOpenUserId(String wxOpenUserId) {
this.wxOpenUserId = wxOpenUserId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffId() {
return staffId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setChatCount(Integer chatCount) {
this.chatCount = chatCount;
}
public Integer getChatCount() {
return chatCount;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
/**
*
* @ClassName: TabHaobanGroupChatOwnerHistory
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月06日 13:19:52
* @Modify
* @CopyRight
*/
public class GroupChatOwnerHistoryDTO implements Serializable {
private static final long serialVersionUID = 62032705461900L;
private Long ownerHistoryId;
private String wxEnterpriseId;
private Long groupChatId;
private String staffId;
private String staffName;
private java.util.Date createTime;
private java.util.Date endTime;
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setOwnerHistoryId(Long ownerHistoryId) {
this.ownerHistoryId = ownerHistoryId;
}
public Long getOwnerHistoryId() {
return ownerHistoryId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setGroupChatId(Long groupChatId) {
this.groupChatId = groupChatId;
}
public Long getGroupChatId() {
return groupChatId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffId() {
return staffId;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setEndTime(java.util.Date endTime) {
this.endTime = endTime;
}
public java.util.Date getEndTime() {
return endTime;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
*
* @ClassName: TabHaobanGroupChatPlan
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:28:49
* @Modify
* @CopyRight
*/
public class GroupChatPlanDTO implements Serializable {
private static final long serialVersionUID = 21576537277600L;
private String wxEnterpriseId;
private String enterpriseId;
private Long planId;
private String name;
private String remark;
/**[{relation_id:素材id,content:回显示内容}]*/
private String chatContent;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private java.util.Date createTime;
private java.util.Date updateTime;
/**0已删除 1有效*/
private Integer statusFlag;
/**1立即发送 2定时发送*/
private Integer sendType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private java.util.Date sendTime;
private java.util.Date startTime;
private java.util.Date endTime;
/**几天后失效*/
private Integer expireDays;
private String staffIdList;
private String delStaffIdList;
/**群主数量*/
private Integer staffCount;
/**已完成任务的群主数量*/
private Integer sendCount;
/**已送达数的群数*/
private Integer successChatCount;
/**总群数*/
private Integer totalChatCount;
// 1代发送 2已发送
private Integer sendFlag;
public String getDelStaffIdList() {
return delStaffIdList;
}
public void setDelStaffIdList(String delStaffIdList) {
this.delStaffIdList = delStaffIdList;
}
public Integer getSendFlag() {
return sendFlag;
}
public void setSendFlag(Integer sendFlag) {
this.sendFlag = sendFlag;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public Long getPlanId() {
return planId;
}
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemark() {
return remark;
}
public void setChatContent(String chatContent) {
this.chatContent = chatContent;
}
public String getChatContent() {
return chatContent;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getCreatorName() {
return creatorName;
}
public String getModifierId() {
return modifierId;
}
public String getModifierName() {
return modifierName;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setSendType(Integer sendType) {
this.sendType = sendType;
}
public Integer getSendType() {
return sendType;
}
public void setSendTime(java.util.Date sendTime) {
this.sendTime = sendTime;
}
public java.util.Date getSendTime() {
return sendTime;
}
public void setStartTime(java.util.Date startTime) {
this.startTime = startTime;
}
public java.util.Date getStartTime() {
return startTime;
}
public void setEndTime(java.util.Date endTime) {
this.endTime = endTime;
}
public java.util.Date getEndTime() {
return endTime;
}
public void setExpireDays(Integer expireDays) {
this.expireDays = expireDays;
}
public Integer getExpireDays() {
return expireDays;
}
public void setStaffIdList(String staffIdList) {
this.staffIdList = staffIdList;
}
public String getStaffIdList() {
return staffIdList;
}
public void setStaffCount(Integer staffCount) {
this.staffCount = staffCount;
}
public Integer getStaffCount() {
return staffCount;
}
public void setSendCount(Integer sendCount) {
this.sendCount = sendCount;
}
public Integer getSendCount() {
return sendCount;
}
public void setSuccessChatCount(Integer successChatCount) {
this.successChatCount = successChatCount;
}
public Integer getSuccessChatCount() {
return successChatCount;
}
public void setTotalChatCount(Integer totalChatCount) {
this.totalChatCount = totalChatCount;
}
public Integer getTotalChatCount() {
return totalChatCount;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable;
/**
*
* @ClassName: TabHaobanGroupChatPlanLog
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:17:50
* @Modify
* @CopyRight
*/
public class GroupChatPlanLogDTO implements Serializable {
private static final long serialVersionUID = 21625366526300L;
private Long logId;
private Long planId;
private String staffId;
private String staffName;
private String clerkId;
private String clerkName;
private String clerkCode;
private String storeCode;
private String storeName;
private String storeId;
private String wxEnterpriseId;
/**群id*/
private Long groupChatId;
private String chatName;
private Integer chatTotalCount;
private Integer sendStatus;
/**群主记录id*/
private Long ownLogId;
private String remark;
private java.util.Date sendTime;
private java.util.Date createTime;
private java.util.Date updateTime;
private String wxChatId ;
public String getWxChatId() {
return wxChatId;
}
public void setWxChatId(String wxChatId) {
this.wxChatId = wxChatId;
}
public Integer getChatTotalCount() {
return chatTotalCount;
}
public void setChatTotalCount(Integer chatTotalCount) {
this.chatTotalCount = chatTotalCount;
}
public String getChatName() {
return chatName;
}
public void setChatName(String chatName) {
this.chatName = chatName;
}
public String getStaffId() {
return staffId;
}
public String getStaffName() {
return staffName;
}
public String getClerkId() {
return clerkId;
}
public String getClerkName() {
return clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public String getStoreCode() {
return storeCode;
}
public String getStoreName() {
return storeName;
}
public String getStoreId() {
return storeId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public void setLogId(Long logId) {
this.logId = logId;
}
public Long getLogId() {
return logId;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public Long getPlanId() {
return planId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setGroupChatId(Long groupChatId) {
this.groupChatId = groupChatId;
}
public Long getGroupChatId() {
return groupChatId;
}
public void setSendStatus(Integer sendStatus) {
this.sendStatus = sendStatus;
}
public Integer getSendStatus() {
return sendStatus;
}
public void setOwnLogId(Long ownLogId) {
this.ownLogId = ownLogId;
}
public Long getOwnLogId() {
return ownLogId;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemark() {
return remark;
}
public void setSendTime(java.util.Date sendTime) {
this.sendTime = sendTime;
}
public java.util.Date getSendTime() {
return sendTime;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable ;
import java.util.Date;
/**
*
* @ClassName: TabHaobanGroupChatPlanOwnerLog
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:29:51
* @Modify
* @CopyRight
*/
public class GroupChatPlanOwnerLogDTO implements Serializable{
private static final long serialVersionUID = 21697825515700L;
private Long ownerLogId;
private Long planId;
private String planName ;
private String wxEnterpriseId;
private String enterpriseId;
private String staffId;
private String staffName ;
private String clerkName ;
private String clerkCode ;
private String storeName ;
private String storeCode ;
private String storeId;
private String clerkId;
/**1已发送 0待发送*/
private Integer sendStatus;
private Integer sendCount;
private Integer failCount ;
private java.util.Date createTime;
private java.util.Date updateTime;
private String remark ;
private String msgid ;
private Date expireDate ;
private Date sendTime ;
public Date getStartTime() {
return startTime;
}
public Date getEndTime() {
return endTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
private Date startTime ;
private Date endTime ;
public Integer getFailCount() {
return failCount;
}
public void setFailCount(Integer failCount) {
this.failCount = failCount;
}
public String getPlanName() {
return planName;
}
public void setPlanName(String planName) {
this.planName = planName;
}
public Date getSendTime() {
return sendTime;
}
public void setSendTime(Date sendTime) {
this.sendTime = sendTime;
}
public String getStaffName() {
return staffName;
}
public String getClerkName() {
return clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public String getStoreName() {
return storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public Date getExpireDate() {
return expireDate;
}
public void setExpireDate(Date expireDate) {
this.expireDate = expireDate;
}
public String getRemark() {
return remark;
}
public String getMsgid() {
return msgid;
}
public void setRemark(String remark) {
this.remark = remark;
}
public void setMsgid(String msgid) {
this.msgid = msgid;
}
public void setOwnerLogId(Long ownerLogId){
this.ownerLogId = ownerLogId;
}
public Long getOwnerLogId(){
return ownerLogId;
}
public void setPlanId(Long planId){
this.planId = planId;
}
public Long getPlanId(){
return planId;
}
public void setWxEnterpriseId(String wxEnterpriseId){
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId(){
return wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId){
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId(){
return enterpriseId;
}
public void setStaffId(String staffId){
this.staffId = staffId;
}
public String getStaffId(){
return staffId;
}
public void setStoreId(String storeId){
this.storeId = storeId;
}
public String getStoreId(){
return storeId;
}
public void setClerkId(String clerkId){
this.clerkId = clerkId;
}
public String getClerkId(){
return clerkId;
}
public void setSendStatus(Integer sendStatus){
this.sendStatus = sendStatus;
}
public Integer getSendStatus(){
return sendStatus;
}
public void setSendCount(Integer sendCount){
this.sendCount = sendCount;
}
public Integer getSendCount(){
return sendCount;
}
public void setCreateTime(java.util.Date createTime){
this.createTime = createTime;
}
public java.util.Date getCreateTime(){
return createTime;
}
public void setUpdateTime(java.util.Date updateTime){
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime(){
return updateTime;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.chat;
import java.io.Serializable ;
/**
*
* @ClassName: TabHaobanGroupChatUser
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:42:52
* @Modify
* @CopyRight
*/
public class GroupChatUserDTO implements Serializable{
private static final long serialVersionUID = 21771431486600L;
private Long chatUserId;
/**微信企业id*/
private String wxEnterpriseId;
private String enterpriseId;
/**1企业成员2外部联系人3客户*/
private Integer userType;
/**入群时间*/
private java.util.Date joinTime;
/**姓名*/
private String userName;
/**昵称*/
private String nickName;
/**群成员id*/
private String userId;
/**unionid*/
private String unionid;
private String memberId;
/**邀请者*/
private String invitorUserId;
private String invitorUserName ;
private java.util.Date createTime;
private java.util.Date updateTime;
/**1是0否*/
private Integer deleteFlag;
/**群id*/
private Long groupChatId;
/**1有效 2已退群*/
private Integer statusFlag;
/**用户退群时间*/
private java.util.Date userQuitTime;
/**0自己退群 1 - 群主/群管理员移出*/
private Integer quitScene;
/**0 - 由成员邀请入群(包括直接邀请入群和通过邀请链接入群)3 - 通过扫描群二维码入群*/
private Integer joinScene;
/**入群说明*/
private String joinRemark;
private String joinState;
private Integer adminFlag ;
private String chatName ;
private String staffName ;
private String wxChatId ;
public String getWxChatId() {
return wxChatId;
}
public void setWxChatId(String wxChatId) {
this.wxChatId = wxChatId;
}
public String getChatName() {
return chatName;
}
public String getStaffName() {
return staffName;
}
public void setChatName(String chatName) {
this.chatName = chatName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getInvitorUserName() {
return invitorUserName;
}
public void setInvitorUserName(String invitorUserName) {
this.invitorUserName = invitorUserName;
}
public Integer getAdminFlag() {
return adminFlag;
}
public void setAdminFlag(Integer adminFlag) {
this.adminFlag = adminFlag;
}
public void setChatUserId(Long chatUserId){
this.chatUserId = chatUserId;
}
public Long getChatUserId(){
return chatUserId;
}
public void setWxEnterpriseId(String wxEnterpriseId){
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId(){
return wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId){
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId(){
return enterpriseId;
}
public void setUserType(Integer userType){
this.userType = userType;
}
public Integer getUserType(){
return userType;
}
public void setJoinTime(java.util.Date joinTime){
this.joinTime = joinTime;
}
public java.util.Date getJoinTime(){
return joinTime;
}
public void setUserName(String userName){
this.userName = userName;
}
public String getUserName(){
return userName;
}
public void setNickName(String nickName){
this.nickName = nickName;
}
public String getNickName(){
return nickName;
}
public void setUserId(String userId){
this.userId = userId;
}
public String getUserId(){
return userId;
}
public void setUnionid(String unionid){
this.unionid = unionid;
}
public String getUnionid(){
return unionid;
}
public void setMemberId(String memberId){
this.memberId = memberId;
}
public String getMemberId(){
return memberId;
}
public void setInvitorUserId(String invitorUserId){
this.invitorUserId = invitorUserId;
}
public String getInvitorUserId(){
return invitorUserId;
}
public void setCreateTime(java.util.Date createTime){
this.createTime = createTime;
}
public java.util.Date getCreateTime(){
return createTime;
}
public void setUpdateTime(java.util.Date updateTime){
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime(){
return updateTime;
}
public void setDeleteFlag(Integer deleteFlag){
this.deleteFlag = deleteFlag;
}
public Integer getDeleteFlag(){
return deleteFlag;
}
public void setGroupChatId(Long groupChatId){
this.groupChatId = groupChatId;
}
public Long getGroupChatId(){
return groupChatId;
}
public void setStatusFlag(Integer statusFlag){
this.statusFlag = statusFlag;
}
public Integer getStatusFlag(){
return statusFlag;
}
public void setUserQuitTime(java.util.Date userQuitTime){
this.userQuitTime = userQuitTime;
}
public java.util.Date getUserQuitTime(){
return userQuitTime;
}
public void setQuitScene(Integer quitScene){
this.quitScene = quitScene;
}
public Integer getQuitScene(){
return quitScene;
}
public void setJoinScene(Integer joinScene){
this.joinScene = joinScene;
}
public Integer getJoinScene(){
return joinScene;
}
public void setJoinRemark(String joinRemark){
this.joinRemark = joinRemark;
}
public String getJoinRemark(){
return joinRemark;
}
public void setJoinState(String joinState){
this.joinState = joinState;
}
public String getJoinState(){
return joinState;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
/**
*
* @ClassName: TabHaobanHmLinkChat
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 22:36:24
* @Modify
* @CopyRight
*/
public class HmLinkChatDTO implements Serializable {
private static final long serialVersionUID = 45285331843100L;
private Long linkChatId;
private String wxEnterpriseId;
/**人群*/
private String filterJson;
/**群活码ID*/
private Long chatHmId;
private String enterpriseId;
/**会员类型(0:会员筛选,1:会员分组)*/
private Integer memberType;
/**排序值*/
private Integer sortNum;
private java.util.Date createTime;
private java.util.Date updateTime;
private Integer deleteFlag;
private Long linkId;
private String linkCode;
private String shortCode;
private String name;
private Integer linkCount ;
private String esId ;
// 用于人群回显
private String searchJson;
public String getSearchJson() {
return searchJson;
}
public void setSearchJson(String searchJson) {
this.searchJson = searchJson;
}
public String getEsId() {
return esId;
}
public void setEsId(String esId) {
this.esId = esId;
}
public Integer getLinkCount() {
return linkCount;
}
public void setLinkCount(Integer linkCount) {
this.linkCount = linkCount;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getShortCode() {
return shortCode;
}
public void setShortCode(String shortCode) {
this.shortCode = shortCode;
}
public String getLinkCode() {
return linkCode;
}
public void setLinkCode(String linkCode) {
this.linkCode = linkCode;
}
public Long getLinkId() {
return linkId;
}
public void setLinkId(Long linkId) {
this.linkId = linkId;
}
public void setLinkChatId(Long linkChatId) {
this.linkChatId = linkChatId;
}
public Long getLinkChatId() {
return linkChatId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setFilterJson(String filterJson) {
this.filterJson = filterJson;
}
public String getFilterJson() {
return filterJson;
}
public void setChatHmId(Long chatHmId) {
this.chatHmId = chatHmId;
}
public Long getChatHmId() {
return chatHmId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setMemberType(Integer memberType) {
this.memberType = memberType;
}
public Integer getMemberType() {
return memberType;
}
public void setSortNum(Integer sortNum) {
this.sortNum = sortNum;
}
public Integer getSortNum() {
return sortNum;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
}
\ No newline at end of file
...@@ -41,7 +41,26 @@ public class HmLinkDTO implements Serializable { ...@@ -41,7 +41,26 @@ public class HmLinkDTO implements Serializable {
/**0删除 1正常*/ /**0删除 1正常*/
private Integer statusFlag; private Integer statusFlag;
private String shortCode ; private String shortCode ;
private Long otherChatHmId ;
private List<HmLinkStoreDTO> storeList; private List<HmLinkStoreDTO> storeList;
// 群活码配置
private List<HmLinkChatDTO> linkChatList ;
public List<HmLinkChatDTO> getLinkChatList() {
return linkChatList;
}
public void setLinkChatList(List<HmLinkChatDTO> linkChatList) {
this.linkChatList = linkChatList;
}
public Long getOtherChatHmId() {
return otherChatHmId;
}
public void setOtherChatHmId(Long otherChatHmId) {
this.otherChatHmId = otherChatHmId;
}
public String getShortCode() { public String getShortCode() {
return shortCode; return shortCode;
......
...@@ -87,7 +87,15 @@ public class HmPageDTO implements Serializable { ...@@ -87,7 +87,15 @@ public class HmPageDTO implements Serializable {
private Date createTime; private Date createTime;
private Date updateTime; private Date updateTime;
private int pageType ;
public int getPageType() {
return pageType;
}
public void setPageType(int pageType) {
this.pageType = pageType;
}
public Long getPageId() { public Long getPageId() {
return pageId; return pageId;
} }
......
...@@ -26,6 +26,25 @@ public class QywxErrorLogListQDTO extends BasePageInfo implements Serializable { ...@@ -26,6 +26,25 @@ public class QywxErrorLogListQDTO extends BasePageInfo implements Serializable {
private String startDate; private String startDate;
private String endDate; private String endDate;
private String memberId ;
private String externalUserId ;
public String getMemberId() {
return memberId;
}
public String getExternalUserId() {
return externalUserId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}
public String getScenario() { public String getScenario() {
return scenario; return scenario;
} }
......
package com.gic.haoban.manage.api.dto.qdto.chat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.gic.commons.web.qo.PageQo;
public class ChatDataSearchQDTO extends PageQo implements Serializable {
private static final long serialVersionUID = -2777117993521926985L;
private String wxEnterpriseId;
private Date startDate;
private Date endDate;
private List<String> staffIdList;
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public Date getStartDate() {
return startDate;
}
public Date getEndDate() {
return endDate;
}
public List<String> getStaffIdList() {
return staffIdList;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public void setStaffIdList(List<String> staffIdList) {
this.staffIdList = staffIdList;
}
}
package com.gic.haoban.manage.api.dto.qdto.chat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.gic.commons.web.qo.PageQo;
public class ChatHmSearchQDTO extends PageQo implements Serializable {
private static final long serialVersionUID = 5747628025933650750L;
private Date startDate;
private Date endDate;
private String wxEnterpriseId;
private String enterpriseId;
private String searchParams;
private String searchParamsCode;
// 1有效 2作废
private Integer status;
private Long linkId;
private List<Long> chatHmIdList;
private List<String> creatorIdList;
private Integer linkCount;
private int allFlag;
public String getSearchParamsCode() {
return searchParamsCode;
}
public void setSearchParamsCode(String searchParamsCode) {
this.searchParamsCode = searchParamsCode;
}
public int getAllFlag() {
return allFlag;
}
public void setAllFlag(int allFlag) {
this.allFlag = allFlag;
}
public Integer getLinkCount() {
return linkCount;
}
public void setLinkCount(Integer linkCount) {
this.linkCount = linkCount;
}
public List<String> getCreatorIdList() {
return creatorIdList;
}
public void setCreatorIdList(List<String> creatorIdList) {
this.creatorIdList = creatorIdList;
}
public List<Long> getChatHmIdList() {
return chatHmIdList;
}
public void setChatHmIdList(List<Long> chatHmIdList) {
this.chatHmIdList = chatHmIdList;
}
public Long getLinkId() {
return linkId;
}
public void setLinkId(Long linkId) {
this.linkId = linkId;
}
public Date getStartDate() {
return startDate;
}
public Date getEndDate() {
return endDate;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public String getSearchParams() {
return searchParams;
}
public Integer getStatus() {
return status;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setSearchParams(String searchParams) {
this.searchParams = searchParams;
}
public void setStatus(Integer status) {
this.status = status;
}
}
package com.gic.haoban.manage.api.dto.qdto.chat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
public class GroupChatPlanSearchQDTO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -4052311727115335624L;
private String wxEnterpriseId;
private String enterpriseId;
private String searchParams;
// 1进行中、2未开始、3已结束
private Integer status;
// 群主 0发送失败 1待发送 2已发送
private Integer sendStatus ;
// 群名称
private String chatName ;
private Long planId;
private Date startDate;
private Date endDate;
private String clerkId ;
private String storeId ;
private Long ownLogId ;
private List<String> creatorIdList ;
private String wxChatId;
private String searchClerkId ;
public String getSearchClerkId() {
return searchClerkId;
}
public void setSearchClerkId(String searchClerkId) {
this.searchClerkId = searchClerkId;
}
public String getWxChatId() {
return wxChatId;
}
public void setWxChatId(String wxChatId) {
this.wxChatId = wxChatId;
}
public List<String> getCreatorIdList() {
return creatorIdList;
}
public void setCreatorIdList(List<String> creatorIdList) {
this.creatorIdList = creatorIdList;
}
public Long getOwnLogId() {
return ownLogId;
}
public void setOwnLogId(Long ownLogId) {
this.ownLogId = ownLogId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getChatName() {
return chatName;
}
public void setChatName(String chatName) {
this.chatName = chatName;
}
public Integer getSendStatus() {
return sendStatus;
}
public void setSendStatus(Integer sendStatus) {
this.sendStatus = sendStatus;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public String getSearchParams() {
return searchParams;
}
public Integer getStatus() {
return status;
}
public Long getPlanId() {
return planId;
}
public Date getStartDate() {
return startDate;
}
public Date getEndDate() {
return endDate;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setSearchParams(String searchParams) {
this.searchParams = searchParams;
}
public void setStatus(Integer status) {
this.status = status;
}
public void setPlanId(Long planId) {
this.planId = planId;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
}
package com.gic.haoban.manage.api.dto.qdto.chat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.gic.commons.web.qo.PageQo;
public class GroupChatSearchQDTO extends PageQo implements Serializable {
private static final long serialVersionUID = 7983127960892502325L;
private Date startDate;
private Date endDate;
private String wxEnterpriseId;
private String enterpriseId;
private String searchParams;
// 群状态 0跟进人正常1跟进人离职2离职继承中 4已解散
private Integer status = 0;
private Date dismissStartDate;
private Date dismissEndDate;
// 群主列表
private List<String> staffIdList;
private String staffId ;
private int gicFlag = 1 ;
private Long chatHmId ;
// 查询活码关联是否包含下线的1是0否
private int includeOff ;
private List<Long> groupChatIdList ;
private String sortColumn ;
private String sortType = "desc" ;
// 0全部 1未满200 2已满200
private Integer hmAddStatus ;
private String departmentId ;
private List<String> departmentIdList ;
// 筛选激活或者开启联系我的群主
private Integer canUseFlag ;
private String wxChatId ;
private String searchPage ;
public String getSearchPage() {
return searchPage;
}
public void setSearchPage(String searchPage) {
this.searchPage = searchPage;
}
public String getWxChatId() {
return wxChatId;
}
public void setWxChatId(String wxChatId) {
this.wxChatId = wxChatId;
}
public int getIncludeOff() {
return includeOff;
}
public void setIncludeOff(int includeOff) {
this.includeOff = includeOff;
}
public String getDepartmentId() {
return departmentId;
}
public List<String> getDepartmentIdList() {
return departmentIdList;
}
public Integer getCanUseFlag() {
return canUseFlag;
}
public void setDepartmentId(String departmentId) {
this.departmentId = departmentId;
}
public void setDepartmentIdList(List<String> departmentIdList) {
this.departmentIdList = departmentIdList;
}
public void setCanUseFlag(Integer canUseFlag) {
this.canUseFlag = canUseFlag;
}
public Integer getHmAddStatus() {
return hmAddStatus;
}
public void setHmAddStatus(Integer hmAddStatus) {
this.hmAddStatus = hmAddStatus;
}
public List<Long> getGroupChatIdList() {
return groupChatIdList;
}
public void setGroupChatIdList(List<Long> groupChatIdList) {
this.groupChatIdList = groupChatIdList;
}
public Long getChatHmId() {
return chatHmId;
}
public void setChatHmId(Long chatHmId) {
this.chatHmId = chatHmId;
}
public String getSortColumn() {
return sortColumn;
}
public String getSortType() {
return sortType;
}
public void setSortColumn(String sortColumn) {
this.sortColumn = sortColumn;
}
public void setSortType(String sortType) {
this.sortType = sortType;
}
public int getGicFlag() {
return gicFlag;
}
public void setGicFlag(int gicFlag) {
this.gicFlag = gicFlag;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public Date getDismissStartDate() {
return dismissStartDate;
}
public Date getDismissEndDate() {
return dismissEndDate;
}
public List<String> getStaffIdList() {
return staffIdList;
}
public void setDismissStartDate(Date dismissStartDate) {
this.dismissStartDate = dismissStartDate;
}
public void setDismissEndDate(Date dismissEndDate) {
this.dismissEndDate = dismissEndDate;
}
public void setStaffIdList(List<String> staffIdList) {
this.staffIdList = staffIdList;
}
public Date getStartDate() {
return startDate;
}
public Date getEndDate() {
return endDate;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public String getSearchParams() {
return searchParams;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setSearchParams(String searchParams) {
this.searchParams = searchParams;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
package com.gic.haoban.manage.api.dto.qdto.chat;
import java.io.Serializable;
import java.util.Date;
public class GroupChatUserSearchQDTO implements Serializable {
private static final long serialVersionUID = 7983127960892502325L;
private Date startDate;
private Date endDate;
private String wxEnterpriseId;
private Long groupChatId ;
private Integer userType ;
private String enterpriseId;
private String searchParams;
// 群状态 1有效2已退群
private Integer status = 1;
private String wxChatId ;
public String getWxChatId() {
return wxChatId;
}
public void setWxChatId(String wxChatId) {
this.wxChatId = wxChatId;
}
public Date getStartDate() {
return startDate;
}
public Date getEndDate() {
return endDate;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public Long getGroupChatId() {
return groupChatId;
}
public Integer getUserType() {
return userType;
}
public String getEnterpriseId() {
return enterpriseId;
}
public String getSearchParams() {
return searchParams;
}
public Integer getStatus() {
return status;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public void setGroupChatId(Long groupChatId) {
this.groupChatId = groupChatId;
}
public void setUserType(Integer userType) {
this.userType = userType;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public void setSearchParams(String searchParams) {
this.searchParams = searchParams;
}
public void setStatus(Integer status) {
this.status = status;
}
}
package com.gic.haoban.manage.api.dto.qdto.chat;
import java.io.Serializable;
import java.util.List;
/**
*
* @ClassName: TabHaobanGroupChatOwner
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月04日 10:08:25
* @Modify
* @CopyRight
*/
public class OwnerSearchQDTO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = 5476735570005749927L;
private String wxEnterpriseId;
private String searchParams;
private String departmentId ;
private List<String> departmentIdList ;
// 1查询在职 2查离职
private int status = 1;
public List<String> getDepartmentIdList() {
return departmentIdList;
}
public void setDepartmentIdList(List<String> departmentIdList) {
this.departmentIdList = departmentIdList;
}
public String getDepartmentId() {
return departmentId;
}
public void setDepartmentId(String departmentId) {
this.departmentId = departmentId;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public String getSearchParams() {
return searchParams;
}
public void setSearchParams(String searchParams) {
this.searchParams = searchParams;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
}
\ No newline at end of file
package com.gic.haoban.manage.api.dto.qdto.hm;
import java.io.Serializable;
public class HmLinkChatQDTO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = 7581226892004325992L;
private String wxEnterpriseId;
private String enterpriseId;
private Long chatHmId;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Long getChatHmId() {
return chatHmId;
}
public void setChatHmId(Long chatHmId) {
this.chatHmId = chatHmId;
}
}
...@@ -35,6 +35,16 @@ public class HmPageQDTO extends BasePageInfo { ...@@ -35,6 +35,16 @@ public class HmPageQDTO extends BasePageInfo {
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
private int pageType ;
public int getPageType() {
return pageType;
}
public void setPageType(int pageType) {
this.pageType = pageType;
}
public String getPageSearchText() { public String getPageSearchText() {
return pageSearchText; return pageSearchText;
} }
......
...@@ -28,6 +28,7 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable { ...@@ -28,6 +28,7 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
private String enterpriseId; private String enterpriseId;
private String hmSelect; private String hmSelect;
private String hmSelectLike ;
private String storeSelect; private String storeSelect;
...@@ -52,6 +53,14 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable { ...@@ -52,6 +53,14 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
private List<String> storeId; private List<String> storeId;
public String getHmSelectLike() {
return hmSelectLike;
}
public void setHmSelectLike(String hmSelectLike) {
this.hmSelectLike = hmSelectLike;
}
public Long getHmId() { public Long getHmId() {
return hmId; return hmId;
} }
......
...@@ -8,8 +8,9 @@ public enum PendingTaskTypeEnum { ...@@ -8,8 +8,9 @@ public enum PendingTaskTypeEnum {
NORMAL(-1, "全部", "全部"), NORMAL(-1, "全部", "全部"),
PERFORMANCE(0, "月指标", "请完善{}月份指标"), PERFORMANCE(0, "月指标", "请完善{}月份指标"),
TEL_TASK(1, "话务任务", "您收到了新的话务任务【{}】,赶紧去执行吧~"), TEL_TASK(1, "话务任务", "您收到了新的话务任务【{}】,赶紧去执行吧~"),
GROUP_TASK(3, "群发任务", "您收到了新的企微群发任务【{}】,赶紧到企业微信-消息-群发助手中执行吧~"), GROUP_TASK(3, "客户群发", "您收到了新的企微群发任务【{}】,赶紧到企业微信-消息-群发助手中执行吧~"),
ACTIVITY(4, "活动", "您报名的{}活动已经开始啦,快去转发赚佣金吧~"), ACTIVITY(4, "活动", "您报名的{}活动已经开始啦,快去转发赚佣金吧~"),
GROUP_CHAT(5, "社群群发", "您收到了新的社群群发任务【{}】,赶紧到企业微信-消息-群发助手中执行吧~"),
; ;
private int type; private int type;
private String name; private String name;
......
package com.gic.haoban.manage.api.enums.chat;
public enum PlanSendStatusEnum {
FAIL(0, "失败"),
TO_BE_SEND(1, "待发送"),
SENDED(2, "禁用");
private int code;
private String name;
private PlanSendStatusEnum(int code, String name) {
this.code = code;
this.name = name;
}
public int getCode() {
return code;
}
public String getName() {
return name;
}
public void setCode(int code) {
this.code = code;
}
public void setName(String name) {
this.name = name;
}
}
package com.gic.haoban.manage.api.enums.hm;
public enum HmLinkTypeEnum {
HM_LINK_TYPE_1(1,"专用活码链接") ,
HM_LINK_TYPE_2(2,"通用活码链接") ,
CHAT_HM_LINK_TYPE(10,"群活码链接") ;
private HmLinkTypeEnum(int linkType, String name) {
this.linkType = linkType;
this.name = name;
}
private int linkType ;
private String name ;
public int getLinkType() {
return linkType;
}
public String getName() {
return name;
}
public void setLinkType(int linkType) {
this.linkType = linkType;
}
public void setName(String name) {
this.name = name;
}
}
...@@ -21,7 +21,7 @@ public interface HaobanTimerApiService { ...@@ -21,7 +21,7 @@ public interface HaobanTimerApiService {
* @return * @return
* @throws * @throws
*/ */
public ServiceResponse<Void> deleteTempWxHm(String params) ; public ServiceResponse<Void> deleteTempWxHm(String params);
/** /**
* *
...@@ -32,7 +32,7 @@ public interface HaobanTimerApiService { ...@@ -32,7 +32,7 @@ public interface HaobanTimerApiService {
* @return * @return
* @throws * @throws
*/ */
public ServiceResponse<Void> repairExternalUserId(String wxEnterpriseId) ; public ServiceResponse<Void> repairExternalUserId(String wxEnterpriseId);
/** /**
* *
...@@ -43,8 +43,61 @@ public interface HaobanTimerApiService { ...@@ -43,8 +43,61 @@ public interface HaobanTimerApiService {
* @return * @return
* @throws * @throws
*/ */
public ServiceResponse<Void> repairStaffDepart(String params) ; public ServiceResponse<Void> repairStaffDepart(String params);
/**
*
* @Title: handChatNotice
* @Description: 处理好办事件通知
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> handChatNotice(String params);
/**
*
* @Title: handHmChat
* @Description: 处理活码自动建群后踢群和加群
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> handleHmChatFull(String params);
/**
*
* @Title: handChatNotice
* @Description: 收到建群事件后,初始化群
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> initGroupChat(String params);
/**
*
* @Title: initHaobaonGroupChat
* @Description: 初始化所有好办企业的群
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> initHaobaonGroupChat(String params);
/**
*
* @Title: ownerDimission
* @Description: 群主离职(每日刷新)
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> ownerDimission(String params);
} }
...@@ -15,30 +15,11 @@ public interface QywxErrorLogApiService { ...@@ -15,30 +15,11 @@ public interface QywxErrorLogApiService {
/** /**
* 新增数据 * 新增数据
* "routerName": "addQywxErrorLogMq", * "routerName": "addQywxErrorLogMq",
* @param param 参数
* @return {@link QywxErrorLogDTO }
* @author mozhu
* @date 2022-04-18 17:02:40
*/ */
void insertQywxErrorLog(String param); void insertQywxErrorLog(String param);
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
//无效接口
// QywxErrorLogDTO queryById(Long id);
/** /**
* 查询分页列表 * 查询分页列表
*
* @param qywxErrorLogListQDTO qdto qywx错误日志列表
* @return {@link Page }<{@link QywxErrorLogDTO }>
* @author mozhu
* @date 2022-04-18 17:01:14
*/ */
Page<QywxErrorLogDTO> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO); Page<QywxErrorLogDTO> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO);
......
package com.gic.haoban.manage.api.service.chat;
import java.util.List;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.chat.ChatEventDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
public interface GroupChatApiService {
/**
*
* @Title: listPage
* @Description: 群列表
* @author xugh
* @param qdto
* @param basePageInfo
* @return
* @throws
*/
public ServiceResponse<Page<GroupChatDTO>> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo);
/**
*
* @Title: listUserPage
* @Description: 群成员列表查询
* @author xugh
* @param qdto
* @param basePageInfo
* @return
* @throws
*/
public ServiceResponse<Page<GroupChatUserDTO>> listUserPage(GroupChatUserSearchQDTO qdto,
BasePageInfo basePageInfo);
/**
*
* @Title: detail
* @Description: 群详情
* @author xugh
* @param wxEnterpriseId
* @param groupChatId
* @return
* @throws
*/
public ServiceResponse<GroupChatDTO> detail(String wxEnterpriseId, Long groupChatId);
/**
*
* @Title: refreshChatInfo
* @Description: 刷新群
* @author xugh
* @param groupChatId
* @return
* @throws
*/
public ServiceResponse<Void> refreshChatInfoFromMQ(String params);
/**
*
* @Title: refreshChatStatus
* @Description: 刷新群的状态
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> refreshChatStatusFromMQ(String params) ;
/**
*
* @Title: updateChatEnterpriseId
* @Description: 客户群认领,更新企业ID
* @author xugh
* @param wxEnterpriseId
* @param enterpriseId
* @param groupChatIdList
* @return
* @throws
*/
public ServiceResponse<Void> updateChatEnterpriseId(String wxEnterpriseId, String enterpriseId,
List<Long> groupChatIdList);
/**
*
* @Title: qwEventNotice
* @Description: 企微事件通知
* @author xugh
* @param dto
* @throws
*/
public ServiceResponse<Void> qwEventNotice(ChatEventDTO dto);
/**
*
* @Title: listOwnerPage
* @Description: 群主列表查询
* @author xugh
* @param qdto
* @param basePageInfo
* @return
* @throws
*/
public ServiceResponse<Page<GroupChatOwnerDTO>> listOwnerPage(OwnerSearchQDTO qdto, BasePageInfo basePageInfo);
/**
*
* @Title: listOwnerHistory
* @Description: 历史群主
* @author xugh
* @param groupChatId
* @param WxEnterpriseId
* @return
* @throws
*/
public ServiceResponse<List<GroupChatOwnerHistoryDTO>> listOwnerHistory(Long groupChatId, String WxEnterpriseId);
/**
*
* @Title: transfer
* @Description: 继承
* @author xugh
* @param wxEnterpriseId
* @param staffId
* @param groupChatIdList
* @return
* @throws
*/
public ServiceResponse<Void> transfer(String wxEnterpriseId, String staffId, List<Long> groupChatIdList);
/**
*
* @Title: getSetFlag
* @Description:
* @author xugh
* @param wxEnterpriseId
* @return
* @throws
*/
public ServiceResponse<Boolean> getSetGicFlag(String wxEnterpriseId);
/**
*
* @Title: listChatByIdList
* @Description: 通过id列表查询
* @author xugh
* @param wxEnterpriseId
* @param groupChatIdList
* @return
* @throws
*/
public ServiceResponse<List<GroupChatDTO>> listChatByIdList(String wxEnterpriseId, List<Long> groupChatIdList);
}
package com.gic.haoban.manage.api.service.chat;
import java.util.List;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.chat.GroupChatDataDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.ChatDataSearchQDTO;
public interface GroupChatDataApiService {
/**
*
* @Title: chatDataTimer
* @Description: 统计数据定时从企微拉取
* @author xugh
* @param params
* @throws
*/
public ServiceResponse<Void> chatDataTimer(String params);
/**
*
* @Title: listTotalData
* @Description: 总计
* @author xugh
* @param qdto
* @return
* @throws
*/
public ServiceResponse<GroupChatDataDTO> listTotalData(ChatDataSearchQDTO qdto);
/**
*
* @Title: listForChat
* @Description: 图表数据
* @author xugh
* @param qdto
* @return
* @throws
*/
public ServiceResponse<List<GroupChatDataDTO>> listForChat(ChatDataSearchQDTO qdto);
/**
*
* @Title: listStaffData
* @Description: 群主数据
* @author xugh
* @param qdto
* @param basePageInfo
* @return
* @throws
*/
public ServiceResponse<Page<GroupChatDataDTO>> listStaffData(ChatDataSearchQDTO qdto, BasePageInfo basePageInfo);
}
package com.gic.haoban.manage.api.service.chat;
import java.util.List;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
/**
*
* @ClassName: GroupChatHmApiService
* @Description: 群活码
* @author xugh
* @date 2022年12月1日 下午7:44:51
*
*/
public interface GroupChatHmApiService {
// 活码列表
public ServiceResponse<Page<GroupChatHmDTO>> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo);
// 活码详情
public ServiceResponse<GroupChatHmDTO> detail(Long chatHmId);
// 保存/更新
public ServiceResponse<GroupChatHmDTO> save(GroupChatHmDTO dto);
/**
*
* @Title: discard
* @Description: 废弃
* @author xugh
* @param chatHmId
* @param wxEnterpriseId
* @return
* @throws
*/
public ServiceResponse<Void> discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName);
/**
*
* @Title: listChatLink
* @Description: 查询活码关联的链接
* @author xugh
* @param wxEnterpriseId
* @param chatHmId
* @return
* @throws
*/
public ServiceResponse<Page<HmLinkChatDTO>> listPageChatLink(HmLinkChatQDTO qdto, BasePageInfo basePageInfo);
public ServiceResponse<List<Long>> listHmGroupChatId(String wxEnterpriseId, Long chatHmId) ;
}
package com.gic.haoban.manage.api.service.chat;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
/**
*
* @ClassName: GroupChatPlanApiService
* @Description: 群群发
* @author xugh
* @date 2022年12月1日 下午10:58:07
*
*/
public interface GroupChatPlanApiService {
// 群发列表
public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo);
// 群发详情
public ServiceResponse<GroupChatPlanDTO> detail(Long planId);
// 保存/更新
public ServiceResponse<GroupChatPlanDTO> save(GroupChatPlanDTO dto);
// 更新备注
public ServiceResponse<GroupChatPlanDTO> updateRemark(GroupChatPlanDTO dto);
public ServiceResponse<GroupChatPlanOwnerLogDTO> getOwnerInfo(Long planId ,String staffId , String clerkId , String wxEnterpriseId);
/**
*
* @Title: doPlanTimer
* @Description: 定时执行计划
* @author xugh
* @param params
* @return
* @throws
*/
public ServiceResponse<Void> doPlanTimer(String params);
public ServiceResponse<Void> doPlanSendInfoTimer(String params) ;
public ServiceResponse<Void> reflushSendInfo(Long ownerLogId) ;
public ServiceResponse<GroupChatPlanOwnerLogDTO> getOwnerSendInfo(Long ownerLogId) ;
public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
BasePageInfo basePageInfo);
public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPageForWxa(GroupChatPlanSearchQDTO qdto,
BasePageInfo basePageInfo);
public ServiceResponse<Page<ChatOwnerTotalDTO>> listOwnerLogPageForWxaTotal(GroupChatPlanSearchQDTO qdto,
BasePageInfo basePageInfo);
public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
BasePageInfo basePageInfo);
public ServiceResponse<Void> del(String clerkId, String clerkName, Long planId);
public ServiceResponse<Void> stop(String clerkId, String clerkName, Long planId);
}
...@@ -39,6 +39,9 @@ public interface HmLinkApiService { ...@@ -39,6 +39,9 @@ public interface HmLinkApiService {
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName, public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
Integer linkType); Integer linkType);
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
Integer linkType,List<String> creatorIdList);
//无效接口 //无效接口
// public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo); // public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
......
...@@ -168,6 +168,12 @@ ...@@ -168,6 +168,12 @@
<artifactId>gic-enterprise-operation-api</artifactId> <artifactId>gic-enterprise-operation-api</artifactId>
<version>${gic-enterprise-operation-api}</version> <version>${gic-enterprise-operation-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-thirdparty-sdk</artifactId>
<version>${gic-thirdparty-sdk}</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -6,6 +6,7 @@ import com.github.pagehelper.Page; ...@@ -6,6 +6,7 @@ import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Set;
public interface StaffMapper { public interface StaffMapper {
...@@ -137,13 +138,13 @@ public interface StaffMapper { ...@@ -137,13 +138,13 @@ public interface StaffMapper {
/** /**
* 绑定的员工列表(暂时取100条,后续和前端一起改为分页接口) * 绑定的员工列表(暂时取100条,后续和前端一起改为分页接口)
*
* @param storeIds 存储id
* @param wxEnterpriseId wx企业标识
* @return {@link List }<{@link StaffDTO }>
* @author mozhu
* @date 2022-10-21 00:26:47
*/ */
List<StaffDTO> listBindStoreIds(@Param("storeIds") List<String> storeIds, List<StaffDTO> listBindStoreIds(@Param("storeIds") List<String> storeIds,
@Param("wxEnterpriseId") String wxEnterpriseId); @Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaff> listAllByPage(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("startItem") int startItem , @Param("pageSize") int pageSize);
void updateOpenConcatFlag(@Param("wxUserIdList")List<String> wxUserIdList , @Param("mixFlag")int mixFlag);
} }
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper; package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
import com.github.pagehelper.Page;
public interface TabHaobanExternalClerkRelatedMapper { public interface TabHaobanExternalClerkRelatedMapper {
int insertSelective(TabHaobanExternalClerkRelated record); int insertSelective(TabHaobanExternalClerkRelated record);
...@@ -385,4 +386,10 @@ public interface TabHaobanExternalClerkRelatedMapper { ...@@ -385,4 +386,10 @@ public interface TabHaobanExternalClerkRelatedMapper {
int updateExternalStatus(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("externalUserid")String externalUserid, @Param("status")int status); int updateExternalStatus(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("externalUserid")String externalUserid, @Param("status")int status);
/**
* 通过第三方或者待开发查询是否好友
*/
TabHaobanExternalClerkRelated getMemberForExternalId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("externalUserId") String externalUserId);
} }
\ No newline at end of file
...@@ -17,47 +17,11 @@ public interface TabQywxErrorLogMapper { ...@@ -17,47 +17,11 @@ public interface TabQywxErrorLogMapper {
/** /**
* 新增数据 * 新增数据
*
* @param tabQywxErrorLog 选项卡qywx错误日志
* @return int
* @author mozhu
* @date 2022-04-18 16:18:25
*/ */
int insert(TabQywxErrorLog tabQywxErrorLog); int insert(TabQywxErrorLog tabQywxErrorLog);
/** /**
* 修改数据
*
* @param tabQywxErrorLog 选项卡qywx错误日志
* @return int
* @author mozhu
* @date 2022-04-18 16:18:28
*/
int update(TabQywxErrorLog tabQywxErrorLog);
/**
* 通过主键删除数据
*
* @param id 主键
* @return 影响行数
*/
int deleteById(Long id);
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
// TabQywxErrorLog queryById(Long id);
/**
* 分页列表 * 分页列表
*
* @param qywxErrorLogListQDTO qdto qywx错误日志列表
* @return {@link List }<{@link TabQywxErrorLog }>
* @author mozhu
* @date 2022-04-18 16:55:23
*/ */
List<TabQywxErrorLog> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO); List<TabQywxErrorLog> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO);
......
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.chat.TabChatNotice;
/**
*
* @ClassName: TabHaobanChatNoticeMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月01日 17:54:02
* @Modify
* @CopyRight
*/
public interface ChatNoticeMapper {
public int insert(TabChatNotice entity);
public int closeAll(@Param("list") List<Integer> typeList, @Param("startTime") Date startTime,
@Param("endTime") Date endTime);
public List<TabChatNotice> listAll(@Param("list") List<Integer> typeList, @Param("startTime") Date startTime,
@Param("endTime") Date endTime);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import com.gic.haoban.manage.api.dto.chat.GroupChatDataDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.ChatDataSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatData;
/**
*
* @ClassName: TabHaobanGroupChatDataMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:48:46
* @Modify
* @CopyRight
*/
public interface GroupChatDataMapper {
public int batchInsert(List<TabGroupChatData> list) ;
public GroupChatDataDTO listTotalData(ChatDataSearchQDTO qdto);
public List<GroupChatDataDTO> listForChat(ChatDataSearchQDTO qdto);
public List<GroupChatDataDTO> listStaffData(ChatDataSearchQDTO qdto);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatHm;
/**
*
* @ClassName: TabHaobanGroupChatHmMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:30:48
* @Modify
* @CopyRight
*/
public interface GroupChatHmMapper {
public int insert(TabGroupChatHm hm);
public int deleteById(Long chatHmId);
public int updateById(TabGroupChatHm hm);
public int discard(@Param("chatHmId") Long chatHmId, @Param("wxEnterpriseId") String wxEnterpriseId,
@Param("clerkId") String clerkId, @Param("clerkName") String clerkName);
public TabGroupChatHm selectById(Long chatHmId);
public void updateLinkCount(@Param("chatHmId") Long chatHmId, @Param("linkCount") int linkCount);
public List<TabGroupChatHm> list(ChatHmSearchQDTO qdto);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatHmRelation;
import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatHmRelationBO;
/**
*
* @ClassName: TabHaobanGroupChatHmRelationMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月05日 17:33:14
* @Modify
* @CopyRight
*/
public interface GroupChatHmRelationMapper {
public int insertBatch(List<TabGroupChatHmRelation> list);
public int delete(@Param("chatHmId") Long chatHmId, @Param("groupChatIdList") List<Long> groupChatIdList,
@Param("statusFlag") int statusFlag);
public List<TabGroupChatHmRelation> listByChatHmId(@Param("chatHmId") Long chatHmId);
public List<TabGroupChatHmRelation> listByChatHmIdIncludeOff(@Param("chatHmId") Long chatHmId);
/**
*
* @Title: listChatHmId
* @Description: 查询群关联的活码ID
* @author xugh
* @param groupChatId
* @return
* @throws
*/
public List<Long> listChatHmId(@Param("groupChatId") Long groupChatId);
public List<GroupChatHmRelationBO> getHmValidChatCount(@Param("hmList") List<Long> hmList) ;
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatInit;
/**
*
* @ClassName: TabHaobanGroupChatInitMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月18日 11:33:08
* @Modify
* @CopyRight
*/
public interface GroupChatInitMapper {
/**
* 更新
* @Title: update
* @Description: TODO
* @Param @param TabHaobanGroupChatInit
* @Throws
*/
public int update(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("statusFlag") int status);
/**
* 通过主键查询
* @Title: selectById
* @Description: TODO
* @Param @param id
* @Param @return
* @Return TabHaobanGroupChatInit
* @Throws
*/
public TabGroupChatInit selectById(String wxEnterpriseId);
/**
* 通过条件查询
* @Title: listAll
* @Description: TODO
* @Param @param TabHaobanGroupChatInit
* @Param @return
* @Return List
* @Throws
*/
public List<TabGroupChatInit> listAllInit();
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.Date;
import java.util.List;
import java.util.Set;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChat;
/**
*
* @ClassName: TabHaobanGroupChatMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 13:35:28
* @Modify
* @CopyRight
*/
public interface GroupChatMapper {
public int updateChatErrorRemark(@Param("groupChatId")Long groupChatId , @Param("chatRemark")String chatRemark) ;
public int getCountByStaffId(String staffId);
public int insert(TabGroupChat chat);
public int update(TabGroupChat chat);
/**
* 更新代开发应用的群ID
*/
public void updateWxChatIdDk(@Param("staffId") String staffId, @Param("name") String name,
@Param("chatAddTime") Date chatAddTime, @Param("wxChatIdDk") String wxChatIdDk);
public int updateData(@Param("groupChatId") Long groupChatId, @Param("totalCount") int totalCount,
@Param("totalMemberCount") int totalMemberCount, @Param("addMemberCount") int addMemberCount,
@Param("addCount") int addCount, @Param("quitCount") int quitCount,
@Param("quitMemberCount") int quitMemberCount);
public int addMemberCount(@Param("groupChatId") Long groupChatId);
// 更新群状态
public int updateChatStatus(@Param("groupChatId") Long groupChatId, @Param("chatStatus") int chatStatus);
// 下线(标识不能通过活码入群)
public int chatOff(@Param("groupChatId") Long groupChatId);
public TabGroupChat selectById(Long groupChatId);
public List<TabGroupChat> listByIdSet(@Param("idList") Set<Long> idList);
public TabGroupChat selectByWxChatId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxChatId") String wxChatId);
public TabGroupChat selectByWxChatIdDk(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxChatIdDk") String wxChatIdDk);
public List<TabGroupChat> listByWxWxChatIdList(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxChatIdList") List<String> wxChatIdList);
public List<TabGroupChat> listByWxWxChatIdListDk(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("wxChatIdDkList") List<String> wxChatIdDkList);
public List<TabGroupChat> listAllNeedInit();
public List<TabGroupChat> listAllNeedInitWxChatIdDk();
public List<GroupChatDTO> list(GroupChatSearchQDTO qdto);
public void updateChatEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("groupChatIdList") List<Long> groupChatIdList,
@Param("force") int force);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatOwnerHistory;
/**
*
* @ClassName: TabHaobanGroupChatOwnerHistoryMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月06日 13:19:52
* @Modify
* @CopyRight
*/
public interface GroupChatOwnerHistoryMapper {
public int insert(TabGroupChatOwnerHistory entity);
public TabGroupChatOwnerHistory getGroupChatNowStaff(@Param("groupChatId") Long groupChatId, @Param("staffId") String staffId) ;
public int updateOwnerEnd(@Param("groupChatId") Long groupChatId, @Param("staffId") String staffId);
public List<GroupChatOwnerHistoryDTO> listAll(@Param("groupChatId")Long groupChatId,@Param("wxEnterpriseId") String wxEnterpriseId);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatOwner;
/**
*
* @ClassName: TabHaobanGroupChatOwnerMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月04日 10:08:25
* @Modify
* @CopyRight
*/
public interface GroupChatOwnerMapper {
public int insert(TabGroupChatOwner owner);
public TabGroupChatOwner selectByStaffId(@Param("staffId") String staffId);
public int updateChatCount(@Param("staffId") String staffId, @Param("chatCount") int chatCount);
public List<GroupChatOwnerDTO> listOwner(OwnerSearchQDTO qdto);
public List<GroupChatOwnerDTO> listOwnerForStatistic(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("startItem") int startItem,
@Param("pageSize") int pageSize);
/**
*
* @Title: dimissionOwnerList
* @Description: 查询处理离职的群主
* @author xugh
* @return
* @throws
*/
public List<GroupChatOwnerDTO> dimissionOwnerList();
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.GroupChatPlanLogDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanLog;
/**
*
* @ClassName: TabHaobanGroupChatPlanLogMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:17:50
* @Modify
* @CopyRight
*/
public interface GroupChatPlanLogMapper {
public int batchInsert(@Param("list") List<TabGroupChatPlanLog> list);
public List<GroupChatPlanLogDTO> listPlanLog(GroupChatPlanSearchQDTO qdto);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan;
/**
*
* @ClassName: TabHaobanGroupChatPlanMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:28:49
* @Modify
* @CopyRight
*/
public interface GroupChatPlanMapper {
public int insert(TabGroupChatPlan entity);
public int deleteById(@Param("planId") Long planId, @Param("clerkId") String clerkId,
@Param("clerkName") String clerkName);
public int stopById(@Param("planId") Long planId, @Param("clerkId") String clerkId,
@Param("clerkName") String clerkName, @Param("modifyStartTimeFlag") Integer modifyStartTimeFlag);
public int updateSendFlag(@Param("planId") Long planId);
public int updateById(TabGroupChatPlan entity);
public TabGroupChatPlan selectById(Long planId);
public List<TabGroupChatPlan> list(GroupChatPlanSearchQDTO qdto);
public void updateData(@Param("planId") Long planId, @Param("sendCount") int sendCount,
@Param("successChatCount") int successChatCount, @Param("failChatCount") int failChatCount);
public void updateRemark(GroupChatPlanDTO dto);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO;
import com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog;
/**
*
* @ClassName: TabHaobanGroupChatPlanOwnerLogMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:29:51
* @Modify
* @CopyRight
*/
public interface GroupChatPlanOwnerLogMapper {
public int batchInsert(List<TabGroupChatPlanOwnerLog> entity);
public int update(TabGroupChatPlanOwnerLog entity);
public void deleteByStaffIds(@Param("planId") Long planId, @Param("staffIdList") List<String> staffIdList);
public TabGroupChatPlanOwnerLog selectById(Long ownerLogId);
public void updateSendCount(@Param("id") Long id, @Param("sendCount") int sendCount,
@Param("failCount") int failCount, @Param("sendTime") Date sendTime);
public List<GroupChatPlanOwnerLogDTO> listPage(GroupChatPlanSearchQDTO qdto);
public List<Long> listForTimer(@Param("planId") Long planId);
public List<TabGroupChatPlanOwnerLog> listForDoPlan(@Param("planId") Long planId, @Param("startItem") int startItem,
@Param("pageSize") int pageSize);
public List<ChatOwnerTotalDTO> listOwnerLogPageForWxaTotal(GroupChatPlanSearchQDTO qdto);
public List<GroupChatPlanOwnerLogDTO> listOwnerLogPageForWxa(GroupChatPlanSearchQDTO qdto);
public GroupChatPlanOwnerLogDTO getOwnerInfo(@Param("planId")Long planId, @Param("staffId")String staffId, @Param("clerkId")String clerkId, @Param("wxEnterpriseId")String wxEnterpriseId);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.chat;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
/**
*
* @ClassName: TabHaobanGroupChatUserMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:42:52
* @Modify
* @CopyRight
*/
public interface GroupChatUserMapper {
public int insert(TabGroupChatUser tabHaobanGroupChatUser);
public int batchInsert(@Param("list")List<TabGroupChatUser> userList);
public int dismiss(@Param("idList") List<Long> chatUserIdList, @Param("ownerId") String ownerId);
public int update(TabGroupChatUser tabHaobanGroupChatUser);
public TabGroupChatUser selectById(Long chatUserId);
public TabGroupChatUser selectByUserIdAndChatId(@Param("groupChatId") Long groupChatId,
@Param("userId") String userId);
public List<TabGroupChatUser> listAllChatUser(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("groupChatId") Long groupChatId);
public List<GroupChatUserDTO> listPage(GroupChatUserSearchQDTO qdto);
/**
*
* @Title: listByExternalUseridForMatch
* @Description: 通过外部联系人查询需要匹配gic会员的列表
* @author xugh
* @param wxEnterpriseId
* @param enterpriseId
* @param externalUserid
* @return
* @throws
*/
public List<TabGroupChatUser> listByExternalUseridForMatch(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("externalUserid") String externalUserid);
public void updateToGicMember(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("externalUserid") String externalUserid,
@Param("memberId") String memberId);
}
\ No newline at end of file
package com.gic.haoban.manage.service.dao.mapper.hm;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
import com.gic.haoban.manage.service.entity.hm.TabHmLinkChat;
/**
*
* @ClassName: TabHaobanHmLinkChatMapper
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 22:36:24
* @Modify
* @CopyRight
*/
public interface HmLinkChatMapper {
public int insert(TabHmLinkChat tabHaobanHmLinkChat);
public int delete(@Param("linkId") Long linkId, @Param("notDelIdList") List<Long> notDelIdList,
@Param("otherFlag") int otherFlag);
public int update(TabHmLinkChat entity);
public List<HmLinkChatDTO> listByLinkId(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("linkId") Long linkId);
public List<HmLinkChatDTO> getLinkCountForHm(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("chatHmIdList") List<Long> chatHmIdList);
public List<HmLinkChatDTO> listPage(HmLinkChatQDTO qdto);
}
\ No newline at end of file
...@@ -54,7 +54,7 @@ public interface HmLinkMapper { ...@@ -54,7 +54,7 @@ public interface HmLinkMapper {
public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId, public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName, @Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName,
@Param("linkType") Integer linkType); @Param("linkType") Integer linkType, @Param("creatorIdList") List<String> creatorIdList);
public List<TabHmLink> list(@Param("wxEnterpriseId") String wxEnterpriseId, public List<TabHmLink> list(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("startDate") Date startDate, @Param("enterpriseId") String enterpriseId, @Param("startDate") Date startDate,
...@@ -63,4 +63,5 @@ public interface HmLinkMapper { ...@@ -63,4 +63,5 @@ public interface HmLinkMapper {
public List<TabHmLink> queryPageRelationList(@Param("pageId") Long pageId, public List<TabHmLink> queryPageRelationList(@Param("pageId") Long pageId,
@Param("enterpriseId") String enterpriseId, @Param("searchText") String searchText); @Param("enterpriseId") String enterpriseId, @Param("searchText") String searchText);
} }
\ No newline at end of file
...@@ -6,18 +6,13 @@ import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO; ...@@ -6,18 +6,13 @@ import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
import java.util.List; import java.util.List;
public interface TabHaobanHmPageMapper { public interface TabHaobanHmPageMapper {
int deleteByPrimaryKey(Long templateId);
int insert(TabHaobanHmPage record); int insert(TabHaobanHmPage record);
int insertSelective(TabHaobanHmPage record);
TabHaobanHmPage selectByPrimaryKey(Long templateId); TabHaobanHmPage selectByPrimaryKey(Long templateId);
int updateByPrimaryKeySelective(TabHaobanHmPage record); int updateByPrimaryKeySelective(TabHaobanHmPage record);
int updateByPrimaryKey(TabHaobanHmPage record);
/** /**
* 条件查询 活码落地页模板 * 条件查询 活码落地页模板
* *
......
...@@ -26,14 +26,6 @@ public interface TabHaobanHmQrcodeMapper { ...@@ -26,14 +26,6 @@ public interface TabHaobanHmQrcodeMapper {
TabHaobanHmQrcode queryById(@Param("hmId") Long hmId); TabHaobanHmQrcode queryById(@Param("hmId") Long hmId);
/** /**
* 分页列表
*
* @param hmQrcodeListQDTO 查询条件
* @return 对象列表
*/
List<TabHaobanHmQrcode> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO);
/**
* 新增数据 * 新增数据
* *
* @param tabHaobanHmQrcode 实例对象 * @param tabHaobanHmQrcode 实例对象
......
...@@ -53,6 +53,15 @@ public class TabHaobanStaff implements Serializable { ...@@ -53,6 +53,15 @@ public class TabHaobanStaff implements Serializable {
@Transient @Transient
private String departmentIds; private String departmentIds;
private int openConcatFlag ;
public int getOpenConcatFlag() {
return openConcatFlag;
}
public void setOpenConcatFlag(int openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
public String getStaffId() { public String getStaffId() {
return staffId; return staffId;
......
...@@ -17,8 +17,6 @@ public class TabQywxErrorLog implements Serializable { ...@@ -17,8 +17,6 @@ public class TabQywxErrorLog implements Serializable {
private Long id; private Long id;
private String wxEnterpriseId; private String wxEnterpriseId;
private String corpid;
private String qywxInterface;
/** /**
* 场景 * 场景
*/ */
...@@ -27,10 +25,10 @@ public class TabQywxErrorLog implements Serializable { ...@@ -27,10 +25,10 @@ public class TabQywxErrorLog implements Serializable {
* 报错内容 * 报错内容
*/ */
private String errorContent; private String errorContent;
/**
* 企微报错url private String memberId;
*/ private String externalUserId;
private String weworkErrorUrl;
/** /**
* 链路id * 链路id
*/ */
...@@ -58,22 +56,6 @@ public class TabQywxErrorLog implements Serializable { ...@@ -58,22 +56,6 @@ public class TabQywxErrorLog implements Serializable {
this.wxEnterpriseId = wxEnterpriseId; this.wxEnterpriseId = wxEnterpriseId;
} }
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public String getQywxInterface() {
return qywxInterface;
}
public void setQywxInterface(String qywxInterface) {
this.qywxInterface = qywxInterface;
}
public String getScenario() { public String getScenario() {
return scenario; return scenario;
} }
...@@ -90,12 +72,20 @@ public class TabQywxErrorLog implements Serializable { ...@@ -90,12 +72,20 @@ public class TabQywxErrorLog implements Serializable {
this.errorContent = errorContent; this.errorContent = errorContent;
} }
public String getWeworkErrorUrl() { public String getMemberId() {
return weworkErrorUrl; return memberId;
}
public String getExternalUserId() {
return externalUserId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
} }
public void setWeworkErrorUrl(String weworkErrorUrl) { public void setExternalUserId(String externalUserId) {
this.weworkErrorUrl = weworkErrorUrl; this.externalUserId = externalUserId;
} }
public String getTraceId() { public String getTraceId() {
......
package com.gic.haoban.manage.service.entity.chat;
import java.io.Serializable;
/**
*
* @ClassName: TabHaobanChatNotice
* @Description: TODO
* @Author 徐高华
* @Date 2022年12月01日 17:54:02
* @Modify
* @CopyRight
*/
public class TabChatNotice implements Serializable {
private static final long serialVersionUID = 2487673259100L;
private Long id;
private String wxEnterpriseId;
private Long chatId;
private String msg;
private Integer type;
/**0待处理1已处理*/
private Integer statusFlag;
private java.util.Date createTime;
private java.util.Date updateTime;
public void setId(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setChatId(Long chatId) {
this.chatId = chatId;
}
public Long getChatId() {
return chatId;
}
public void setMsg(String msg) {
this.msg = msg;
}
public String getMsg() {
return msg;
}
public void setType(Integer type) {
this.type = type;
}
public Integer getType() {
return type;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
public java.util.Date getCreateTime() {
return createTime;
}
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime() {
return updateTime;
}
}
\ No newline at end of file
package com.gic.haoban.manage.service.entity.chat;
import java.io.Serializable ;
import java.util.Date;
/**
*
* @ClassName: TabHaobanGroupChat
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 13:35:28
* @Modify
* @CopyRight
*/
public class TabGroupChat implements Serializable{
private static final long serialVersionUID = 13124020287100L;
/**主键*/
private Long groupChatId;
private String wxEnterpriseId;
/**群名称*/
private String name;
/**群主*/
private String staffId;
/**群id(企微)*/
private String wxChatId;
/**群创建时间*/
private java.util.Date chatAddTime;
/**群解散时间*/
private java.util.Date chatDissolveTime;
/**群公告*/
private String chatNotice;
/**群状态*/
private Integer chatStatus;
private java.util.Date createTime;
private java.util.Date updateTime;
/**是否删除1是0否*/
private Integer deleteFlag;
/**群成员数*/
private Integer totalCount;
/**群客户数*/
private Integer totalMemberCount;
/**新增总客户数*/
private Integer addMemberCount;
/**新增总成员数*/
private Integer addCount;
/**流失总成员数*/
private Integer quitCount;
/**流失总客户数*/
private Integer quitMemberCount;
/**gic企业ID*/
private String enterpriseId;
private Integer gicFlag;
private Integer initFlag ;
private String wxChatIdDk;
private Date offTime ;
private String originalStaffId ;
private String chatRemark ;
public String getChatRemark() {
return chatRemark;
}
public void setChatRemark(String chatRemark) {
this.chatRemark = chatRemark;
}
public Date getOffTime() {
return offTime;
}
public String getOriginalStaffId() {
return originalStaffId;
}
public void setOffTime(Date offTime) {
this.offTime = offTime;
}
public void setOriginalStaffId(String originalStaffId) {
this.originalStaffId = originalStaffId;
}
public String getWxChatIdDk() {
return wxChatIdDk;
}
public void setWxChatIdDk(String wxChatIdDk) {
this.wxChatIdDk = wxChatIdDk;
}
public Integer getInitFlag() {
return initFlag;
}
public void setInitFlag(Integer initFlag) {
this.initFlag = initFlag;
}
public void setGroupChatId(Long groupChatId){
this.groupChatId = groupChatId;
}
public Long getGroupChatId(){
return groupChatId;
}
public void setWxEnterpriseId(String wxEnterpriseId){
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId(){
return wxEnterpriseId;
}
public void setName(String name){
this.name = name;
}
public String getName(){
return name;
}
public void setStaffId(String staffId){
this.staffId = staffId;
}
public String getStaffId(){
return staffId;
}
public void setWxChatId(String wxChatId){
this.wxChatId = wxChatId;
}
public String getWxChatId(){
return wxChatId;
}
public void setChatAddTime(java.util.Date chatAddTime){
this.chatAddTime = chatAddTime;
}
public java.util.Date getChatAddTime(){
return chatAddTime;
}
public void setChatDissolveTime(java.util.Date chatDissolveTime){
this.chatDissolveTime = chatDissolveTime;
}
public java.util.Date getChatDissolveTime(){
return chatDissolveTime;
}
public void setChatNotice(String chatNotice){
this.chatNotice = chatNotice;
}
public String getChatNotice(){
return chatNotice;
}
public void setChatStatus(Integer chatStatus){
this.chatStatus = chatStatus;
}
public Integer getChatStatus(){
return chatStatus;
}
public void setCreateTime(java.util.Date createTime){
this.createTime = createTime;
}
public java.util.Date getCreateTime(){
return createTime;
}
public void setUpdateTime(java.util.Date updateTime){
this.updateTime = updateTime;
}
public java.util.Date getUpdateTime(){
return updateTime;
}
public void setDeleteFlag(Integer deleteFlag){
this.deleteFlag = deleteFlag;
}
public Integer getDeleteFlag(){
return deleteFlag;
}
public void setTotalCount(Integer totalCount){
this.totalCount = totalCount;
}
public Integer getTotalCount(){
return totalCount;
}
public void setTotalMemberCount(Integer totalMemberCount){
this.totalMemberCount = totalMemberCount;
}
public Integer getTotalMemberCount(){
return totalMemberCount;
}
public void setAddMemberCount(Integer addMemberCount){
this.addMemberCount = addMemberCount;
}
public Integer getAddMemberCount(){
return addMemberCount;
}
public void setAddCount(Integer addCount){
this.addCount = addCount;
}
public Integer getAddCount(){
return addCount;
}
public void setQuitCount(Integer quitCount){
this.quitCount = quitCount;
}
public Integer getQuitCount(){
return quitCount;
}
public void setQuitMemberCount(Integer quitMemberCount){
this.quitMemberCount = quitMemberCount;
}
public Integer getQuitMemberCount(){
return quitMemberCount;
}
public void setEnterpriseId(String enterpriseId){
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId(){
return enterpriseId;
}
public Integer getGicFlag() {
return gicFlag;
}
public void setGicFlag(Integer gicFlag) {
this.gicFlag = gicFlag;
}
}
\ No newline at end of file
package com.gic.haoban.manage.service.entity.chat;
import java.io.Serializable ;
/**
*
* @ClassName: TabHaobanGroupChatData
* @Description: TODO
* @Author 徐高华
* @Date 2022年11月25日 15:48:46
* @Modify
* @CopyRight
*/
public class TabGroupChatData implements Serializable{
private static final long serialVersionUID = 21417308241400L;
private Long dataId;
private String wxEnterpriseId;
private String staffId;
/**统计日期*/
private java.util.Date date;
/**新增客户群数量*/
private Integer newChatCnt;
/**截至当天客户群总数量*/
private Integer chatTotal;
/**截至当天有发过消息的客户群数量*/
private Integer chatHasMsg;
/**客户群新增群人数*/
private Integer newMemberCnt;
/**截至当天客户群总人数*/
private Integer memberTotal;
/**截至当天有发过消息的群成员数*/
private Integer memberHasMsg;
/**截至当天客户群消息总数*/
private Integer msgTotal;
/**截至当天新增迁移群数(仅教培行业返回)*/
private Integer migrateTraineeChatCnt;
private java.util.Date createTime;
public void setDataId(Long dataId){
this.dataId = dataId;
}
public Long getDataId(){
return dataId;
}
public void setWxEnterpriseId(String wxEnterpriseId){
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseId(){
return wxEnterpriseId;
}
public void setStaffId(String staffId){
this.staffId = staffId;
}
public String getStaffId(){
return staffId;
}
public void setDate(java.util.Date date){
this.date = date;
}
public java.util.Date getDate(){
return date;
}
public void setNewChatCnt(Integer newChatCnt){
this.newChatCnt = newChatCnt;
}
public Integer getNewChatCnt(){
return newChatCnt;
}
public void setChatTotal(Integer chatTotal){
this.chatTotal = chatTotal;
}
public Integer getChatTotal(){
return chatTotal;
}
public void setChatHasMsg(Integer chatHasMsg){
this.chatHasMsg = chatHasMsg;
}
public Integer getChatHasMsg(){
return chatHasMsg;
}
public void setNewMemberCnt(Integer newMemberCnt){
this.newMemberCnt = newMemberCnt;
}
public Integer getNewMemberCnt(){
return newMemberCnt;
}
public void setMemberTotal(Integer memberTotal){
this.memberTotal = memberTotal;
}
public Integer getMemberTotal(){
return memberTotal;
}
public void setMemberHasMsg(Integer memberHasMsg){
this.memberHasMsg = memberHasMsg;
}
public Integer getMemberHasMsg(){
return memberHasMsg;
}
public void setMsgTotal(Integer msgTotal){
this.msgTotal = msgTotal;
}
public Integer getMsgTotal(){
return msgTotal;
}
public void setMigrateTraineeChatCnt(Integer migrateTraineeChatCnt){
this.migrateTraineeChatCnt = migrateTraineeChatCnt;
}
public Integer getMigrateTraineeChatCnt(){
return migrateTraineeChatCnt;
}
public void setCreateTime(java.util.Date createTime){
this.createTime = createTime;
}
public java.util.Date getCreateTime(){
return createTime;
}
}
\ No newline at end of file
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