Commit b4b2f008 by fudahua

队列处理逻辑变更

parent dc359804
...@@ -2,6 +2,7 @@ package com.gic.cloud.data.hook.service.impl; ...@@ -2,6 +2,7 @@ package com.gic.cloud.data.hook.service.impl;
import cn.medubi.client.utils.LogPak; import cn.medubi.client.utils.LogPak;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService; import com.ctrip.framework.apollo.ConfigService;
import com.gic.cloud.common.api.base.Page; import com.gic.cloud.common.api.base.Page;
...@@ -582,11 +583,13 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -582,11 +583,13 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
if (taskConditions.get(i).getBuildPermitted().equals(Global.YES) if (taskConditions.get(i).getBuildPermitted().equals(Global.YES)
&& !taskConditions.get(i).getEnterpriseIds().contains("ff8080816dd0385e016ddca436d01fe1")) { && !taskConditions.get(i).getEnterpriseIds().contains("ff8080816dd0385e016ddca436d01fe1")) {
if(taskConditions.get(i).getAllFields().size() >= maxFields) { if(taskConditions.get(i).getAllFields().size() >= maxFields) {
logger.info("加入相应队列-大数据队列,字段多:{}", JSONObject.toJSONString(taskConditions.get(i)));
bigTaskConditions.add(taskConditions.get(i)); bigTaskConditions.add(taskConditions.get(i));
taskConditions.remove(i); taskConditions.remove(i);
continue; continue;
} else { } else {
if(bigTaskRunningMap.isEmpty()&&CollectionUtils.isEmpty(bigTaskConditions)){ if(bigTaskRunningMap.isEmpty()&&CollectionUtils.isEmpty(bigTaskConditions)){
logger.info("加入相应队列-大数据队列:{}", JSONObject.toJSONString(taskConditions.get(i)));
bigTaskConditions.add(taskConditions.get(i)); bigTaskConditions.add(taskConditions.get(i));
taskConditions.remove(i); taskConditions.remove(i);
continue; continue;
...@@ -594,6 +597,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -594,6 +597,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
} }
//push进小队列 //push进小队列
if (CollectionUtils.isEmpty(smallConditions)||smallConditions.size()<SMALL_SIZE) { if (CollectionUtils.isEmpty(smallConditions)||smallConditions.size()<SMALL_SIZE) {
logger.info("加入相应队列-小数据队列:{}", JSONObject.toJSONString(taskConditions.get(i)));
smallConditions.add(taskConditions.get(i)); smallConditions.add(taskConditions.get(i));
taskConditions.remove(i); taskConditions.remove(i);
} }
......
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