niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weixin4j-qy:NotifyMessage中的发送对象参数调整为IdParameter

Browse Source
This commit is contained in:
jinyu 2015-07-18 15:25:23 +08:00
parent 56f91c0283
commit f5e9046294
3 changed files with 29 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/XmlstreamTest.java
View File

@ -104,7 +104,7 @@ public class XmlstreamTest {
// xml2map();
// xml2order();
// System.err.println(xml2refundRecordV2());
xml2refundRecordV3();
// xml2refundRecordV3();
// object2xmlWithoutRootElement();
/*RefundRecord refundRecord = xml2refundRecordV2();
System.err.println(refundRecord);

13
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/NotifyApi.java
View File

@ -1,5 +1,7 @@
package com.foxinmy.weixin4j.qy.api;
import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.foxinmy.weixin4j.exception.WeixinException;
@ -46,9 +48,8 @@ public class NotifyApi extends QyApi {
*
* @param notify
* 客服消息对象
* @return
* 如果无权限，则本次发送失败；如果收件人不存在或未关注，发送仍然执行。两种情况下均返回无效的部分</br>
* { "errcode": 0, "errmsg": "ok", "invaliduser": "UserID1",
* @return 如果无权限，则本次发送失败；如果收件人不存在或未关注，发送仍然执行。两种情况下均返回无效的部分</br> { "errcode":
* 0, "errmsg": "ok", "invaliduser": "UserID1",
* "invalidparty":"PartyID1", "invalidtag":"TagID1" }
* @throws WeixinException
* @see <a
@ -66,10 +67,16 @@ public class NotifyApi extends QyApi {
*/
public JSONObject sendNotify(NotifyMessage notify) throws WeixinException {
NotifyTuple tuple = notify.getTuple();
Map<String, String> target = notify.getTarget().getParameter();
String msgtype = tuple.getMessageType();
JSONObject obj = (JSONObject) JSON.toJSON(notify);
obj.put("msgtype", msgtype);
obj.put(msgtype, tuple);
if (target == null || target.isEmpty()) {
obj.put("touser", "@all");
} else {
obj.putAll(target);
}
String message_send_uri = getRequestUri("message_send_uri");
Token token = tokenHolder.getToken();
WeixinResponse response = weixinClient.post(

106
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/message/NotifyMessage.java
View File

@ -1,11 +1,10 @@
package com.foxinmy.weixin4j.qy.message;
import java.io.Serializable;
import java.util.List;
import com.alibaba.fastjson.annotation.JSONField;
import com.foxinmy.weixin4j.qy.model.IdParameter;
import com.foxinmy.weixin4j.tuple.NotifyTuple;
import com.foxinmy.weixin4j.util.StringUtil;
/**
* 发送消息对象
@ -27,21 +26,7 @@ import com.foxinmy.weixin4j.util.StringUtil;
public class NotifyMessage implements Serializable {
private static final long serialVersionUID = 1219589414293000383L;
private static final char SEPARATOR = '|';
/**
* UserID列表（消息接收者，多个接收者用‘|’分隔）。特殊情况：指定为@all，则向关注该企业应用的全部成员发送
*/
private String touser;
/**
* PartyID列表，多个接受者用‘|’分隔。当touser为@all时忽略本参数
*/
private String toparty;
/**
* TagID列表，多个接受者用‘|’分隔。当touser为@all时忽略本参数
*/
private String totag;
/**
* 企业应用的id，整型。可在应用的设置页面查看
*/
@ -55,102 +40,47 @@ public class NotifyMessage implements Serializable {
*/
@JSONField(serialize = false)
private NotifyTuple tuple;
/**
* id参数
*/
@JSONField(serialize = false)
private IdParameter target;
public NotifyMessage(NotifyTuple tuple, int agentid) {
this(null, null, null, tuple, agentid, false);
this.touser = "@all";
this(agentid, tuple, new IdParameter(), false);
}
public NotifyMessage(List<String> tousers, List<String> topartys,
List<String> totags, NotifyTuple tuple, int agentid, boolean isSafe) {
if (tousers != null && !tousers.isEmpty()) {
this.touser = StringUtil.join(tousers, SEPARATOR);
}
if (topartys != null && !topartys.isEmpty()) {
this.toparty = StringUtil.join(topartys, SEPARATOR);
}
if (totags != null && !totags.isEmpty()) {
this.totag = StringUtil.join(totags, SEPARATOR);
}
public NotifyMessage(int agentid, NotifyTuple tuple, IdParameter target,
boolean isSafe) {
this.agentid = agentid;
this.safe = isSafe ? 1 : 0;
this.tuple = tuple;
}
public String getTouser() {
return touser;
}
public void setTouser(String touser) {
this.touser = touser;
}
public void setTouser(List<String> tousers) {
if (tousers != null && !tousers.isEmpty()) {
this.touser = StringUtil.join(tousers, SEPARATOR);
}
}
public String getToparty() {
return toparty;
}
public void setToparty(String toparty) {
this.toparty = toparty;
}
public void setToparty(List<String> topartys) {
if (topartys != null && !topartys.isEmpty()) {
this.toparty = StringUtil.join(topartys, SEPARATOR);
}
}
public String getTotag() {
return totag;
}
public void setTotag(String totag) {
this.totag = totag;
}
public void setTotag(List<String> totags) {
if (totags != null && !totags.isEmpty()) {
this.totag = StringUtil.join(totags, SEPARATOR);
}
}
public int getAgentid() {
return agentid;
}
public void setAgentid(int agentid) {
this.agentid = agentid;
this.target = target;
}
public int getSafe() {
return safe;
}
public void setSafe(int safe) {
this.safe = safe;
}
public void setSafe(boolean isSafe) {
this.safe = isSafe ? 1 : 0;
}
public int getAgentid() {
return agentid;
}
public NotifyTuple getTuple() {
return tuple;
}
public void setTuple(NotifyTuple tuple) {
this.tuple = tuple;
public IdParameter getTarget() {
return target;
}
@Override
public String toString() {
return "NotifyMessage [touser=" + touser + ", toparty=" + toparty
+ ", totag=" + totag + ", agentid=" + agentid + ", safe="
+ safe + ", tuple=" + tuple + "]";
return "NotifyMessage [agentid=" + agentid + ", safe=" + safe
+ ", tuple=" + tuple + ", target=" + target + "]";
}
}