Skip to content

H
haoban-manage3.0
Commit 60c49f8d by 徐高华
Options

Merge remote-tracking branch 'origin/feature/自建应用验证' into developer 

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
parents 964afa0f a22a34f4
Showing with 405 additions and 421 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/HandoverServiceImpl.java
......@@ -96,7 +96,7 @@ public class HandoverServiceImpl implements HandoverService {
Map<String, List<QywxUnassignedInfoDTO>> handoverUserMap = infoList.stream().collect(Collectors.groupingBy(dto -> dto.getHandoverUserid()));
handoverUserMap.forEach((userId, list) -> {
boolean checkFlag = checkStaffOver(secretSetting, userId, qwDTO.getDkCorpid());
boolean checkFlag = checkStaffOver(secretSetting, userId, qwDTO.getDkCorpid() ,qwDTO);
if (checkFlag) {
logger.info("该用户存在，不需要离职基础：{},{}", userId, wxEnterpriseId);
return;
......@@ -144,8 +144,8 @@ public class HandoverServiceImpl implements HandoverService {
return false;
}
private boolean checkStaffOver(SecretSettingDTO secretSetting, String userId, String corpId) {
UserDTO user = qywxUserApiService.getSelfWorkWxUser(corpId, secretSetting.getSecretVal(), userId);
private boolean checkStaffOver(SecretSettingDTO secretSetting, String userId, String corpId,WxEnterpriseQwDTO qwDTO) {
UserDTO user = qywxUserApiService.getSelfWorkWxUser(corpId, secretSetting.getSecretVal(), userId , qwDTO.getUrlHost());
if (null == user) {
return false;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffDepartmentRelatedServiceImpl.java
......@@ -147,7 +147,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
}
SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
if (null != secretSetting && StringUtils.isNotBlank(secretSetting.getSecretVal())) {
UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
UserDTO user = qywxUserApiService.getSelfWorkWxUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId, qwDTO.getUrlHost());
logger.info("成员详情(代开)={}",JSON.toJSONString(user)) ;
if(null != user && null != user.getDepartment()) {
this.staffDepartChange(staff, wxEnterpriseId, user.getDepartment(),false); ;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeSendServiceImpl.java
......@@ -211,7 +211,7 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
if(qwDTO.isSelf()) {
log.info("自建={}",corpid,qwDTO.getSelfSecret());
result = this.qywxUserApiService.sendSelfWelcomeMsgByExternal(corpid, qwDTO.getSelfSecret(),
qywxWelcomeMsgDTO);
qywxWelcomeMsgDTO , qwDTO.getUrlHost());
}else {
result = this.qywxUserApiService.sendWelcomeMsgByExternal(corpid, config.getWxSuiteid(),
qywxWelcomeMsgDTO);
......@@ -392,7 +392,7 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
log.info("查询好友详情,externalUserId={},{}", externalUserId,qwDTO.getWxSecurityType());
String userInfo = null ;
if(qwDTO.isSelf()) {
userInfo =qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId);
userInfo =qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost());
}else {
userInfo =qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid(), externalUserId);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -842,7 +842,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
ExternalUserDTO externalUserDTO;
WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
if(qwDTO.isSelf()) {
String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), dto.getExternalUserid());
String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), dto.getExternalUserid(),qwDTO.getUrlHost());
if (StringUtils.isBlank(unionIdJson)) {
log.info("好友不存在");
return null;
......@@ -1159,7 +1159,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("没有配置客户联系secret:{}", wxEnterpriseId);
return list;
}
String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId,qwDTO.getUrlHost());
log.info("【查询自建应用】res={}", res);
if (res != null && res.equals("1")) {
log.info("代表需要重试");
......@@ -1231,7 +1231,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("没有配置secret");
return null;
}
String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), externalUserId);
String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), externalUserId,qwDTO.getUrlHost());
if (StringUtils.isBlank(unionIdJson)) {
log.info("好友不存在");
return null;
......@@ -1256,7 +1256,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("没有配置secret");
return null;
}
String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getMemberCorpid(), secretSetting.getSecretVal(), externalUserId);
String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getMemberCorpid(), secretSetting.getSecretVal(), externalUserId,qwDTO.getUrlHost());
if (StringUtils.isBlank(unionIdJson)) {
log.info("好友不存在");
return null;
......@@ -1284,7 +1284,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
String wxOpenUseId = tabHaobanStaff.getWxOpenUseId();
String uJ = null ;
if(qwDTO.isSelf()) {
uJ = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId) ;
uJ = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost()) ;
}else {
uJ = this.qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid(), externalUserId);
}
......@@ -1639,7 +1639,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
}
String uJ = null ;
if(qwDTO.isSelf()) {
uJ = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId) ;
uJ = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost()) ;
}else {
uJ = this.qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid(), externalUserId);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
......@@ -347,8 +347,8 @@ public class MessageApiServiceImpl implements MessageApiService {
log.info("没有配置secret,wxEnterpriseId:{}", wxEnterpriseId);
return;
}
UserDTO user = qywxUserApiService.getSelfWorkWxUser(corpId, secretSetting.getSecretVal(), userid);
WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
UserDTO user = qywxUserApiService.getSelfWorkWxUser(corpId, secretSetting.getSecretVal(), userid ,qwDTO.getUrlHost());
if (null != user) {
Integer status = user.getStatus();
// 1=已激活，2=已禁用，4=未激活，5=退出企业。
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxTagApiServiceImpl.java
......@@ -462,7 +462,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
String wxSuiteid = config.getWxSuiteid();
String externalUseridInfo = null ;
if(qwDTO.isSelf()) {
externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId) ;
externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost()) ;
}else {
externalUseridInfo = this.qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), wxSuiteid, externalUserId);
}
......@@ -587,7 +587,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
//查询外部联系人
String externalUseridInfo = null ;
if(qwDTO.isSelf()) {
externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId) ;
externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost()) ;
}else {
externalUseridInfo = this.qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid(), externalUserId);
}
......@@ -962,7 +962,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
}
TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpid) ;
WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId()) ;
QywxResponseDTO responseDTO = qywxUserApiService.markTag(corpid, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), wxUserId, externalUserId, needSetTagList, needDelTagList , qwDTO.isSelf());
QywxResponseDTO responseDTO = qywxUserApiService.markTag(corpid, QwUtils.getSecret(qwDTO, config.getWxSuiteid()), wxUserId, externalUserId, needSetTagList, needDelTagList , qwDTO.isSelf() ,qwDTO.getUrlHost());
logger.info("操作返回：{}", JSONObject.toJSONString(responseDTO));
if (responseDTO.getErrcode() != 0) {
logger.info("权限不对，重试三次:{},{}", wxUserId, externalUserId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/TestServiceImpl.java
......@@ -49,27 +49,11 @@ public class TestServiceImpl implements TestApiService {
@Override
public String listSelfQywxUser(String corpid, String secretVal, String dataId) {
long t = System.currentTimeMillis();
List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, secretVal, dataId, 0);
logger.info("耗时为===============>{}毫秒", (System.currentTimeMillis() - t));
if (null != list) {
logger.info("微信获取部门成员数量为：{}", list.size());
} else {
logger.info("微信获取部门成员数量异常");
}
return "";
}
@Override
public String listAllQywxUser(String corpid, String secretVal, String dataId) {
long t = System.currentTimeMillis();
List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, secretVal, dataId, 1);
logger.info("耗时为===============>{}毫秒", (System.currentTimeMillis() - t));
if (null != list) {
logger.info("微信获取部门成员数量为：{}", list.size());
} else {
logger.info("微信获取部门成员数量异常");
}
return "";
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxDeptSyncOperation.java
......@@ -170,12 +170,12 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
if ("0".equals(pDataId)) {
//根级部门
List<UserDTO> list = null ;
WxEnterpriseQwDTO wxInfo = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
if(wxInfo.getWxSecurityType()==4) {
list = this.qywxUserApiService.listDepartmentUser(wxInfo.getThirdCorpid(), config.getWxSuiteid(), dataId, 1) ;
WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
if(qwDTO.getWxSecurityType()==4) {
list = this.qywxUserApiService.listDepartmentUser(qwDTO.getThirdCorpid(), config.getWxSuiteid(), dataId, 1) ;
logger.info("从(第三方)获取通讯录={}",JSON.toJSONString(list)) ;
}else {
list = this.qywxUserApiService.listSelfDepartmentUser(wxInfo.getDkCorpid(), secretSetting.getSecretVal(), dataId, 1);
list = this.qywxUserApiService.listSelfDepartmentUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), dataId, 1,qwDTO.getUrlHost());
logger.info("从(代开)获取通讯录={}",JSON.toJSONString(list)) ;
}
if (null == list) {
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/TransferActiveCodeQO.java
package com.gic.haoban.manage.web.qo;
import java.io.Serializable;
/**
* @description: 通讯录转移许可QO
* @Author: wenhua
* @Date: 2023/1/30 20:39
*/
public class TransferActiveCodeQO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 转移成员的staffId
*/
private String handoverStaffId;
/**
* 接收成员的staffId
*/
private String takeoverStaffId ;
public String getHandoverStaffId() {
return handoverStaffId;
}
public void setHandoverStaffId(String handoverStaffId) {
this.handoverStaffId = handoverStaffId;
}
public String getTakeoverStaffId() {
return takeoverStaffId;
}
public void setTakeoverStaffId(String takeoverStaffId) {
this.takeoverStaffId = takeoverStaffId;
}
}
package com.gic.haoban.manage.web.qo;
import java.io.Serializable;
/**
* @description: 通讯录转移许可QO
* @Author: wenhua
* @Date: 2023/1/30 20:39
*/
public class TransferActiveCodeQO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 转移成员的staffId
*/
private String handoverStaffId;
/**
* 接收成员的staffId
*/
private String takeoverStaffId ;
public String getHandoverStaffId() {
return handoverStaffId;
}
public void setHandoverStaffId(String handoverStaffId) {
this.handoverStaffId = handoverStaffId;
}
public String getTakeoverStaffId() {
return takeoverStaffId;
}
public void setTakeoverStaffId(String takeoverStaffId) {
this.takeoverStaffId = takeoverStaffId;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmPageListQO.java
package com.gic.haoban.manage.web.qo.hm;
import com.gic.haoban.base.api.common.BasePageInfo;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Author MUSI
* @Date 2022/7/8 10:01 AM
* @Description
* @Version
**/
public class HmPageListQO extends BasePageInfo {
private static final long serialVersionUID = 660563636929408221L;
private String pageSearchText;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
private int pageType ;
public int getPageType() {
return pageType;
}
public void setPageType(int pageType) {
this.pageType = pageType;
}
public String getPageSearchText() {
return pageSearchText;
}
public void setPageSearchText(String pageSearchText) {
this.pageSearchText = pageSearchText;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
}
package com.gic.haoban.manage.web.qo.hm;
import com.gic.haoban.base.api.common.BasePageInfo;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @Author MUSI
* @Date 2022/7/8 10:01 AM
* @Description
* @Version
**/
public class HmPageListQO extends BasePageInfo {
private static final long serialVersionUID = 660563636929408221L;
private String pageSearchText;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
private int pageType ;
public int getPageType() {
return pageType;
}
public void setPageType(int pageType) {
this.pageType = pageType;
}
public String getPageSearchText() {
return pageSearchText;
}
public void setPageSearchText(String pageSearchText) {
this.pageSearchText = pageSearchText;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmPageSettingReq.java
package com.gic.haoban.manage.web.qo.hm;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.NotEmpty;
import java.io.Serializable;
/**
* @Author MUSI
* @Date 2022/7/8 9:47 AM
* @Description
* @Version
**/
public class HmPageSettingReq implements Serializable {
private static final long serialVersionUID = -3759274516687664059L;
private Long pageId;
/**
* 落地页模板名称
*/
@NotEmpty(message = "落地页模板名称不能为空")
@Length(max = 20, message = "落地页模板名称长度最大为20个字符")
private String pageName;
/**
* 页面标题
*/
@Length(max = 10, message = "落地页页面标题长度最大为10个字符")
private String pageTitle;
/**
* 商户名称
*/
@Length(max = 20, message = "落地页模板商户名称长度最大为20个字符")
private String merchantName;
/**
* 商户电话号码
*/
private String merchantPhoneNumber;
/***
* 商户logo
*/
private String merchantLogo;
/**
* 页面背景
*/
private String pageBackgroundImg;
/**
* 引导语
*/
private String guideComment;
private int pageType ;
public int getPageType() {
return pageType;
}
public void setPageType(int pageType) {
this.pageType = pageType;
}
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getPageName() {
return pageName;
}
public void setPageName(String pageName) {
this.pageName = pageName;
}
public String getPageTitle() {
return pageTitle;
}
public void setPageTitle(String pageTitle) {
this.pageTitle = pageTitle;
}
public String getMerchantName() {
return merchantName;
}
public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}
public String getMerchantPhoneNumber() {
return merchantPhoneNumber;
}
public void setMerchantPhoneNumber(String merchantPhoneNumber) {
this.merchantPhoneNumber = merchantPhoneNumber;
}
public String getMerchantLogo() {
return merchantLogo;
}
public void setMerchantLogo(String merchantLogo) {
this.merchantLogo = merchantLogo;
}
public String getPageBackgroundImg() {
return pageBackgroundImg;
}
public void setPageBackgroundImg(String pageBackgroundImg) {
this.pageBackgroundImg = pageBackgroundImg;
}
public String getGuideComment() {
return guideComment;
}
public void setGuideComment(String guideComment) {
this.guideComment = guideComment;
}
}
package com.gic.haoban.manage.web.qo.hm;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.NotEmpty;
import java.io.Serializable;
/**
* @Author MUSI
* @Date 2022/7/8 9:47 AM
* @Description
* @Version
**/
public class HmPageSettingReq implements Serializable {
private static final long serialVersionUID = -3759274516687664059L;
private Long pageId;
/**
* 落地页模板名称
*/
@NotEmpty(message = "落地页模板名称不能为空")
@Length(max = 20, message = "落地页模板名称长度最大为20个字符")
private String pageName;
/**
* 页面标题
*/
@Length(max = 10, message = "落地页页面标题长度最大为10个字符")
private String pageTitle;
/**
* 商户名称
*/
@Length(max = 20, message = "落地页模板商户名称长度最大为20个字符")
private String merchantName;
/**
* 商户电话号码
*/
private String merchantPhoneNumber;
/***
* 商户logo
*/
private String merchantLogo;
/**
* 页面背景
*/
private String pageBackgroundImg;
/**
* 引导语
*/
private String guideComment;
private int pageType ;
public int getPageType() {
return pageType;
}
public void setPageType(int pageType) {
this.pageType = pageType;
}
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getPageName() {
return pageName;
}
public void setPageName(String pageName) {
this.pageName = pageName;
}
public String getPageTitle() {
return pageTitle;
}
public void setPageTitle(String pageTitle) {
this.pageTitle = pageTitle;
}
public String getMerchantName() {
return merchantName;
}
public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}
public String getMerchantPhoneNumber() {
return merchantPhoneNumber;
}
public void setMerchantPhoneNumber(String merchantPhoneNumber) {
this.merchantPhoneNumber = merchantPhoneNumber;
}
public String getMerchantLogo() {
return merchantLogo;
}
public void setMerchantLogo(String merchantLogo) {
this.merchantLogo = merchantLogo;
}
public String getPageBackgroundImg() {
return pageBackgroundImg;
}
public void setPageBackgroundImg(String pageBackgroundImg) {
this.pageBackgroundImg = pageBackgroundImg;
}
public String getGuideComment() {
return guideComment;
}
public void setGuideComment(String guideComment) {
this.guideComment = guideComment;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffActiveDataVO.java
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* @description: 通讯录许可数据总览
* @Author: wenhua
* @Date: 2023/1/30 20:28
*/
public class StaffActiveDataVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private String id;
/**
* wx企业id
*/
private String wxEnterpriseId;
/**
* 已购买许可总数
*/
private Integer purchased;
/**
* 已使用许可总数
*/
private Integer used;
/**
* 未激活许可总数
*/
private Integer inactive;
/**
* 待转移许可总数
*/
private Integer transfer;
/**
* 已激活许可总数
*/
private Integer activated;
/**
* 已过期许可总数
*/
private Integer expired;
/**
* 其他占用许可总数
*/
private Integer occupy;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getPurchased() {
return purchased;
}
public void setPurchased(Integer purchased) {
this.purchased = purchased;
}
public Integer getInactive() {
return inactive;
}
public void setInactive(Integer inactive) {
this.inactive = inactive;
}
public Integer getTransfer() {
return transfer;
}
public void setTransfer(Integer transfer) {
this.transfer = transfer;
}
public Integer getActivated() {
return activated;
}
public void setActivated(Integer activated) {
this.activated = activated;
}
public Integer getExpired() {
return expired;
}
public void setExpired(Integer expired) {
this.expired = expired;
}
public Integer getOccupy() {
return occupy;
}
public void setOccupy(Integer occupy) {
this.occupy = occupy;
}
public Integer getUsed() {
return used;
}
public void setUsed(Integer used) {
this.used = used;
}
}
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* @description: 通讯录许可数据总览
* @Author: wenhua
* @Date: 2023/1/30 20:28
*/
public class StaffActiveDataVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private String id;
/**
* wx企业id
*/
private String wxEnterpriseId;
/**
* 已购买许可总数
*/
private Integer purchased;
/**
* 已使用许可总数
*/
private Integer used;
/**
* 未激活许可总数
*/
private Integer inactive;
/**
* 待转移许可总数
*/
private Integer transfer;
/**
* 已激活许可总数
*/
private Integer activated;
/**
* 已过期许可总数
*/
private Integer expired;
/**
* 其他占用许可总数
*/
private Integer occupy;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getPurchased() {
return purchased;
}
public void setPurchased(Integer purchased) {
this.purchased = purchased;
}
public Integer getInactive() {
return inactive;
}
public void setInactive(Integer inactive) {
this.inactive = inactive;
}
public Integer getTransfer() {
return transfer;
}
public void setTransfer(Integer transfer) {
this.transfer = transfer;
}
public Integer getActivated() {
return activated;
}
public void setActivated(Integer activated) {
this.activated = activated;
}
public Integer getExpired() {
return expired;
}
public void setExpired(Integer expired) {
this.expired = expired;
}
public Integer getOccupy() {
return occupy;
}
public void setOccupy(Integer occupy) {
this.occupy = occupy;
}
public Integer getUsed() {
return used;
}
public void setUsed(Integer used) {
this.used = used;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/ChatOwnerVO.java
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
public class ChatOwnerVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -5715186253031695819L;
private String staffId;
private String staffName;
private int openConcatFlag = 0;
public String getStaffId() {
return staffId;
}
public String getStaffName() {
return staffName;
}
public int getOpenConcatFlag() {
return openConcatFlag;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setOpenConcatFlag(int openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
}
package com.gic.haoban.manage.web.vo.chat;
import java.io.Serializable;
public class ChatOwnerVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -5715186253031695819L;
private String staffId;
private String staffName;
private int openConcatFlag = 0;
public String getStaffId() {
return staffId;
}
public String getStaffName() {
return staffName;
}
public int getOpenConcatFlag() {
return openConcatFlag;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public void setOpenConcatFlag(int openConcatFlag) {
this.openConcatFlag = openConcatFlag;
}
}
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