jiangjiazhi / regional-platform

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 17 additions and 28 deletions

...	...	@@ -6,12 +6,8 @@
6	6	import java.text.DateFormat;
7	7	import java.text.ParseException;
8	8	import java.text.SimpleDateFormat;
9		-import java.util.Calendar;
10		-import java.util.Date;
11		-import java.util.HashMap;
12		-import java.util.Map;
13		-import java.util.concurrent.ExecutorService;
14		-import java.util.concurrent.Executors;
	9	+import java.util.*;
	10	+import java.util.concurrent.*;
15	11	import java.util.concurrent.locks.Lock;
16	12	import java.util.concurrent.locks.ReentrantLock;
17	13
...	...	@@ -45,18 +41,11 @@
45	41	*/
46	42	public static String getWeekOfDate(Date dt)
47	43	{
48		- try
49		- {
50		- lock.lock();
51		- Calendar cal = Calendar.getInstance();
52		- cal.setTime(dt);
53		- int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
54		- return weekDays[w];
55		- }
56		- finally
57		- {
58		- lock.unlock();
59		- }
	44	+ Calendar cal = Calendar.getInstance();
	45	+ cal.setTime(dt);
	46	+ int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
	47	+ return weekDays[w];
	48	+
60	49	}
61	50
62	51
63	52
...	...	@@ -87,17 +76,17 @@
87	76
88	77	}
89	78
90		-
	79	+ /**
	80	+ * 添加年
	81	+ * @param srcDate
	82	+ * @param year
	83	+ * @return
	84	+ */
91	85	public static Date addYear(Date srcDate, int year) {
92		- try {
93		- lock.lock();
94		- Calendar rightNow = Calendar.getInstance();
95		- rightNow.setTime(srcDate);
96		- rightNow.add(Calendar.YEAR, year);
97		- return rightNow.getTime();
98		- }finally {
99		- lock.unlock();
100		- }
	86	+ Calendar rightNow = Calendar.getInstance();
	87	+ rightNow.setTime(srcDate);
	88	+ rightNow.add(Calendar.YEAR, year);
	89	+ return rightNow.getTime();
101	90	}
102	91
103	92	/**