Commit 650d1da6 by guos

会员标签4.0

parent e868abef
...@@ -27,9 +27,14 @@ public class TagOnlineConsumptionStoreFilter extends AbstractTagConsumRecordFilt ...@@ -27,9 +27,14 @@ public class TagOnlineConsumptionStoreFilter extends AbstractTagConsumRecordFilt
private static TagOnlineConsumptionStoreFilter instance; private static TagOnlineConsumptionStoreFilter instance;
public static TagOnlineConsumptionStoreFilter getInstance() { public static TagOnlineConsumptionStoreFilter getInstance() {
if(null==instance){
instance=new TagOnlineConsumptionStoreFilter();
}
return instance; return instance;
} }
private TagOnlineConsumptionStoreFilter(){}
@Override @Override
public List<DataSourceEntity> necessarySourceList() { public List<DataSourceEntity> necessarySourceList() {
List<DataSourceEntity> result = new ArrayList(); List<DataSourceEntity> result = new ArrayList();
......
...@@ -24,10 +24,8 @@ public class TagFilterFactory { ...@@ -24,10 +24,8 @@ public class TagFilterFactory {
private TagFilterFactory(){} private TagFilterFactory(){}
public BaseTagFilter getTagFilter(TagConditionDTO conditionDTO){ public BaseTagFilter getTagFilter(TagConditionDTO conditionDTO){
System.out.println("conditionDTO==>"+JSONObject.toJSONString(conditionDTO));
BaseTagFilter tagFilter=null; BaseTagFilter tagFilter=null;
if(StringUtils.isNotEmpty(conditionDTO.getTagEsFieldName())){ if(StringUtils.isNotEmpty(conditionDTO.getTagEsFieldName())){
System.out.println("tagEsFieldName==>"+conditionDTO.getTagEsFieldName());
switch (conditionDTO.getTagEsFieldName()) { switch (conditionDTO.getTagEsFieldName()) {
//积分信息 //积分信息
case TagConstant.TAG_CODE_ACCUMULATED_INTEGRAL: case TagConstant.TAG_CODE_ACCUMULATED_INTEGRAL:
...@@ -154,7 +152,6 @@ public class TagFilterFactory { ...@@ -154,7 +152,6 @@ public class TagFilterFactory {
tagFilter=TagHistoryOnlineConsumptionStoreFilter.getInstance(); tagFilter=TagHistoryOnlineConsumptionStoreFilter.getInstance();
break; break;
case TagConstant.TAG_CODE_ONLINE_CONSUMPTION_STORE: case TagConstant.TAG_CODE_ONLINE_CONSUMPTION_STORE:
System.out.println("TAG_CODE_ONLINE_CONSUMPTION_STORE==>"+conditionDTO.getTagEsFieldName());
tagFilter=TagOnlineConsumptionStoreFilter.getInstance(); tagFilter=TagOnlineConsumptionStoreFilter.getInstance();
break; break;
......
...@@ -129,7 +129,6 @@ public class TagProcessManager { ...@@ -129,7 +129,6 @@ public class TagProcessManager {
public void process(boolean extractData){ public void process(boolean extractData){
System.out.println("sceneCrowdDTOList==>"+JSONObject.toJSONString(sceneCrowdDTOList));
Map<Integer, List<TagProcessEntity>> tagGroupByEnterpriseMap = new HashMap<>(); Map<Integer, List<TagProcessEntity>> tagGroupByEnterpriseMap = new HashMap<>();
Map<Long, BaseTagFilter> tagIdToFilterMap = new HashMap(); Map<Long, BaseTagFilter> tagIdToFilterMap = new HashMap();
...@@ -138,17 +137,14 @@ public class TagProcessManager { ...@@ -138,17 +137,14 @@ public class TagProcessManager {
LinkedList<TagConditionGroupDTO> conditionGroupDTOS=sceneCrowdDTO.getConditionGroupDTOList(); LinkedList<TagConditionGroupDTO> conditionGroupDTOS=sceneCrowdDTO.getConditionGroupDTOList();
for(int i=0;i<conditionGroupDTOS.size();i++){ for(int i=0;i<conditionGroupDTOS.size();i++){
System.out.println("conditionGroupDTOS.szie==>"+conditionGroupDTOS.size());
TagProcessEntity entity=new TagProcessEntity(); TagProcessEntity entity=new TagProcessEntity();
entity.enterpriseId=sceneCrowdDTO.getEnterprise_Id(); entity.enterpriseId=sceneCrowdDTO.getEnterprise_Id();
entity.tagGroupId=sceneCrowdDTO.getId(); entity.tagGroupId=sceneCrowdDTO.getId();
entity.level=i+1; entity.level=i+1;
entity.tagList=conditionGroupDTOS.get(i).getConditionInfos(); entity.tagList=conditionGroupDTOS.get(i).getConditionInfos();
System.out.println("entity==>"+JSONObject.toJSONString(entity));
for(TagConditionDTO conditionDTO:entity.tagList){//将tag同filter进行映射 for(TagConditionDTO conditionDTO:entity.tagList){//将tag同filter进行映射
BaseTagFilter tagFilter=TagFilterFactory.getInstance().getTagFilter(conditionDTO); BaseTagFilter tagFilter=TagFilterFactory.getInstance().getTagFilter(conditionDTO);
System.out.println("tagFilter==>"+tagFilter);
if(null!=tagFilter){ if(null!=tagFilter){
tagIdToFilterMap.put(conditionDTO.getTagId(),tagFilter); tagIdToFilterMap.put(conditionDTO.getTagId(),tagFilter);
/*for(DataSourceEntity sourceEntity:tagFilter.necessarySourceList()){ /*for(DataSourceEntity sourceEntity:tagFilter.necessarySourceList()){
...@@ -169,12 +165,10 @@ public class TagProcessManager { ...@@ -169,12 +165,10 @@ public class TagProcessManager {
} }
tagGroupByEnterpriseMap.get(sceneCrowdDTO.getEnterprise_Id()).add(entity); tagGroupByEnterpriseMap.get(sceneCrowdDTO.getEnterprise_Id()).add(entity);
System.out.println("tagGroupByEnterpriseMap1==>"+JSONObject.toJSONString(tagGroupByEnterpriseMap));
} }
} }
} }
System.out.println("tagGroupByEnterpriseMap==>"+JSONObject.toJSONString(tagGroupByEnterpriseMap));
//准备标签需要的数据 //准备标签需要的数据
for (Map.Entry<Integer, List<TagProcessEntity>> enterpriseTagEntry : tagGroupByEnterpriseMap.entrySet()) { for (Map.Entry<Integer, List<TagProcessEntity>> enterpriseTagEntry : tagGroupByEnterpriseMap.entrySet()) {
...@@ -182,9 +176,9 @@ public class TagProcessManager { ...@@ -182,9 +176,9 @@ public class TagProcessManager {
for (TagConditionDTO conditionDTO : processEntity.tagList) { for (TagConditionDTO conditionDTO : processEntity.tagList) {
if (tagIdToFilterMap.containsKey(conditionDTO.getTagId())) { if (tagIdToFilterMap.containsKey(conditionDTO.getTagId())) {
for (DataSourceEntity sourceEntity : tagIdToFilterMap.get(conditionDTO.getTagId()).necessarySourceList()) { for (DataSourceEntity sourceEntity : tagIdToFilterMap.get(conditionDTO.getTagId()).necessarySourceList()) {
System.out.println("enterpriseId==>"+enterpriseTagEntry.getKey()); // System.out.println("enterpriseId==>"+enterpriseTagEntry.getKey());
System.out.println("SourceKey==>"+sourceEntity.getSourceKey()); // System.out.println("SourceKey==>"+sourceEntity.getSourceKey());
System.out.println("HiveTableName==>"+sourceEntity.getHiveTableName()); // System.out.println("HiveTableName==>"+sourceEntity.getHiveTableName());
DataSourceManager.getInstance().addSourceEntity(sourceEntity, enterpriseTagEntry.getKey().intValue()); DataSourceManager.getInstance().addSourceEntity(sourceEntity, enterpriseTagEntry.getKey().intValue());
} }
} }
......
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