Merge remote-tracking branch 'origin/master'

src/main/java/ieven/server/webapp/domain/model/ModelService.java

@@ -75,12 +75,22 @@ public class ModelService {
             return Mapped.ERROR("模型名不能为空!");
         } else {
             Model model = this.mongoTemplate.findOne(new Query(Criteria.where("modelName").is(input.getModelName())), Model.class);
+            Model model1 = this.mongoTemplate.findOne(new Query(Criteria.where("_id").is(input.getId())), Model.class);
             if (model != null) {
                 return Mapped.ERROR("禁止更改同名的模型!");
             } else {
                 Query query = new Query(Criteria.where("_id").is(input.getId()));
                 Update update = (new Update()).set("modelName", input.getModelName());
                 UpdateResult result = this.mongoTemplate.updateFirst(query, update, Model.class);
+
+                //修改文件名称
+                File oldFile = new File(path+File.pathSeparator+model1.getModelName()+".xlsx");
+                File newFile = new File(path+File.pathSeparator+input.getModelName()+".xlsx");
+                if (oldFile.renameTo(newFile)) {
+                    System.out.println("文件名修改成功");
+                } else {
+                    System.out.println("文件名修改失败");
+                }
                 return result.getModifiedCount() > 0L ? Mapped.OK() : Mapped.ERROR("更新失败");
             }
         }

src/main/java/ieven/server/webapp/service/datastatic/DataStaticService.java

@@ -101,6 +101,7 @@ 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("数据分析-主体信息汇总明细不存在");
         }
@@ -115,19 +116,19 @@ public class DataStaticService extends Ops {
                         .is(dateFileIdUserTotal))), DataMap.class);
         if (CollectionUtils.isNotEmpty(dataMapsZt)) {
             for (DataMap dataMap : dataMapsZt) {
-                String jyzthm = String.valueOf(dataMap.get("交易主体户名"));
+                String jyzthm = StringUtils.isBlank(String.valueOf(dataMap.get("交易主体户名")))?String.valueOf(dataMap.get("交易主体账号")):String.valueOf(dataMap.get("交易主体户名"));
                 if (!PublicStatic.checkStr(jyzthm)) {
                     String[] split = jyzthm.split(";");
                     for (int i = 0; i < split.length; i++) {
-                        String s=split[i];
+                        String s = split[i];
                         List<DataMap> dataMaps = personzhmcMap.get(s);
                         if (CollectionUtils.isEmpty(dataMaps)) {
-                            DataMap datamapnew =new DataMap();
+                            DataMap datamapnew = new DataMap();
                             dataMaps = new ArrayList<>();
                             datamapnew.putAll(dataMap);
-                            String id = String.valueOf(dataMap.get("_id"))+i;
-                            datamapnew.put("_id",id);
-                            datamapnew.put("交易主体户名",s);
+                            String id = String.valueOf(dataMap.get("_id")) + i;
+                            datamapnew.put("_id", id);
+                            datamapnew.put("交易主体户名", s);
                             dataMaps.add(datamapnew);
                             personzhmcMap.put(s, dataMaps);
                         }
@@ -176,193 +177,212 @@ 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()){
+        if (null == staticModelInput.getStartNum()) {
             staticModelInput.setStartNum(2);
         }
-        if(null==staticModelInput.getEndNum()){
+        if (null == staticModelInput.getEndNum()) {
             staticModelInput.setEndNum(999999);
         }
-        if (StringUtils.isNotBlank(staticModelInput.getJyztzhds())) {
-            query.addCriteria(Criteria.where("交易对手账号").in(Objects.requireNonNull(SplitCharacterEnum.splitByCharacter(staticModelInput.getJyztzhds()))));
+        if (null != staticModelInput.getStartNum() && null != staticModelInput.getEndNum()) {
+            Query queryDs = new Query();
+            queryDs.addCriteria(Criteria.where("共同交易主体数").gte(staticModelInput.getStartNum()).lte(staticModelInput.getEndNum()));
+            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);
+                    }
+                }
+            }
         }
 
-        Map<String, Object> dataMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(strings1)) {
+                query.addCriteria(Criteria.where("交易对手账号").in(Objects.requireNonNull(strings1)));
+            } else {
+                return Mapped.ERROR("当前无数据");
+            }
+            Map<String, Object> dataMap = new HashMap<>();
 
-        List<Map<String, Object>> partyDataList = new ArrayList<>();
-        List<Map<String, Object>> relationshipGraphList = new ArrayList<>();
-        List<Map<String, Object>> relationshipGraphListnew = new ArrayList<>();
-        List<DataMap> dataMapDetail = this.mongoTemplate.find(query, DataMap.class);
-        //先去判断从是否有大于2的数据
+            List<Map<String, Object>> partyDataList = new ArrayList<>();
+            List<Map<String, Object>> relationshipGraphList = new ArrayList<>();
+            List<Map<String, Object>> relationshipGraphListnew = new ArrayList<>();
+            List<DataMap> dataMapDetail = this.mongoTemplate.find(query, DataMap.class);
+            //先去判断从是否有大于2的数据
 
-        Map<String, List<DataMap>> dsMap = new HashMap<>();
+            Map<String, List<DataMap>> dsMap = 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("交易主体户名"));
-            if (PublicStatic.checkStr(jydszh) || PublicStatic.checkStr(jyzthm)) {
-                continue;
-            }
-            Set<String> strings = zh.get(jydszh);
-            if (CollectionUtils.isEmpty(strings)) {
-                strings = new HashSet<>();
-                strings.add(jyzthm);
-            } else {
-                strings.add(jyzthm);
-            }
-            zh.put(jydszh, strings);
+            Map<String, Set<String>> zh = new HashMap<>();
+            for (DataMap map : dataMapDetail) {
+                String jydszh = String.valueOf(map.get("交易对手账号"));
+                String jyzthm = String.valueOf(map.get("交易主体户名"));
+                if (PublicStatic.checkStr(jydszh) || PublicStatic.checkStr(jyzthm)) {
+                    continue;
+                }
+                Set<String> strings = zh.get(jydszh);
+                if (CollectionUtils.isEmpty(strings)) {
+                    strings = new HashSet<>();
+                    strings.add(jyzthm);
+                } else {
+                    strings.add(jyzthm);
+                }
+                zh.put(jydszh, strings);
 
-            List<DataMap> dataMaps1 = Optional.ofNullable(dsMap.get(jydszh)).orElse(new ArrayList<DataMap>());
-            dataMaps1.add(map);
-            dsMap.put(jydszh, dataMaps1);
-        }
-        if (dsMap == null) {
-            return Mapped.ERROR("数据有误,请重新查询");
-        }
-        List<DataMap> newList = Lists.newArrayList();
-        for (Map.Entry<String, Set<String>> entry : zh.entrySet()) {
-            if(entry.getValue().size()>=staticModelInput.getStartNum()&&entry.getValue().size()<=staticModelInput.getEndNum()){
-                List<DataMap> dataMaps1 = dsMap.get(entry.getKey());
-                newList.addAll(dataMaps1);
+                List<DataMap> dataMaps1 = Optional.ofNullable(dsMap.get(jydszh)).orElse(new ArrayList<DataMap>());
+                dataMaps1.add(map);
+                dsMap.put(jydszh, dataMaps1);
             }
-        }
-
-        List<String> userList = new ArrayList<>();
-        List<String> usermcList = new ArrayList<>();
-        List<String> userAllList = new ArrayList<>();
-        for (DataMap map : newList) {
-            String jythm = String.valueOf(map.get("交易主体户名"));
-            String jydszh = String.valueOf(map.get("交易对手账号"));
-            if (StringUtils.isBlank(jythm) || "null".equals(jythm)) {
-                continue;
+            if (dsMap == null) {
+                return Mapped.ERROR("数据有误,请重新查询");
             }
-            String jdlx = String.valueOf(map.get("借贷类型"));
-            if (!jdlx.equals("借") && !jdlx.equals("贷")) {
-                log.error("借贷类型有误");
-                continue;
+            List<DataMap> newList = Lists.newArrayList();
+            for (Map.Entry<String, Set<String>> entry : zh.entrySet()) {
+                if (entry.getValue().size() >= staticModelInput.getStartNum() && entry.getValue().size() <= staticModelInput.getEndNum()) {
+                    List<DataMap> dataMaps1 = dsMap.get(entry.getKey());
+                    newList.addAll(dataMaps1);
+                }
             }
 
-            //获取节点名称
-            List<DataMap> dataMapsparty1 = personzhmcMap.get(jythm);
-            List<DataMap> dataMapsparty2 = personMap.get(jydszh);
-            if (CollectionUtils.isEmpty(dataMapsparty1) || CollectionUtils.isEmpty(dataMapsparty2)) {
-                continue;
-            }
-            if (!usermcList.contains(jythm)) {
-                Map<String, Object> userMap = new HashMap<>();
-                if (CollectionUtils.isNotEmpty(dataMapsparty1)) {
-                    userMap.put("id", String.valueOf(dataMapsparty1.get(0).get("_id")));
-                    userMap.put("name", dataMapsparty1.get(0).get("交易主体户名"));
-                    userMap.put("relationPersons", dataMapsparty1);
-                    userMap.put("type", "主");
-                    partyDataList.add(userMap);
-                    usermcList.add(jythm);
+            List<String> userList = new ArrayList<>();
+            List<String> usermcList = new ArrayList<>();
+            List<String> userAllList = new ArrayList<>();
+            for (DataMap map : newList) {
+                String jythm = String.valueOf(map.get("交易主体户名"));
+                String jydszh = String.valueOf(map.get("交易对手账号"));
+                if (StringUtils.isBlank(jythm) || "null".equals(jythm)) {
+                    continue;
+                }
+                String jdlx = String.valueOf(map.get("借贷类型"));
+                if (!jdlx.equals("借") && !jdlx.equals("贷")) {
+                    log.error("借贷类型有误");
+                    continue;
                 }
-            }
 
-            if (!userList.contains(jydszh)) {
-                Map<String, Object> userMap = new HashMap<>();
-                if (CollectionUtils.isNotEmpty(dataMapsparty2)) {
-                    String cid = String.valueOf(dataMapsparty2.get(0).get("_id"));
-                    userMap.put("id", cid);
-                    userMap.put("name", dataMapsparty2.get(0).get("账号"));
-                    userMap.put("relationPersons", dataMapsparty2);
-                    userMap.put("type", "从");
-                    partyDataList.add(userMap);
-                    userList.add(jydszh);
+                //获取节点名称
+                List<DataMap> dataMapsparty1 = personzhmcMap.get(jythm);
+                List<DataMap> dataMapsparty2 = personMap.get(jydszh);
+                if (CollectionUtils.isEmpty(dataMapsparty1) || CollectionUtils.isEmpty(dataMapsparty2)) {
+                    continue;
                 }
-            }
-            //增加线上数据
-            Map<String, Object> total = new HashMap<>();
-            Map<String, Object> party1 = new HashMap<>();
-            Map<String, Object> party2 = new HashMap<>();
-            Map<String, Object> relationData = new HashMap<>();
-
-            String userAllId = "";
-            if (jdlx.equals("借")) {
-                List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
-                List<DataMap> dataMaps2 = personMap.get(jydszh);
-                if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
-                    String one = String.valueOf(dataMaps1.get(0).get("_id"));
-                    party1.put("id", one);
-                    party1.put("name", dataMaps1.get(0).get("交易主体户名"));
-
-                    String two = String.valueOf(dataMaps2.get(0).get("_id"));
-                    party2.put("id", two);
-                    party2.put("name", dataMaps2.get(0).get("账号"));
-                    userAllId = one + "-" + two;
+                if (!usermcList.contains(jythm)) {
+                    Map<String, Object> userMap = new HashMap<>();
+                    if (CollectionUtils.isNotEmpty(dataMapsparty1)) {
+                        userMap.put("id", String.valueOf(dataMapsparty1.get(0).get("_id")));
+                        userMap.put("name", dataMapsparty1.get(0).get("交易主体户名"));
+                        userMap.put("relationPersons", dataMapsparty1);
+                        userMap.put("type", "主");
+                        partyDataList.add(userMap);
+                        usermcList.add(jythm);
+                    }
                 }
 
-            } else if (jdlx.equals("贷")) {
-                List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
-                List<DataMap> dataMaps2 = personMap.get(jydszh);
-                if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
-                    String two = String.valueOf(dataMaps1.get(0).get("_id"));
-                    party2.put("id", String.valueOf(dataMaps1.get(0).get("_id")));
-                    party2.put("name", dataMaps1.get(0).get("交易主体户名"));
-
-                    String one = String.valueOf(dataMaps2.get(0).get("_id"));
-                    party1.put("id", String.valueOf(dataMaps2.get(0).get("_id")));
-                    party1.put("name", dataMaps2.get(0).get("账号"));
-                    userAllId = one + "-" + two;
+                if (!userList.contains(jydszh)) {
+                    Map<String, Object> userMap = new HashMap<>();
+                    if (CollectionUtils.isNotEmpty(dataMapsparty2)) {
+                        String cid = String.valueOf(dataMapsparty2.get(0).get("_id"));
+                        userMap.put("id", cid);
+                        userMap.put("name", dataMapsparty2.get(0).get("账号"));
+                        userMap.put("relationPersons", dataMapsparty2);
+                        userMap.put("type", "从");
+                        partyDataList.add(userMap);
+                        userList.add(jydszh);
+                    }
                 }
-            }
-            if (!userAllList.contains(userAllId)) {
-                //查询所有的数据
-                //查询所有的主体信息汇总
-                BigDecimal sum = BigDecimal.ZERO;
-                List<DataMap> dataDetailList = this.mongoTemplate.find((new Query(
-                        Criteria.where("fileId")
-                                .is(dateFileId)
-                                .and("交易主体户名")
-                                .is(jythm)
-                                .and("交易对手账号")
-                                .is(jydszh))), DataMap.class);
-                for (DataMap dataMap1 : dataDetailList) {
-                    String jyje = String.valueOf(dataMap1.get("交易金额"));
-                    sum = sum.add(new BigDecimal(jyje));
+                //增加线上数据
+                Map<String, Object> total = new HashMap<>();
+                Map<String, Object> party1 = new HashMap<>();
+                Map<String, Object> party2 = new HashMap<>();
+                Map<String, Object> relationData = new HashMap<>();
+
+                String userAllId = "";
+                if (jdlx.equals("借")) {
+                    List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
+                    List<DataMap> dataMaps2 = personMap.get(jydszh);
+                    if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
+                        String one = String.valueOf(dataMaps1.get(0).get("_id"));
+                        party1.put("id", one);
+                        party1.put("name", dataMaps1.get(0).get("交易主体户名"));
+
+                        String two = String.valueOf(dataMaps2.get(0).get("_id"));
+                        party2.put("id", two);
+                        party2.put("name", dataMaps2.get(0).get("账号"));
+                        userAllId = one + "-" + two;
+                    }
+
+                } else if (jdlx.equals("贷")) {
+                    List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
+                    List<DataMap> dataMaps2 = personMap.get(jydszh);
+                    if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
+                        String two = String.valueOf(dataMaps1.get(0).get("_id"));
+                        party2.put("id", String.valueOf(dataMaps1.get(0).get("_id")));
+                        party2.put("name", dataMaps1.get(0).get("交易主体户名"));
+
+                        String one = String.valueOf(dataMaps2.get(0).get("_id"));
+                        party1.put("id", String.valueOf(dataMaps2.get(0).get("_id")));
+                        party1.put("name", dataMaps2.get(0).get("账号"));
+                        userAllId = one + "-" + two;
+                    }
                 }
-                relationData.put("modelId", modelId);
-                relationData.put("fileId", dateFileId);
-                relationData.put("jythm", jythm);
-                relationData.put("jydszh", jydszh);
-                relationData.put("jeTotal", sum);
-                relationData.put("sum", dataDetailList.size());
-                total.put("party1", party1);
-                total.put("party2", party2);
-                total.put("relationData", relationData);
-                total.put("userAllId", userAllId);
-                //total.put("relationships", dataDetailList);
-                relationshipGraphList.add(total);
-                userAllList.add(userAllId);
-                if (partyDataList.size() > 400) {
-                    return Mapped.ERROR("节点超过400个,请重新查询");
+                if (!userAllList.contains(userAllId)) {
+                    //查询所有的数据
+                    //查询所有的主体信息汇总
+                    BigDecimal sum = BigDecimal.ZERO;
+                    List<DataMap> dataDetailList = this.mongoTemplate.find((new Query(
+                            Criteria.where("fileId")
+                                    .is(dateFileId)
+                                    .and("交易主体户名")
+                                    .is(jythm)
+                                    .and("交易对手账号")
+                                    .is(jydszh))), DataMap.class);
+                    for (DataMap dataMap1 : dataDetailList) {
+                        String jyje = String.valueOf(dataMap1.get("交易金额"));
+                        sum = sum.add(new BigDecimal(jyje));
+                    }
+                    relationData.put("modelId", modelId);
+                    relationData.put("fileId", dateFileId);
+                    relationData.put("jythm", jythm);
+                    relationData.put("jydszh", jydszh);
+                    relationData.put("jeTotal", sum);
+                    relationData.put("sum", dataDetailList.size());
+                    total.put("party1", party1);
+                    total.put("party2", party2);
+                    total.put("relationData", relationData);
+                    total.put("userAllId", userAllId);
+                    //total.put("relationships", dataDetailList);
+                    relationshipGraphList.add(total);
+                    userAllList.add(userAllId);
+                    if (partyDataList.size() > 400) {
+                        return Mapped.ERROR("节点超过400个,请重新查询");
+                    }
                 }
             }
-        }
             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"));
-            String name2 = String.valueOf(party2.get("name"));
-            String value1 = name2 + "-" + name1;
-            stringObjectMap.put("type", 1);
-            for (Map<String, Object> objectMap : relationshipGraphList) {
-                Map<String, Object> party11 = (Map) objectMap.get("party1");
-                Map<String, Object> party21 = (Map) objectMap.get("party2");
-                String name11 = String.valueOf(party11.get("name"));
-                String name21 = String.valueOf(party21.get("name"));
-                String value11 = name11 + "-" + name21;
-                if (value1.equals(value11)) {
-                    stringObjectMap.put("type", 2);
-                    continue;
+                Map<String, Object> party1 = (Map) stringObjectMap.get("party1");
+                Map<String, Object> party2 = (Map) stringObjectMap.get("party2");
+                String name1 = String.valueOf(party1.get("name"));
+                String name2 = String.valueOf(party2.get("name"));
+                String value1 = name2 + "-" + name1;
+                stringObjectMap.put("type", 1);
+                for (Map<String, Object> objectMap : relationshipGraphList) {
+                    Map<String, Object> party11 = (Map) objectMap.get("party1");
+                    Map<String, Object> party21 = (Map) objectMap.get("party2");
+                    String name11 = String.valueOf(party11.get("name"));
+                    String name21 = String.valueOf(party21.get("name"));
+                    String value11 = name11 + "-" + name21;
+                    if (value1.equals(value11)) {
+                        stringObjectMap.put("type", 2);
+                        continue;
+                    }
                 }
-            }
-            relationshipGraphListnew.add(stringObjectMap);
+                relationshipGraphListnew.add(stringObjectMap);
 
-        }
+            }
 
       /*  Map<String,String>aa=new HashMap<>();
         List<Map<String, Object>> partyDataListnew = new ArrayList<>();
@@ -375,10 +395,10 @@ public class DataStaticService extends Ops {
             aa.put(id+name,id+name);
             partyDataListnew.add(stringObjectMap);
         }*/
-        dataMap.put("partyData", partyDataList);
-        dataMap.put("relationshipGraph", relationshipGraphListnew);
-        Mapped mapped = Mapped.OK();
-        mapped.put("result", dataMap);
-        return mapped;
-    }
+            dataMap.put("partyData", partyDataList);
+            dataMap.put("relationshipGraph", relationshipGraphListnew);
+            Mapped mapped = Mapped.OK();
+            mapped.put("result", dataMap);
+            return mapped;
+        }
 }