Skip to content

G
gic-cloud
Commit 35b517a5 by fudahua
Options

feat: 取数平台过滤项

parent 032c2970
Showing with 92 additions and 5 deletions
gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/service/IFlatQueryResultService.java
...@@ -87,6 +87,14 @@ public interface IFlatQueryResultService { ...@@ -87,6 +87,14 @@ public interface IFlatQueryResultService {
*/ */
public QueryFilterInfoDTO getFlatQueryFilterInfo(String filterCode); public QueryFilterInfoDTO getFlatQueryFilterInfo(String filterCode);
/**
* 获取过滤条件数据
* @param enterpriseId
* @param filterCode
* @return
*/
public List<FilterQueryDataDTO> listBackFilter(List<String> vals,String filterCode,String enterpriseId);
public void initTask(); public void initTask();
......
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/BaseQueryFilter.java
...@@ -3,6 +3,8 @@ package com.gic.cloud.data.hook.service.deal; ...@@ -3,6 +3,8 @@ package com.gic.cloud.data.hook.service.deal;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.cloud.data.hook.api.dto.FilterQueryDataDTO; import com.gic.cloud.data.hook.api.dto.FilterQueryDataDTO;
import java.util.List;
public interface BaseQueryFilter { public interface BaseQueryFilter {
/** /**
* 获取名称 * 获取名称
...@@ -15,4 +17,11 @@ public interface BaseQueryFilter { ...@@ -15,4 +17,11 @@ public interface BaseQueryFilter {
* @return * @return
*/ */
Page<FilterQueryDataDTO> pageQueryData(QueryFilterContext context); Page<FilterQueryDataDTO> pageQueryData(QueryFilterContext context);
/**
* 回显信息
* @param context
* @return
*/
List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context);
} }
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/QueryFilterContext.java
...@@ -4,6 +4,8 @@ import com.gic.api.base.commons.BasePageInfo; ...@@ -4,6 +4,8 @@ import com.gic.api.base.commons.BasePageInfo;
import com.gic.cloud.data.hook.service.entity.QueryFilterInfo; import com.gic.cloud.data.hook.service.entity.QueryFilterInfo;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class QueryFilterContext extends BasePageInfo { public class QueryFilterContext extends BasePageInfo {
/** /**
...@@ -19,4 +21,16 @@ public class QueryFilterContext extends BasePageInfo { ...@@ -19,4 +21,16 @@ public class QueryFilterContext extends BasePageInfo {
* 搜索名称 * 搜索名称
*/ */
private String search; private String search;
/**
* 保存的值
*/
private List<String> items;
public QueryFilterInfo getQueryFilterInfo() {
return queryFilterInfo;
}
public void setQueryFilterInfo(QueryFilterInfo queryFilterInfo) {
this.queryFilterInfo = queryFilterInfo;
}
} }
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/ClerkCodeQueryFilter.java
...@@ -51,4 +51,20 @@ public class ClerkCodeQueryFilter implements BaseQueryFilter { ...@@ -51,4 +51,20 @@ public class ClerkCodeQueryFilter implements BaseQueryFilter {
ret.setResult(retList); ret.setResult(retList);
return ret; return ret;
} }
@Override
public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
List<ClerkDTO> clerkDTOS = clerkService.listClerk(context.getEnterpriseId(), context.getItems());
if (CollectionUtils.isEmpty(clerkDTOS)) {
return null;
}
List<FilterQueryDataDTO> retList = clerkDTOS.stream().map(mid -> {
FilterQueryDataDTO filterQueryDataDTO = new FilterQueryDataDTO();
filterQueryDataDTO.setShowName(mid.getClerkCode());
filterQueryDataDTO.setItemValue(mid.getClerkCode());
filterQueryDataDTO.setSubShowName(mid.getClerkName());
return filterQueryDataDTO;
}).collect(Collectors.toList());
return retList;
}
} }
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/deal/queryfilter/EnumQueryFilter.java
...@@ -8,12 +8,14 @@ import com.gic.cloud.data.hook.service.deal.BaseQueryFilter; ...@@ -8,12 +8,14 @@ import com.gic.cloud.data.hook.service.deal.BaseQueryFilter;
import com.gic.cloud.data.hook.service.deal.QueryFilterContext; import com.gic.cloud.data.hook.service.deal.QueryFilterContext;
import com.gic.cloud.data.hook.service.entity.DhFlatQueryFilterItem; import com.gic.cloud.data.hook.service.entity.DhFlatQueryFilterItem;
import com.gic.cloud.data.hook.service.entity.QueryFilterInfo; import com.gic.cloud.data.hook.service.entity.QueryFilterInfo;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@Service @Service
public class EnumQueryFilter implements BaseQueryFilter { public class EnumQueryFilter implements BaseQueryFilter {
...@@ -37,4 +39,12 @@ public class EnumQueryFilter implements BaseQueryFilter { ...@@ -37,4 +39,12 @@ public class EnumQueryFilter implements BaseQueryFilter {
Page<FilterQueryDataDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, FilterQueryDataDTO.class); Page<FilterQueryDataDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, FilterQueryDataDTO.class);
return retPage; return retPage;
} }
@Override
public List<FilterQueryDataDTO> listBackByItems(QueryFilterContext context) {
List<String> items = context.getItems();
List<DhFlatQueryFilterItem> list = dhFlatQueryFilterItemMapper.listQueryFilterItems(context.getQueryFilterInfo().getFilterId());
List<DhFlatQueryFilterItem> orgItems = list.stream().filter(mid -> items.contains(mid.getItemValue())).collect(Collectors.toList());
return EntityUtil.changeEntityListByJSON(FilterQueryDataDTO.class,orgItems);
}
} }
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java
...@@ -1564,4 +1564,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -1564,4 +1564,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
} }
return EntityUtil.changeEntityByJSON(QueryFilterInfoDTO.class, queryFilter); return EntityUtil.changeEntityByJSON(QueryFilterInfoDTO.class, queryFilter);
} }
@Override
public List<FilterQueryDataDTO> listBackFilter(List<String> vals, String filterCode, String enterpriseId) {
return null;
}
} }
gic-cloud-data-hook-service/src/test/java/Test.java
...@@ -42,7 +42,7 @@ public class Test { ...@@ -42,7 +42,7 @@ public class Test {
@org.junit.Test @org.junit.Test
public void test2(){ public void test2(){
String json="{\"allFields\":[\"is_mbr\",\"main_store_name\",\"main_store_code\",\"card_num\",\"open_card_time\",\"clerk_name\",\"add_clerk_code\",\"clerk_store_name\",\"clerk_store_code\",\"add_buddy_time\",\"create_time\"],\"amount\":1169963,\"authStoreIdList\":[],\"buildPermitted\":\"1\",\"conditions\":[{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"是否会员\",\"fieldName\":\"is_mbr\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"是\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员服务门店名称\",\"fieldName\":\"main_store_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员服务门店code\",\"fieldName\":\"main_store_code\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员卡号\",\"fieldName\":\"card_num\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"开卡时间\",\"fieldName\":\"open_card_time\",\"fieldType\":\"date\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"好友导购姓名\",\"fieldName\":\"clerk_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"好友导购code\",\"fieldName\":\"add_clerk_code\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"导购门店名称\",\"fieldName\":\"clerk_store_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"好友导购所属门店code\",\"fieldName\":\"clerk_store_code\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"2023-02-28 23:59:59\",\"fieldMark\":\"添加好友时间\",\"fieldName\":\"add_buddy_time\",\"fieldType\":\"date\",\"filterTunnel\":\"\",\"mainFilter\":\"2010-03-01 00:00:00\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"好办导购与客户建立好友关系时间\",\"fieldName\":\"create_time\",\"fieldType\":\"date\",\"filterTunnel\":\"\",\"mainFilter\":\"\"}],\"decryptFilters\":[],\"enterpriseIds\":[\"ff80808180b3c54a0180bc3df3bb4bca\"],\"execDistinct\":false,\"orderDir\":\"\",\"orderField\":\"\",\"queryDataType\":0,\"tableId\":\"extract_entwechat_detail_d\",\"taskId\":\"1678674610424\"}"; String json="{\"allFields\":[\"use_time\",\"source_integral_log_id\",\"operation_integral_log_id\",\"member_name\",\"member_sxe\",\"phone_number\",\"card_num\",\"grade_name\",\"source_integral_change\",\"interval_remark\",\"remark\",\"integral_to_fee\",\"card_name\",\"card_code\",\"card_denomination\",\"cost_value\",\"status\",\"order_store_name\",\"order_store_code\",\"order_store_group_name\",\"order_store_type\",\"order_id\",\"enterprise_id\",\"integral_channel\",\"check_store_status\"],\"amount\":4509765,\"authStoreIdList\":[],\"buildPermitted\":\"0\",\"conditions\":[{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"积分消耗时间\",\"fieldName\":\"use_time\",\"fieldType\":\"date\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"流水号\",\"fieldName\":\"source_integral_log_id\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"关联流水号\",\"fieldName\":\"operation_integral_log_id\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员姓名\",\"fieldName\":\"member_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员性别\",\"fieldName\":\"member_sxe\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":true,\"extendFilter\":\"\",\"fieldMark\":\"手机号码\",\"fieldName\":\"phone_number\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员卡号\",\"fieldName\":\"card_num\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"会员等级\",\"fieldName\":\"grade_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"积分消耗额\",\"fieldName\":\"source_integral_change\",\"fieldType\":\"number\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"事由\",\"fieldName\":\"interval_remark\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"备注\",\"fieldName\":\"remark\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"成本总额\",\"fieldName\":\"integral_to_fee\",\"fieldType\":\"number\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券名称\",\"fieldName\":\"card_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券编码\",\"fieldName\":\"card_code\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券面额\",\"fieldName\":\"card_denomination\",\"fieldType\":\"number\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券成本费用\",\"fieldName\":\"cost_value\",\"fieldType\":\"number\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"优惠券状态\",\"fieldName\":\"status\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券核销门店\",\"fieldName\":\"order_store_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券核销门店代码\",\"fieldName\":\"order_store_code\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券核销门店所属分组\",\"fieldName\":\"order_store_group_name\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券核销门店类型\",\"fieldName\":\"order_store_type\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"零售单号\",\"fieldName\":\"order_id\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"企业id\",\"fieldName\":\"enterprise_id\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"积分来源渠道\",\"fieldName\":\"integral_channel\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"},{\"enableEncrypt\":false,\"extendFilter\":\"\",\"fieldMark\":\"卡券核销门店状态\",\"fieldName\":\"check_store_status\",\"fieldType\":\"text\",\"filterTunnel\":\"\",\"mainFilter\":\"\"}],\"decryptFilters\":[\"手机号码\"],\"enterpriseIds\":[\"ff8080817d9fbda8017dc20674f47fb6\"],\"execDistinct\":false,\"orderDir\":\"\",\"orderField\":\"\",\"queryDataType\":1,\"tableId\":\"extract_integral_use_detail\",\"taskId\":\"1675670752773\"}";
FlatQueryTaskCondition condition = JSON.parseObject(json, FlatQueryTaskCondition.class); FlatQueryTaskCondition condition = JSON.parseObject(json, FlatQueryTaskCondition.class);
String fullQuery = flatQueryResultService.buildFlatQuerySQL( String fullQuery = flatQueryResultService.buildFlatQuerySQL(
false, // 下载用途 false, // 下载用途
......
gic-cloud-data-hook-service/src/test/java/com/gic/Test2.java
...@@ -5,14 +5,23 @@ import org.junit.Test; ...@@ -5,14 +5,23 @@ import org.junit.Test;
import org.redisson.api.RMap; import org.redisson.api.RMap;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.util.StringUtils;
public class Test2 { public class Test2 {
@Test @Test
public void test(){ public void test(){
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("redis-init.xml"); String str="购买/退款/退换货";
RedissonClient redisClient = RedisUtil.getRedisClient(); Integer id=10;
RMap<Object, Object> aaa = redisClient.getMap("aaa123"); String[] split = str.split("/");
aaa.put("aa","2"); for (String s : split) {
if (StringUtils.isEmpty(s)){
continue;
}
String sql="INSERT INTO `data_hook`.`dh_flat_query_filter_item` " +
"( `filter_id`, `show_name`, `item_value`, `del_flag`, `create_time`, `update_time`) " +
"VALUES ( "+id+", '"+s+"', '"+s+"', 0, now(), now());";
System.out.println(sql);
}
} }
} }
gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FlatQueryController.java
...@@ -18,6 +18,7 @@ import com.gic.cloud.data.hook.api.entity.Global; ...@@ -18,6 +18,7 @@ import com.gic.cloud.data.hook.api.entity.Global;
import com.gic.cloud.data.hook.api.service.*; import com.gic.cloud.data.hook.api.service.*;
import com.gic.cloud.data.hook.qo.FilterInfoQO; import com.gic.cloud.data.hook.qo.FilterInfoQO;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.dubbo.entity.ProviderLocalTag;
import com.gic.enterprise.api.constant.StoreWidget; import com.gic.enterprise.api.constant.StoreWidget;
import com.gic.enterprise.api.dto.EnterpriseSettingDTO; import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
import com.gic.enterprise.api.dto.StoreWidgetDTO; import com.gic.enterprise.api.dto.StoreWidgetDTO;
...@@ -180,6 +181,21 @@ public class FlatQueryController { ...@@ -180,6 +181,21 @@ public class FlatQueryController {
return RestResponse.successResult(retPage); return RestResponse.successResult(retPage);
} }
/** 查询条件回显
* @return
*/
@RequestMapping("/flat-query-filter-show-back")
public RestResponse<List<FilterQueryDataDTO>> flatQueryFilterShowBack(@RequestBody ) {
String enterpriseId = SessionContextUtils.getLoginUserEnterpriseId();
if (StringUtils.isEmpty(enterpriseId)) {
return RestResponse.failure("4","企业不存在");
}
// flatQueryResultService.pageFlatQueryFilterNew(enterpriseId, filterInfoQO.getFilterCode(), filterInfoQO.getSearch(), filterInfoQO.getBasePageInfo());
return RestResponse.successResult();
}
/** 执行自助查询 /** 执行自助查询
* @param executeRequest * @param executeRequest
* @param request * @param request
......
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