Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1322,7 +1322,7 @@ public class ImService {
	 * @param type
	 * @return
	 */
	public Integer sessionCountByType(String userid,Integer type){
		return imUtil.sessionCountByType(userid,type);
	public Integer sessionCountByType(String userid,Integer type,Integer status){
		return imUtil.sessionCountByType(userid,type,status);
	}
}

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -683,10 +683,11 @@ public class ImUtil {
	 *按会话类型获取会话总数
	 * @param userid
	 * @param type
	 * @param status
	 * @return
	 */
	public Integer sessionCountByType(String userid,Integer type){
		String url = im_host + "api/v2/sessions/sessionCountByType?user_id="+userid+"&type="+type;
	public Integer sessionCountByType(String userid,Integer type,Integer status){
		String url = im_host + "api/v2/sessions/sessionCountByType?user_id="+userid+"&type="+type+"&status="+status;
		String ret = HttpClientUtil.get(url,"utf-8");
		JSONObject obj = JSON.parseObject(ret);
		if(obj.getInteger("status") ==200){