wx-group / juvenile-prosecution

Commit c8e611147a7680252568ff5d878b93d577967c02

Authored by wxy
1 parent 9c110e9a

修改报错

Inline Side-by-side
Showing 1 changed file with 93 additions and 93 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java
  View file @c8e6111
... ... @@ -167,98 +167,98 @@ public class getRandomId {
167 167 /**
168 168 * 测试
169 169 */
170   - public static void main(String[] args) {
171   - long startTime = System.currentTimeMillis();
172   - Set<Family> familys = new HashSet<>();
173   - //存放已经被放入minor里面的户号，避免数据重复
174   - Set<String> houseSet=new HashSet<>();
175   - Map<String, Minor> minors=getMinors();
176   - Map<String, List<Family>> familyMaps=getFamilyMaps();
177   - if (oConvertUtils.isNotEmpty(minors)) {
178   - for (Map.Entry<String, Minor> m : minors.entrySet()) {
179   - String idCard = m.getKey();
180   - Minor minor = m.getValue();
181   - Set<Family> f=new HashSet<>();
182   - //判断是否是一个家庭的人员
183   - if (oConvertUtils.isNotEmpty(minor.getHouseholdNum())) {
184   - String houseNum = minor.getHouseholdNum();
185   - if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(houseNum)) ){
186   - if(!houseSet.contains(houseNum) ){
187   - familys.addAll(familyMaps.get(houseNum));
188   - houseSet.add(houseNum);
189   - }
190   - }
191   - minor.setFamilies(f);
192   - }
193   - }
194   - }
195   - long endTime = System.currentTimeMillis();
196   -
197   - System.out.println("endTime-startTime:" + (endTime - startTime));
198   - }
199   - public static Map<String, List<Family>> getFamilyMaps(){
200   - Map<String, List<Family>> familyMaps=new HashMap<>();
201   - List<Family> familys=getFamilys();
202   - for(int i=0;i<familys.size();i++){
203   - Family family=familys.get(i);
204   - if(oConvertUtils.isNotEmpty(family.getHouseholdNum())){
205   - if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(family.getHouseholdNum()))){
206   - familyMaps.get(family.getHouseholdNum()).add(family);
207   - }else {
208   - List<Family> list = new ArrayList<>();
209   - list.add(family);
210   - familyMaps.put(family.getHouseholdNum(),list);
211   - }
212   -
213   - }
214   - }
215   - return familyMaps;
216   -
217   - }
218   -
219   - public static List<Family> getFamilys(){
220   - List<Family> familys=new ArrayList<>();
221   - for(int i=0;i<25;i++){
222   - Family f=new Family();
223   - if(i<5){
224   - f.setIdentity("#####################"+i);
225   - f.setHouseholdNum("**************house"+0);
226   - }else if(i<10){
227   - f.setIdentity("#####################"+i);
228   - f.setHouseholdNum("**************house"+1);
229   - }else if(i<15){
230   - f.setIdentity("#####################"+i);
231   - f.setHouseholdNum("**************house"+2);
232   - }else if(i<20){
233   - f.setIdentity("#####################"+i);
234   - f.setHouseholdNum("**************house"+3);
235   - }else if(i<25){
236   - f.setIdentity("#####################"+i);
237   - f.setHouseholdNum("**************house"+4);
238   - }
239   - familys.add(f);
240   - }
241   - return familys;
242   -
243   - }
244   -
245   - public static Map<String, Minor> getMinors(){
246   - Map<String, Minor> minors=new HashMap<>();
247   - for(int i=0;i<10;i++){
248   - if(i<5){
249   - Minor m=new Minor();
250   - m.setIdentity("**************id"+i);
251   - m.setHouseholdNum("**************house"+i);
252   - minors.put("**************id"+i,m);
253   - }else if(i<10){
254   - Minor m=new Minor();
255   - m.setIdentity("**************id"+i);
256   - m.setHouseholdNum("**************house"+(i-5));
257   - minors.put("**************id"+i,m);
258   - }
259   - }
260   - return minors;
261   -
262   - }
  170 +// public static void main(String[] args) {
  171 +// long startTime = System.currentTimeMillis();
  172 +// Set<Family> familys = new HashSet<>();
  173 +// //存放已经被放入minor里面的户号，避免数据重复
  174 +// Set<String> houseSet=new HashSet<>();
  175 +// Map<String, Minor> minors=getMinors();
  176 +// Map<String, List<Family>> familyMaps=getFamilyMaps();
  177 +// if (oConvertUtils.isNotEmpty(minors)) {
  178 +// for (Map.Entry<String, Minor> m : minors.entrySet()) {
  179 +// String idCard = m.getKey();
  180 +// Minor minor = m.getValue();
  181 +// Set<Family> f=new HashSet<>();
  182 +// //判断是否是一个家庭的人员
  183 +// if (oConvertUtils.isNotEmpty(minor.getHouseholdNum())) {
  184 +// String houseNum = minor.getHouseholdNum();
  185 +// if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(houseNum)) ){
  186 +// if(!houseSet.contains(houseNum) ){
  187 +// familys.addAll(familyMaps.get(houseNum));
  188 +// houseSet.add(houseNum);
  189 +// }
  190 +// }
  191 +// minor.setFamilies(f);
  192 +// }
  193 +// }
  194 +// }
  195 +// long endTime = System.currentTimeMillis();
  196 +//
  197 +// System.out.println("endTime-startTime:" + (endTime - startTime));
  198 +// }
  199 +// public static Map<String, List<Family>> getFamilyMaps(){
  200 +// Map<String, List<Family>> familyMaps=new HashMap<>();
  201 +// List<Family> familys=getFamilys();
  202 +// for(int i=0;i<familys.size();i++){
  203 +// Family family=familys.get(i);
  204 +// if(oConvertUtils.isNotEmpty(family.getHouseholdNum())){
  205 +// if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(family.getHouseholdNum()))){
  206 +// familyMaps.get(family.getHouseholdNum()).add(family);
  207 +// }else {
  208 +// List<Family> list = new ArrayList<>();
  209 +// list.add(family);
  210 +// familyMaps.put(family.getHouseholdNum(),list);
  211 +// }
  212 +//
  213 +// }
  214 +// }
  215 +// return familyMaps;
  216 +//
  217 +// }
  218 +//
  219 +// public static List<Family> getFamilys(){
  220 +// List<Family> familys=new ArrayList<>();
  221 +// for(int i=0;i<25;i++){
  222 +// Family f=new Family();
  223 +// if(i<5){
  224 +// f.setIdentity("#####################"+i);
  225 +// f.setHouseholdNum("**************house"+0);
  226 +// }else if(i<10){
  227 +// f.setIdentity("#####################"+i);
  228 +// f.setHouseholdNum("**************house"+1);
  229 +// }else if(i<15){
  230 +// f.setIdentity("#####################"+i);
  231 +// f.setHouseholdNum("**************house"+2);
  232 +// }else if(i<20){
  233 +// f.setIdentity("#####################"+i);
  234 +// f.setHouseholdNum("**************house"+3);
  235 +// }else if(i<25){
  236 +// f.setIdentity("#####################"+i);
  237 +// f.setHouseholdNum("**************house"+4);
  238 +// }
  239 +// familys.add(f);
  240 +// }
  241 +// return familys;
  242 +//
  243 +// }
  244 +//
  245 +// public static Map<String, Minor> getMinors(){
  246 +// Map<String, Minor> minors=new HashMap<>();
  247 +// for(int i=0;i<10;i++){
  248 +// if(i<5){
  249 +// Minor m=new Minor();
  250 +// m.setIdentity("**************id"+i);
  251 +// m.setHouseholdNum("**************house"+i);
  252 +// minors.put("**************id"+i,m);
  253 +// }else if(i<10){
  254 +// Minor m=new Minor();
  255 +// m.setIdentity("**************id"+i);
  256 +// m.setHouseholdNum("**************house"+(i-5));
  257 +// minors.put("**************id"+i,m);
  258 +// }
  259 +// }
  260 +// return minors;
  261 +//
  262 +// }
263 263  
264 264 }
... ...