fanli-server.git

			@@ -86,11 +86,71 @@
			date = sdf.parse(st);
			return date.getTime();
			} catch (Exception e) {
			// e.printStackTrace();
			e.printStackTrace();
			return 0;
			}
			}


			public static Date parseYYYYMM(String st) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
			try {
			return sdf.parse(st);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}
			}

			public static Date parseYYYYMMDD_HHMMSS(String st) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			try {
			return sdf.parse(st);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}
			}

			public static Date parseYYYYMMDD(String st) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
			try {
			return sdf.parse(st);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}
			}

			public static Date parseDotYYYYMMDD(String st) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
			try {
			return sdf.parse(st);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}
			}

			public static Date parseDotCommon(String st) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
			try {
			return sdf.parse(st);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}
			}

			public static Date parseDotCommon2(String st) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
			try {
			return sdf.parse(st);
			} catch (Exception e) {
			e.printStackTrace();
			return null;
			}
			}

			public static long convertAllTimeToTemp(String st) {
			Date date = new Date();
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			@@ -103,6 +163,12 @@
			return 0;
			}

			public static String formatDate(long time) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
			String date = sdf.format(new Date(time));
			return date;
			}

			public static String formatDate(Date time) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
			String date = sdf.format(time);
			@@ -113,6 +179,33 @@
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
			String date = sdf.format(time);
			return date;
			}

			public static String formatHHMM_12H(Date time) {
			SimpleDateFormat sdf = new SimpleDateFormat("hh:mm");
			String date = sdf.format(time);
			return date;
			}

			public static String formatYMDHHMM(Date date) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			try {
			return sdf.format(date);
			} catch (Exception e) {
			e.printStackTrace();
			}
			return null;
			}


			public static String formatDateAddT(Date date) {
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
			try {
			return sdf.format(date);
			} catch (Exception e) {
			e.printStackTrace();
			}
			return null;
			}

			public static long convertToTimeTemp(String st, String format) {
			@@ -138,6 +231,7 @@
			}
			return 0;
			}


			public static long convertDateToTemp2(String st) {
			Date date = new Date();