From 2677af844d5cce22cc88f9c810c7295bf979c487 Mon Sep 17 00:00:00 2001
From: Dante <1139030617@qq.com>
Date: Sat, 15 Feb 2020 11:20:11 +0800
Subject: [PATCH] =?UTF-8?q?-province=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实现了-province参数，程序会统计所有-province参数指定的省份，若没有-province参数，则默认统计全国以及日志文件所涉及的省份疫情
---
 221701125/src/InfectStatistic.java | 68 +++++++++++++++++-------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/221701125/src/InfectStatistic.java b/221701125/src/InfectStatistic.java
index 646fe93c..98a0f641 100644
--- a/221701125/src/InfectStatistic.java
+++ b/221701125/src/InfectStatistic.java
@@ -84,35 +84,7 @@ public static void main(String[] args) {
 //    		System.out.println("没有参数");
 //    	}
         
-        for (int i=0;i<args.length;i++)
-        {
-        	if (args[i].equals("-log"))
-        	{
-        		logPath=args[i+1];
-        	}
-        	
-        	if (args[i].equals("-out"))
-        	{
-        		outputPath=args[i+1];
-        	}
-        	
-        	if (args[i].equals("-date"))
-        	{
-        		dateString=args[i+1];
-        		int year=Integer.parseInt(dateString.substring(0, 4));
-                int month=Integer.parseInt(dateString.substring(5, 7));
-                int day=Integer.parseInt(dateString.substring(8,10));
-                
-                date=new Date(year-1900, month-1, day);
-        	}
-        	
-        	if (Arrays.asList(types).contains(args[i]))
-        	{
-        		type.add(args[i]);
-        	}
-        	
-        	
-        }
+        
         
         
         
@@ -168,6 +140,44 @@ public static void main(String[] args) {
         map.put("浙江", new Area());
         
         
+        for (int i=0;i<args.length;i++)
+        {
+        	if (args[i].equals("-log"))
+        	{
+        		logPath=args[i+1];
+        	}
+        	
+        	if (args[i].equals("-out"))
+        	{
+        		outputPath=args[i+1];
+        	}
+        	
+        	if (args[i].equals("-date"))
+        	{
+        		dateString=args[i+1];
+        		int year=Integer.parseInt(dateString.substring(0, 4));
+                int month=Integer.parseInt(dateString.substring(5, 7));
+                int day=Integer.parseInt(dateString.substring(8,10));
+                
+                date=new Date(year-1900, month-1, day);
+        	}
+        	
+        	if (Arrays.asList(types).contains(args[i]))
+        	{
+        		type.add(args[i]);
+        	}
+        	
+        	if (Arrays.asList(areas).contains(args[i]))
+        	{
+        		map.get(args[i]).setIsRelate();
+        		System.out.println("参数："+args[i]);
+        	}
+        	
+        	
+        	
+        }
+        
+        
         
         
         for (Map.Entry<String, Area> entry : map.entrySet()) {