diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.form b/src/main/java/com/casic/swing/ui/TimeGuardNtp.form index 27e654a..ce81e35 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.form +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.form @@ -39,7 +39,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.form b/src/main/java/com/casic/swing/ui/TimeGuardNtp.form index 27e654a..ce81e35 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.form +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.form @@ -39,7 +39,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java index c6e5149..c79bdba 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java @@ -81,9 +81,9 @@ currentTimeLabel.setText(systemTime); }).start(); - String assertsData = StringHelper.getLogData(); - if (!"".equals(assertsData)) { - recentlyTimeLabel.setText(assertsData); + String ntpTime = StringHelper.getNtpUpdateTime(); + if (!"".equals(ntpTime)) { + recentlyTimeLabel.setText(ntpTime); } else { recentlyTimeLabel.setText("无法确定最近同步时间"); } @@ -141,7 +141,7 @@ // String result = "5 Jan 11:20:24 ntpdate[807910]: adjust time server 114.118.7.161 offset -0.004064 sec"; // String result = "5 Jan 11:24:06 ntpdate[824403]: no server suitable for synchronization found"; String result = CommandUtil.ntpDate(host); - System.out.println("命令执行结果 ===> " + result); + StringHelper.saveLog(result); if ("".equals(result)) { setStateView(Color.RED); @@ -156,8 +156,6 @@ setStateView(Color.GREEN); stateView.setText("同步成功"); recentlyTimeLabel.setText(systemTime); - //同步成功之后将时间存入本地 - StringHelper.saveLog(systemTime); } else { setStateView(Color.RED); stateView.setText("同步失败"); diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.form b/src/main/java/com/casic/swing/ui/TimeGuardNtp.form index 27e654a..ce81e35 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.form +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.form @@ -39,7 +39,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java index c6e5149..c79bdba 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java @@ -81,9 +81,9 @@ currentTimeLabel.setText(systemTime); }).start(); - String assertsData = StringHelper.getLogData(); - if (!"".equals(assertsData)) { - recentlyTimeLabel.setText(assertsData); + String ntpTime = StringHelper.getNtpUpdateTime(); + if (!"".equals(ntpTime)) { + recentlyTimeLabel.setText(ntpTime); } else { recentlyTimeLabel.setText("无法确定最近同步时间"); } @@ -141,7 +141,7 @@ // String result = "5 Jan 11:20:24 ntpdate[807910]: adjust time server 114.118.7.161 offset -0.004064 sec"; // String result = "5 Jan 11:24:06 ntpdate[824403]: no server suitable for synchronization found"; String result = CommandUtil.ntpDate(host); - System.out.println("命令执行结果 ===> " + result); + StringHelper.saveLog(result); if ("".equals(result)) { setStateView(Color.RED); @@ -156,8 +156,6 @@ setStateView(Color.GREEN); stateView.setText("同步成功"); recentlyTimeLabel.setText(systemTime); - //同步成功之后将时间存入本地 - StringHelper.saveLog(systemTime); } else { setStateView(Color.RED); stateView.setText("同步失败"); diff --git a/src/main/java/com/casic/swing/utils/StringHelper.java b/src/main/java/com/casic/swing/utils/StringHelper.java index 3d3ffba..b6ee15e 100644 --- a/src/main/java/com/casic/swing/utils/StringHelper.java +++ b/src/main/java/com/casic/swing/utils/StringHelper.java @@ -4,6 +4,7 @@ import com.casic.swing.bean.FrequencyBean; import java.io.*; +import java.util.Calendar; /** * @author a203 @@ -67,16 +68,68 @@ out.close(); } - public static String getLogData() { + public static String getNtpUpdateTime() { try { InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(logFile)); - return loadString(inputStreamReader); + String s = loadString(inputStreamReader); + if ("".equals(s)) { + return ""; + } + /** + * 5 Jan 11:20:24 ntpdate[807910]: adjust time server 114.118.7.161 offset -0.004064 sec + * 5 Jan 11:24:06 ntpdate[824403]: no server suitable for synchronization found + * */ + String ntpDate = s.split("ntpdate")[0]; + String[] split = ntpDate.split(" "); + + Calendar date = Calendar.getInstance(); + String year = String.valueOf(date.get(Calendar.YEAR)); + return year + "-" + monthConvert(split[1]) + "-" + dayConvert(split[0]) + " " + split[2]; } catch (IOException e) { e.printStackTrace(); } return ""; } + private static String monthConvert(String engMonth) { + switch (engMonth) { + case "Jan": + return "01"; + case "Feb": + return "02"; + case "Mar": + return "03"; + case "Apr": + return "04"; + case "May": + return "05"; + case "Jun": + return "06"; + case "Jul": + return "07"; + case "Aug": + return "08"; + case "Sept": + return "09"; + case "Oct": + return "10"; + case "Nov": + return "11"; + case "Dec": + return "12"; + default: + return "00"; + } + } + + private static String dayConvert(String day) { + if (Integer.parseInt(day) < 10) { + return "0" + day; + } else { + return day; + } + } + public static String getConfigData() { try { InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(configFile));