Commit 53b38e53 by 徐高华

自建

parent 0ee65315
...@@ -16,6 +16,16 @@ public class WxEnterpriseQwDTO implements Serializable { ...@@ -16,6 +16,16 @@ public class WxEnterpriseQwDTO implements Serializable {
private String thirdCorpid; private String thirdCorpid;
private String selfSecret ; private String selfSecret ;
// 自建请求地址
private String urlHost ;
public String getUrlHost() {
return urlHost;
}
public void setUrlHost(String urlHost) {
this.urlHost = urlHost;
}
public String getSelfSecret() { public String getSelfSecret() {
return selfSecret; return selfSecret;
......
...@@ -92,6 +92,15 @@ public class TabHaobanWxEnterprise implements Serializable { ...@@ -92,6 +92,15 @@ public class TabHaobanWxEnterprise implements Serializable {
private String wxCorpid ; private String wxCorpid ;
private String openCorpid ; private String openCorpid ;
private String wxaAppid ; private String wxaAppid ;
private String urlHost ;
public String getUrlHost() {
return urlHost;
}
public void setUrlHost(String urlHost) {
this.urlHost = urlHost;
}
public String getWxaAppid() { public String getWxaAppid() {
return wxaAppid; return wxaAppid;
......
...@@ -32,6 +32,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise; ...@@ -32,6 +32,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
import com.gic.haoban.manage.service.entity.chat.TabGroupChatData; import com.gic.haoban.manage.service.entity.chat.TabGroupChatData;
import com.gic.haoban.manage.service.service.WxEnterpriseService; import com.gic.haoban.manage.service.service.WxEnterpriseService;
import com.gic.haoban.manage.service.service.chat.GroupChatDataService; import com.gic.haoban.manage.service.service.chat.GroupChatDataService;
import com.gic.haoban.manage.service.util.QwUtils;
import com.gic.wechat.api.dto.qywx.chat.GroupChatQwDataDTO; import com.gic.wechat.api.dto.qywx.chat.GroupChatQwDataDTO;
import com.gic.wechat.api.dto.qywx.chat.GroupChatQwDataItemDTO; import com.gic.wechat.api.dto.qywx.chat.GroupChatQwDataItemDTO;
import com.gic.wechat.api.service.qywx.QywxChatApiService; import com.gic.wechat.api.service.qywx.QywxChatApiService;
...@@ -128,13 +129,7 @@ public class GroupChatDataServiceImpl implements GroupChatDataService { ...@@ -128,13 +129,7 @@ public class GroupChatDataServiceImpl implements GroupChatDataService {
Date date = DateUtil.addDay(DateUtil.getStartTimeOfDay(), -1); Date date = DateUtil.addDay(DateUtil.getStartTimeOfDay(), -1);
Long time = date.getTime() / 1000; Long time = date.getTime() / 1000;
ServiceResponse<List<GroupChatQwDataDTO>> resp = null ; ServiceResponse<List<GroupChatQwDataDTO>> resp = this.qywxChatApiService.statistic(qwDTO.getThirdCorpid(), QwUtils.getSecret(qwDTO, config.getWxSuiteid()), userIdList, time, time , qwDTO.isSelf() , qwDTO.getUrlHost());
if(qwDTO.isSelf()) {
resp = this.qywxChatApiService.statisticSelf(qwDTO.getThirdCorpid(), qwDTO.getSelfSecret(), userIdList, time, time);
}else{
resp = this.qywxChatApiService.statistic(qwDTO.getThirdCorpid(), config.getWxSuiteid(), userIdList, time, time);
}
List<GroupChatQwDataDTO> dataList = resp.getResult(); List<GroupChatQwDataDTO> dataList = resp.getResult();
if (CollectionUtils.isEmpty(dataList)) { if (CollectionUtils.isEmpty(dataList)) {
if (list.size() < pageSize) { if (list.size() < pageSize) {
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
<result column="wx_corpid" property="wxCorpid"/> <result column="wx_corpid" property="wxCorpid"/>
<result column="open_corpid" property="openCorpid"/> <result column="open_corpid" property="openCorpid"/>
<result column="wxa_appid" property="wxaAppid" /> <result column="wxa_appid" property="wxaAppid" />
<result column="url_host" property="urlHost"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -51,7 +52,7 @@ ...@@ -51,7 +52,7 @@
corp_user_max, corp_full_name, subject_type, verified_end_time, corp_wxqrcode, corp_scale, corp_user_max, corp_full_name, subject_type, verified_end_time, corp_wxqrcode, corp_scale,
corp_industry, corp_sub_industry, location, auth_info, agent, agentid, appid, name, corp_industry, corp_sub_industry, location, auth_info, agent, agentid, appid, name,
square_logo_url, round_logo_url, level, bind_flag, status_flag, create_time, update_time,contact_flag,wx_secret_key,wx_secret_key_last_time,member_secret_last_time,contact_secret_last_time square_logo_url, round_logo_url, level, bind_flag, status_flag, create_time, update_time,contact_flag,wx_secret_key,wx_secret_key_last_time,member_secret_last_time,contact_secret_last_time
,member_secret,contact_secret,agree_external_userid_flag,agree_external_userid_time,external_flag,userid_flag ,wx_security_type , wx_corpid , open_corpid , auto_active_flag , wxa_appid ,member_secret,contact_secret,agree_external_userid_flag,agree_external_userid_time,external_flag,userid_flag ,wx_security_type , wx_corpid , open_corpid , auto_active_flag , wxa_appid , url_host
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
......
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