Commit 576fddfa by guos

会员标签4.0

parent ec8936fe
......@@ -19,7 +19,6 @@ public abstract class AbstractTagConsumFilter implements BaseTagFilter {
DataSourceHive dataSourceHive = new DataSourceHive(ConstantUtil.ADS_GIC_TRD_ECU_SALES_LABEL_D);
protected static JavaRDD<TrdEcuSalesLabelBean> statisticsTypeHandle(JavaRDD<TrdEcuSalesLabelBean> consumeRDD, TagConsumeRequest consumeRequest){
System.out.println("request==>"+ JSONObject.toJSONString(consumeRequest));
consumeRDD=consumeRDD.mapPartitions(data->{
List<TrdEcuSalesLabelBean> result=new ArrayList();
while (data.hasNext()){
......
......@@ -28,7 +28,6 @@ public abstract class AbstractTagConsumRecordFilter implements BaseTagFilter {
List<TrdVirtualOrderBean> result=new ArrayList();
while (data.hasNext()){
TrdVirtualOrderBean consumeRecordBean=data.next();
if(null!=request&&null!=request.getStatisticsType()){
switch (request.getStatisticsType()){
case COMMODITYBRAND:
if(request.getStatisticsValList().contains(consumeRecordBean.getEnt_id())){
......@@ -48,7 +47,6 @@ public abstract class AbstractTagConsumRecordFilter implements BaseTagFilter {
default:break;
}
}
}
return result.iterator();
});
return consumeRecordRDD;
......
......@@ -338,7 +338,6 @@ public class TagValueParser {
private static AbstractFilterRequest getConsumeRequest(List<TagConditionValDTO> conditionValDTOList) {
TagConsumeRequest request=new TagConsumeRequest();
for(TagConditionValDTO conditionValDTO:conditionValDTOList){
System.out.println("conditionValDTO==>"+JSONObject.toJSONString(conditionValDTO));
if(Pattern.compile("flag").matcher(conditionValDTO.getKey()).find()){
setStatisticsTypeHandle(request,conditionValDTO.getKey(),conditionValDTO.getVal());
}else{
......@@ -352,7 +351,6 @@ public class TagValueParser {
}
}
System.out.println("TagConsumeRequest==>"+JSONObject.toJSONString(request));
return request;
}
......@@ -564,7 +562,7 @@ public class TagValueParser {
private static void setStatisticsTypeHandle(AbstractFilterRequest request, String key, String val){
String[] keys=key.split("flag");
String[] vals=val.split(",");
switch (keys[0]){
switch (keys[0].replaceAll("\\.","")){
case TagConstant.TAG_STATISTICS_CHANNEL:
request.setStatisticsType(StatisticsType.CHANNEL);
request.setStatisticsValList(Arrays.asList(vals));
......
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