Merge branch 'script_gj' into 'master'
add test try catch See merge request !1132
This commit is contained in:
+29
-23
@@ -93,42 +93,48 @@ class SMSOutgoingListener extends BaseBatch {
|
|||||||
new Thread(){
|
new Thread(){
|
||||||
@Override
|
@Override
|
||||||
void run() {
|
void run() {
|
||||||
|
|
||||||
while(true){
|
while(true){
|
||||||
synchronized(TASK_QUEUE){
|
try{
|
||||||
println("..........................................-->开始消费:" + new Date().format("HH:mm:ss"))
|
synchronized(TASK_QUEUE){
|
||||||
Iterator iter = TASK_QUEUE.iterator();
|
println("..........................................-->开始消费:" + new Date().format("HH:mm:ss"))
|
||||||
while (iter.hasNext()){
|
Iterator iter = TASK_QUEUE.iterator();
|
||||||
def msg = iter.next()
|
while (iter.hasNext()){
|
||||||
def mobile = msg.getObject().mobile
|
def msg = iter.next()
|
||||||
def logs = LOG_COLL.find(new BasicDBObject("mobile",mobile)).sort(new BasicDBObject("c_date", -1)).limit(1).toArray()
|
def mobile = msg.getObject().mobile
|
||||||
if(logs.size() == 0){
|
def logs = LOG_COLL.find(new BasicDBObject("mobile",mobile)).sort(new BasicDBObject("c_date", -1)).limit(1).toArray()
|
||||||
consumerQueue(msg)
|
if(logs.size() == 0){
|
||||||
iter.remove()
|
|
||||||
}else{
|
|
||||||
def lastSendTime = (Date)logs[0].get("c_date")
|
|
||||||
long interval = new Date().getTime() - lastSendTime.getTime()
|
|
||||||
if(interval > 1000 * 60 * 2){
|
|
||||||
consumerQueue(msg)
|
consumerQueue(msg)
|
||||||
iter.remove()
|
iter.remove()
|
||||||
}else{
|
}else{
|
||||||
int count = smsSendCount(mobile, 10)
|
def lastSendTime = (Date)logs[0].get("c_date")
|
||||||
if(count < 7){
|
long interval = new Date().getTime() - lastSendTime.getTime()
|
||||||
|
if(interval > 1000 * 60 * 2){
|
||||||
consumerQueue(msg)
|
consumerQueue(msg)
|
||||||
iter.remove()
|
iter.remove()
|
||||||
}else {
|
}else{
|
||||||
println "$mobile 短信发送频繁 延后再发"
|
int count = smsSendCount(mobile, 10)
|
||||||
|
if(count < 7){
|
||||||
|
consumerQueue(msg)
|
||||||
|
iter.remove()
|
||||||
|
}else {
|
||||||
|
println "$mobile 短信发送频繁 延后再发"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(TASK_QUEUE.isEmpty()){
|
||||||
|
TASK_QUEUE.wait()
|
||||||
|
}else{
|
||||||
|
sleep(100)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(TASK_QUEUE.isEmpty()){
|
}catch(Exception e){
|
||||||
TASK_QUEUE.wait()
|
println "Error:"+e.getMessage()
|
||||||
}else{
|
|
||||||
sleep(100)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
println("..........................................")
|
println("..........................................")
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}.start()
|
}.start()
|
||||||
//从Jms队列中获取需要发送的短信任务
|
//从Jms队列中获取需要发送的短信任务
|
||||||
|
|||||||
Reference in New Issue
Block a user