From c8e611147a7680252568ff5d878b93d577967c02 Mon Sep 17 00:00:00 2001 From: wxy <1229384355@qq.com> Date: Wed, 27 Jul 2022 09:31:32 +0800 Subject: [PATCH] 修改报错 --- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java index 6e9bba6..6a4c7df 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java @@ -167,98 +167,98 @@ public class getRandomId { /** * 测试 */ - public static void main(String[] args) { - long startTime = System.currentTimeMillis(); - Set familys = new HashSet<>(); - //存放已经被放入minor里面的户号，避免数据重复 - Set houseSet=new HashSet<>(); - Map minors=getMinors(); - Map> familyMaps=getFamilyMaps(); - if (oConvertUtils.isNotEmpty(minors)) { - for (Map.Entry m : minors.entrySet()) { - String idCard = m.getKey(); - Minor minor = m.getValue(); - Set f=new HashSet<>(); - //判断是否是一个家庭的人员 - if (oConvertUtils.isNotEmpty(minor.getHouseholdNum())) { - String houseNum = minor.getHouseholdNum(); - if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(houseNum)) ){ - if(!houseSet.contains(houseNum) ){ - familys.addAll(familyMaps.get(houseNum)); - houseSet.add(houseNum); - } - } - minor.setFamilies(f); - } - } - } - long endTime = System.currentTimeMillis(); - - System.out.println("endTime-startTime:" + (endTime - startTime)); - } - public static Map> getFamilyMaps(){ - Map> familyMaps=new HashMap<>(); - List familys=getFamilys(); - for(int i=0;i list = new ArrayList<>(); - list.add(family); - familyMaps.put(family.getHouseholdNum(),list); - } - - } - } - return familyMaps; - - } - - public static List getFamilys(){ - List familys=new ArrayList<>(); - for(int i=0;i<25;i++){ - Family f=new Family(); - if(i<5){ - f.setIdentity("#####################"+i); - f.setHouseholdNum("**************house"+0); - }else if(i<10){ - f.setIdentity("#####################"+i); - f.setHouseholdNum("**************house"+1); - }else if(i<15){ - f.setIdentity("#####################"+i); - f.setHouseholdNum("**************house"+2); - }else if(i<20){ - f.setIdentity("#####################"+i); - f.setHouseholdNum("**************house"+3); - }else if(i<25){ - f.setIdentity("#####################"+i); - f.setHouseholdNum("**************house"+4); - } - familys.add(f); - } - return familys; - - } - - public static Map getMinors(){ - Map minors=new HashMap<>(); - for(int i=0;i<10;i++){ - if(i<5){ - Minor m=new Minor(); - m.setIdentity("**************id"+i); - m.setHouseholdNum("**************house"+i); - minors.put("**************id"+i,m); - }else if(i<10){ - Minor m=new Minor(); - m.setIdentity("**************id"+i); - m.setHouseholdNum("**************house"+(i-5)); - minors.put("**************id"+i,m); - } - } - return minors; - - } +// public static void main(String[] args) { +// long startTime = System.currentTimeMillis(); +// Set familys = new HashSet<>(); +// //存放已经被放入minor里面的户号，避免数据重复 +// Set houseSet=new HashSet<>(); +// Map minors=getMinors(); +// Map> familyMaps=getFamilyMaps(); +// if (oConvertUtils.isNotEmpty(minors)) { +// for (Map.Entry m : minors.entrySet()) { +// String idCard = m.getKey(); +// Minor minor = m.getValue(); +// Set f=new HashSet<>(); +// //判断是否是一个家庭的人员 +// if (oConvertUtils.isNotEmpty(minor.getHouseholdNum())) { +// String houseNum = minor.getHouseholdNum(); +// if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(houseNum)) ){ +// if(!houseSet.contains(houseNum) ){ +// familys.addAll(familyMaps.get(houseNum)); +// houseSet.add(houseNum); +// } +// } +// minor.setFamilies(f); +// } +// } +// } +// long endTime = System.currentTimeMillis(); +// +// System.out.println("endTime-startTime:" + (endTime - startTime)); +// } +// public static Map> getFamilyMaps(){ +// Map> familyMaps=new HashMap<>(); +// List familys=getFamilys(); +// for(int i=0;i list = new ArrayList<>(); +// list.add(family); +// familyMaps.put(family.getHouseholdNum(),list); +// } +// +// } +// } +// return familyMaps; +// +// } +// +// public static List getFamilys(){ +// List familys=new ArrayList<>(); +// for(int i=0;i<25;i++){ +// Family f=new Family(); +// if(i<5){ +// f.setIdentity("#####################"+i); +// f.setHouseholdNum("**************house"+0); +// }else if(i<10){ +// f.setIdentity("#####################"+i); +// f.setHouseholdNum("**************house"+1); +// }else if(i<15){ +// f.setIdentity("#####################"+i); +// f.setHouseholdNum("**************house"+2); +// }else if(i<20){ +// f.setIdentity("#####################"+i); +// f.setHouseholdNum("**************house"+3); +// }else if(i<25){ +// f.setIdentity("#####################"+i); +// f.setHouseholdNum("**************house"+4); +// } +// familys.add(f); +// } +// return familys; +// +// } +// +// public static Map getMinors(){ +// Map minors=new HashMap<>(); +// for(int i=0;i<10;i++){ +// if(i<5){ +// Minor m=new Minor(); +// m.setIdentity("**************id"+i); +// m.setHouseholdNum("**************house"+i); +// minors.put("**************id"+i,m); +// }else if(i<10){ +// Minor m=new Minor(); +// m.setIdentity("**************id"+i); +// m.setHouseholdNum("**************house"+(i-5)); +// minors.put("**************id"+i,m); +// } +// } +// return minors; +// +// } } -- libgit2 0.21.4