|
@ -123,8 +123,9 @@ public class PushMsgTask {
|
|
|
class ConsumerTask implements Runnable {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
try {
|
|
|
while (true) {
|
|
|
|
|
|
while (true) {
|
|
|
try {
|
|
|
// 如果queue为空,则当前线程会堵塞,直到有新数据加入
|
|
|
JSONObject json = queue.take();
|
|
|
boolean wx = json.has("wx") ? json.getBoolean("wx") : false;
|
|
@ -159,10 +160,11 @@ public class PushMsgTask {
|
|
|
logger.error("消息推送失败!");
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception ex) {
|
|
|
ex.printStackTrace();
|
|
|
}
|
|
|
} catch (Exception ex) {
|
|
|
ex.printStackTrace();
|
|
|
}
|
|
|
|
|
|
}
|
|
|
}
|
|
|
|
|
@ -455,8 +457,8 @@ public class PushMsgTask {
|
|
|
keyword2.setValue(json.getString("keyword2"));
|
|
|
m.put("keyword2", keyword2);
|
|
|
logger.info("type=====>openId " + openid);
|
|
|
System.out.println("url=======type =11 =====================>"+xinurl);
|
|
|
logger.error("url=======type =11 =====================>"+xinurl);
|
|
|
System.out.println("url=======type =11 =====================>" + xinurl);
|
|
|
logger.error("url=======type =11 =====================>" + xinurl);
|
|
|
} else if (type == 12) {
|
|
|
|
|
|
temp.setUrl(url + "jtgx/html/application-msg-list.html?openid=" + openid + "&member=" + json.getString("member"));
|
|
@ -506,43 +508,43 @@ public class PushMsgTask {
|
|
|
// keyword4.setColor("#000000");
|
|
|
// keyword4.setValue(json.getString("keyword4"));
|
|
|
// m.put("keyword4", keyword4);
|
|
|
}else if(type == 14){
|
|
|
} else if (type == 14) {
|
|
|
temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
|
|
|
|
|
|
WechatTemplateData keyword1= new WechatTemplateData();
|
|
|
WechatTemplateData keyword1 = new WechatTemplateData();
|
|
|
keyword1.setColor("#000000");
|
|
|
keyword1.setValue(json.getString("keyword1"));
|
|
|
m.put("keyword1", keyword1);
|
|
|
|
|
|
WechatTemplateData keyword2= new WechatTemplateData();
|
|
|
WechatTemplateData keyword2 = new WechatTemplateData();
|
|
|
keyword2.setColor("#000000");
|
|
|
keyword2.setValue(json.getString("keyword2"));
|
|
|
m.put("keyword2", keyword2);
|
|
|
}else if(type == 15){
|
|
|
} else if (type == 15) {
|
|
|
temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
|
|
|
WechatTemplateData keyword1= new WechatTemplateData();
|
|
|
WechatTemplateData keyword1 = new WechatTemplateData();
|
|
|
keyword1.setColor("#000000");
|
|
|
keyword1.setValue(json.getString("keyword1"));
|
|
|
m.put("keyword1", keyword1);
|
|
|
}else if(type == 16){
|
|
|
} else if (type == 16) {
|
|
|
//temp.setUrl(url + "yszx/html/consulting-doctor.html?openid=" + openid + "&consult=" + json.getString("consult") + "&toUser=" + json.getString("toUser") + "&toName=" + name);
|
|
|
temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
|
|
|
WechatTemplateData keyword1= new WechatTemplateData();
|
|
|
WechatTemplateData keyword1 = new WechatTemplateData();
|
|
|
keyword1.setColor("#000000");
|
|
|
keyword1.setValue(json.getString("keyword1"));
|
|
|
m.put("keyword1", keyword1);
|
|
|
WechatTemplateData keyword2= new WechatTemplateData();
|
|
|
WechatTemplateData keyword2 = new WechatTemplateData();
|
|
|
keyword2.setColor("#000000");
|
|
|
keyword2.setValue(json.getString("keyword2"));
|
|
|
m.put("keyword2", keyword2);
|
|
|
}else if(type == 17){
|
|
|
} else if (type == 17) {
|
|
|
temp.setUrl(url + "yszx/html/consulting-doctor.html?openid=" + openid + "&consult=" + json.getString("consult") + "&toUser=" + json.getString("toUser") + "&toName=" + name);
|
|
|
temp.setTemplate_id(SystemConf.getInstance().getSystemProperties().getProperty("template_doctor_survey"));
|
|
|
WechatTemplateData keyword1= new WechatTemplateData();
|
|
|
WechatTemplateData keyword1 = new WechatTemplateData();
|
|
|
keyword1.setColor("#000000");
|
|
|
keyword1.setValue(json.getString("keyword1"));
|
|
|
m.put("keyword1", keyword1);
|
|
|
WechatTemplateData keyword2= new WechatTemplateData();
|
|
|
WechatTemplateData keyword2 = new WechatTemplateData();
|
|
|
keyword2.setColor("#000000");
|
|
|
keyword2.setValue(json.getString("keyword2"));
|
|
|
m.put("keyword2", keyword2);
|