|
|
@@ -101,7 +101,6 @@ public class DataStaticService extends Ops {
|
|
|
String dateFileId = getFileId("数据分析-主体信息汇总明细", modelId, mongoTemplate);
|
|
|
String dateFileIdUser = getFileId("数据分析-所有主体信息汇总", modelId, mongoTemplate);
|
|
|
String dateFileIdUserTotal = getFileId("数据分析-主体信息汇总", modelId, mongoTemplate);
|
|
|
- String dateFileIdDs = getFileId("数据分析-对手透视", modelId, mongoTemplate);
|
|
|
if (StringUtils.isBlank(dateFileId)) {
|
|
|
return Mapped.ERROR("数据分析-主体信息汇总明细不存在");
|
|
|
}
|
|
|
@@ -157,7 +156,7 @@ public class DataStaticService extends Ops {
|
|
|
Query query = new Query();
|
|
|
//Pattern compile = Pattern.compile("^((?!" + "张"+ ").)*$",Pattern.CASE_INSENSITIVE);
|
|
|
query.addCriteria(Criteria.where("fileId").is(dateFileId));
|
|
|
- query.addCriteria(new Criteria().andOperator(getQuery()));
|
|
|
+ query.addCriteria(new Criteria().andOperator(PublicStatic.getQuery()));
|
|
|
if (StringUtils.isNotBlank(staticModelInput.getJyztzh())) {
|
|
|
query.addCriteria(Criteria.where("交易主体账号").in(Objects.requireNonNull(SplitCharacterEnum.splitByCharacter(staticModelInput.getJyztzh()))));
|
|
|
}
|
|
|
@@ -177,39 +176,16 @@ public class DataStaticService extends Ops {
|
|
|
if (StringUtils.isNotBlank(staticModelInput.getJysjEnd()) && StringUtils.isNotBlank(staticModelInput.getJysjStart())) {
|
|
|
query.addCriteria(Criteria.where("交易时间").gte(staticModelInput.getJysjStart()).lte(staticModelInput.getJysjEnd()));
|
|
|
}
|
|
|
- List<String> strings1 = SplitCharacterEnum.splitByCharacter(staticModelInput.getJyztzhds());
|
|
|
+ //List<String> strings1 = SplitCharacterEnum.splitByCharacter(staticModelInput.getJyztzhds());
|
|
|
|
|
|
if(null==staticModelInput.getStartNum()){
|
|
|
staticModelInput.setStartNum(2);
|
|
|
}
|
|
|
- if (null != staticModelInput.getStartNum() || null != staticModelInput.getEndNum()) {
|
|
|
- Query queryDs = new Query();
|
|
|
- if (null != staticModelInput.getStartNum()) {
|
|
|
- queryDs.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()));
|
|
|
- } else if (null != staticModelInput.getEndNum()) {
|
|
|
- queryDs.addCriteria(Criteria.where("共同交易主体户名汇总").lte(staticModelInput.getStartNum()));
|
|
|
- } else if (null != staticModelInput.getStartNum() && null != staticModelInput.getEndNum()) {
|
|
|
- queryDs.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()).lte(staticModelInput.getStartNum()));
|
|
|
- }
|
|
|
- queryDs.addCriteria(Criteria.where("fileId").is(dateFileIdDs));
|
|
|
- List<DataMap> dataDsList = this.mongoTemplate.find(queryDs, DataMap.class);
|
|
|
- if(CollectionUtils.isNotEmpty(dataDsList)){
|
|
|
- for (DataMap dataMap : dataDsList) {
|
|
|
- String jydszh = String.valueOf(dataMap.get("交易对手账号"));
|
|
|
- if(!PublicStatic.checkStr(jydszh)){
|
|
|
- if(CollectionUtils.isEmpty(strings1)){
|
|
|
- strings1=new ArrayList<>();
|
|
|
- }
|
|
|
- strings1.add(jydszh);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ if(null==staticModelInput.getEndNum()){
|
|
|
+ staticModelInput.setEndNum(999999);
|
|
|
}
|
|
|
-
|
|
|
- if (CollectionUtils.isNotEmpty(strings1)) {
|
|
|
- query.addCriteria(Criteria.where("交易对手账号").in(Objects.requireNonNull(strings1)));
|
|
|
- }else {
|
|
|
- return Mapped.ERROR("当前无数据");
|
|
|
+ if (StringUtils.isNotBlank(staticModelInput.getJyztzhds())) {
|
|
|
+ query.addCriteria(Criteria.where("交易对手账号").in(Objects.requireNonNull(SplitCharacterEnum.splitByCharacter(staticModelInput.getJyztzhds()))));
|
|
|
}
|
|
|
|
|
|
Map<String, Object> dataMap = new HashMap<>();
|
|
|
@@ -222,7 +198,7 @@ public class DataStaticService extends Ops {
|
|
|
|
|
|
Map<String, List<DataMap>> dsMap = new HashMap<>();
|
|
|
|
|
|
- /* Map<String, Set<String>> zh = new HashMap<>();
|
|
|
+ Map<String, Set<String>> zh = new HashMap<>();
|
|
|
for (DataMap map : dataMapDetail) {
|
|
|
String jydszh = String.valueOf(map.get("交易对手账号"));
|
|
|
String jyzthm = String.valueOf(map.get("交易主体户名"));
|
|
|
@@ -247,16 +223,16 @@ public class DataStaticService extends Ops {
|
|
|
}
|
|
|
List<DataMap> newList = Lists.newArrayList();
|
|
|
for (Map.Entry<String, Set<String>> entry : zh.entrySet()) {
|
|
|
- if (entry.getValue().size() > 1) {
|
|
|
+ if(entry.getValue().size()>=staticModelInput.getStartNum()&&entry.getValue().size()<=staticModelInput.getEndNum()){
|
|
|
List<DataMap> dataMaps1 = dsMap.get(entry.getKey());
|
|
|
newList.addAll(dataMaps1);
|
|
|
}
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
List<String> userList = new ArrayList<>();
|
|
|
List<String> usermcList = new ArrayList<>();
|
|
|
List<String> userAllList = new ArrayList<>();
|
|
|
- for (DataMap map : dataMapDetail) {
|
|
|
+ for (DataMap map : newList) {
|
|
|
String jythm = String.valueOf(map.get("交易主体户名"));
|
|
|
String jydszh = String.valueOf(map.get("交易对手账号"));
|
|
|
if (StringUtils.isBlank(jythm) || "null".equals(jythm)) {
|
|
|
@@ -366,7 +342,7 @@ public class DataStaticService extends Ops {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- for (Map<String, Object> stringObjectMap : relationshipGraphList) {
|
|
|
+ for (Map<String, Object> stringObjectMap : relationshipGraphList) {
|
|
|
Map<String, Object> party1 = (Map) stringObjectMap.get("party1");
|
|
|
Map<String, Object> party2 = (Map) stringObjectMap.get("party2");
|
|
|
String name1 = String.valueOf(party1.get("name"));
|
|
|
@@ -405,25 +381,4 @@ public class DataStaticService extends Ops {
|
|
|
mapped.put("result", dataMap);
|
|
|
return mapped;
|
|
|
}
|
|
|
-
|
|
|
- public List<Criteria> getQuery() {
|
|
|
- List<Criteria> dataList = new ArrayList<>();
|
|
|
- List<String> filedsList = Lists.newArrayList("交易对手账号", "交易对手户名");
|
|
|
- List<String> noQueryData = Lists.newArrayList(
|
|
|
- "公司", "慈善", "红十字", "店", "工作室", "商行", "中心", "经营部", "水果行", "餐厅", "超市", "市场", "商贸", "西饼屋", "科技", "酒楼", "停车场", "ETC", "etc", "服务", "批发",
|
|
|
- "渔场", "浴场", "设计", "物业", "咨询", "批发", "合作社", "工厂", "鞋厂", "动物园", "植物园", "土黑猪", "猫狗", "学校", "学院", "大学", "棋牌", "娱乐", "袜厂", "制品厂", "加油站",
|
|
|
- "体育馆", "研究所", "保健院", "龙虾", "羊蝎子", "足道", "公安局", "税务局", "法院", "菜馆", "棋牌", "水产行", "海鲜行", "公司", "服饰", "服装", "基金", "宠物", "车行", "保险", "理财",
|
|
|
- "支付宝", "财付通", "apple", "烟酒", "经营者", "商户", "null", "借呗", "花呗", "网商银行", "LIMITED", "INC.", "幼儿园", "备用金", "淘宝现金红包", "基金蚂蚁", "耐克", "航空", "滴滴出行", "果格",
|
|
|
- "拉扎斯", "网络科技", "字节跳动", "Incorporated", "Limited", "道达尔", "欧莱雅", "星巴克", "咖啡", "实业", "百胜餐饮", "优酷", "爱奇艺", "挚享科技", "云账户", "吱信"
|
|
|
- );
|
|
|
- for (String s : filedsList) {
|
|
|
- for (String noQueryDatum : noQueryData) {
|
|
|
- Criteria newCri = new Criteria(s);
|
|
|
- Pattern compile = Pattern.compile("^((?!" + noQueryDatum + ").)*$", Pattern.CASE_INSENSITIVE);
|
|
|
- newCri.regex(compile);
|
|
|
- dataList.add(newCri);
|
|
|
- }
|
|
|
- }
|
|
|
- return dataList;
|
|
|
- }
|
|
|
}
|
hankunkun