diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java index c7e7a98..99913c8 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java @@ -77,7 +77,7 @@ * */ currentTimeLabel.setForeground(Color.BLUE); new Timer(1000, e -> { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); currentTimeLabel.setText(systemTime); }).start(); @@ -138,17 +138,20 @@ JOptionPane.showMessageDialog(ntpPanel, "授时中心服务器输入错误，请检查", "Runtime Error", JOptionPane.ERROR_MESSAGE); return; } -// 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.simulateNtpResult(); String result = CommandUtil.ntpDate(host); LogToFile.save(result); + JSONObject object = new JSONObject(); if ("".equals(result)) { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } else { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); String resultString = result.split(":")[3]; boolean isSuccess = !resultString.contains("no server suitable"); @@ -156,19 +159,22 @@ setStateView(Color.GREEN); stateView.setText("同步成功"); recentlyTimeLabel.setText(systemTime); + + String[] dataSplit = resultString.split(" "); + object.put("deltaTime", dataSplit[6]); + object.put("status", 1); } else { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } //POST提交 - JSONObject object = new JSONObject(); try { object.put("deviceIp", localHostBox.getSelectedItem()); object.put("ntpResult", result); - - String[] dataSplit = resultString.split(" "); - object.put("deltaTime", dataSplit[6]); object.put("createTime", systemTime); } catch (JSONException e) { e.printStackTrace(); diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java index c7e7a98..99913c8 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java @@ -77,7 +77,7 @@ * */ currentTimeLabel.setForeground(Color.BLUE); new Timer(1000, e -> { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); currentTimeLabel.setText(systemTime); }).start(); @@ -138,17 +138,20 @@ JOptionPane.showMessageDialog(ntpPanel, "授时中心服务器输入错误，请检查", "Runtime Error", JOptionPane.ERROR_MESSAGE); return; } -// 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.simulateNtpResult(); String result = CommandUtil.ntpDate(host); LogToFile.save(result); + JSONObject object = new JSONObject(); if ("".equals(result)) { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } else { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); String resultString = result.split(":")[3]; boolean isSuccess = !resultString.contains("no server suitable"); @@ -156,19 +159,22 @@ setStateView(Color.GREEN); stateView.setText("同步成功"); recentlyTimeLabel.setText(systemTime); + + String[] dataSplit = resultString.split(" "); + object.put("deltaTime", dataSplit[6]); + object.put("status", 1); } else { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } //POST提交 - JSONObject object = new JSONObject(); try { object.put("deviceIp", localHostBox.getSelectedItem()); object.put("ntpResult", result); - - String[] dataSplit = resultString.split(" "); - object.put("deltaTime", dataSplit[6]); object.put("createTime", systemTime); } catch (JSONException e) { e.printStackTrace(); diff --git a/src/main/java/com/casic/swing/utils/CommandUtil.java b/src/main/java/com/casic/swing/utils/CommandUtil.java index f1a7fd0..55db0a1 100644 --- a/src/main/java/com/casic/swing/utils/CommandUtil.java +++ b/src/main/java/com/casic/swing/utils/CommandUtil.java @@ -72,4 +72,13 @@ } return builder.toString(); } + + /** + * 模拟授时返回值 + */ + public static String simulateNtpResult() { + String success = "5 Jan 11:20:24 ntpdate[807910]: adjust time server 114.118.7.161 offset -0.004064 sec"; + String fail = "5 Jan 11:24:06 ntpdate[824403]: no server suitable for synchronization found"; + return Math.random() > 0.5 ? success : fail; + } } diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java index c7e7a98..99913c8 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java @@ -77,7 +77,7 @@ * */ currentTimeLabel.setForeground(Color.BLUE); new Timer(1000, e -> { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); currentTimeLabel.setText(systemTime); }).start(); @@ -138,17 +138,20 @@ JOptionPane.showMessageDialog(ntpPanel, "授时中心服务器输入错误，请检查", "Runtime Error", JOptionPane.ERROR_MESSAGE); return; } -// 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.simulateNtpResult(); String result = CommandUtil.ntpDate(host); LogToFile.save(result); + JSONObject object = new JSONObject(); if ("".equals(result)) { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } else { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); String resultString = result.split(":")[3]; boolean isSuccess = !resultString.contains("no server suitable"); @@ -156,19 +159,22 @@ setStateView(Color.GREEN); stateView.setText("同步成功"); recentlyTimeLabel.setText(systemTime); + + String[] dataSplit = resultString.split(" "); + object.put("deltaTime", dataSplit[6]); + object.put("status", 1); } else { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } //POST提交 - JSONObject object = new JSONObject(); try { object.put("deviceIp", localHostBox.getSelectedItem()); object.put("ntpResult", result); - - String[] dataSplit = resultString.split(" "); - object.put("deltaTime", dataSplit[6]); object.put("createTime", systemTime); } catch (JSONException e) { e.printStackTrace(); diff --git a/src/main/java/com/casic/swing/utils/CommandUtil.java b/src/main/java/com/casic/swing/utils/CommandUtil.java index f1a7fd0..55db0a1 100644 --- a/src/main/java/com/casic/swing/utils/CommandUtil.java +++ b/src/main/java/com/casic/swing/utils/CommandUtil.java @@ -72,4 +72,13 @@ } return builder.toString(); } + + /** + * 模拟授时返回值 + */ + public static String simulateNtpResult() { + String success = "5 Jan 11:20:24 ntpdate[807910]: adjust time server 114.118.7.161 offset -0.004064 sec"; + String fail = "5 Jan 11:24:06 ntpdate[824403]: no server suitable for synchronization found"; + return Math.random() > 0.5 ? success : fail; + } } diff --git a/src/main/java/com/casic/swing/utils/StringHelper.java b/src/main/java/com/casic/swing/utils/StringHelper.java index fa4b607..7d836ac 100644 --- a/src/main/java/com/casic/swing/utils/StringHelper.java +++ b/src/main/java/com/casic/swing/utils/StringHelper.java @@ -11,6 +11,9 @@ FrequencyBean bean = JSON.parseObject(json, FrequencyBean.class); if (bean.getCode() == 200) { FrequencyBean.DataBean data = bean.getData(); + if (data == null) { + return "10"; + } return data.getParaValue(); } else { return "10"; diff --git a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java index c7e7a98..99913c8 100644 --- a/src/main/java/com/casic/swing/ui/TimeGuardNtp.java +++ b/src/main/java/com/casic/swing/ui/TimeGuardNtp.java @@ -77,7 +77,7 @@ * */ currentTimeLabel.setForeground(Color.BLUE); new Timer(1000, e -> { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); currentTimeLabel.setText(systemTime); }).start(); @@ -138,17 +138,20 @@ JOptionPane.showMessageDialog(ntpPanel, "授时中心服务器输入错误，请检查", "Runtime Error", JOptionPane.ERROR_MESSAGE); return; } -// 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.simulateNtpResult(); String result = CommandUtil.ntpDate(host); LogToFile.save(result); + JSONObject object = new JSONObject(); if ("".equals(result)) { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } else { - String systemTime = TimeOrDateUtil.timestampToTime(System.currentTimeMillis()); + String systemTime = TimeOrDateUtil.timestampToTime(); String resultString = result.split(":")[3]; boolean isSuccess = !resultString.contains("no server suitable"); @@ -156,19 +159,22 @@ setStateView(Color.GREEN); stateView.setText("同步成功"); recentlyTimeLabel.setText(systemTime); + + String[] dataSplit = resultString.split(" "); + object.put("deltaTime", dataSplit[6]); + object.put("status", 1); } else { setStateView(Color.RED); stateView.setText("同步失败"); recentlyTimeLabel.setText(""); + + object.put("deltaTime", ""); + object.put("status", 0); } //POST提交 - JSONObject object = new JSONObject(); try { object.put("deviceIp", localHostBox.getSelectedItem()); object.put("ntpResult", result); - - String[] dataSplit = resultString.split(" "); - object.put("deltaTime", dataSplit[6]); object.put("createTime", systemTime); } catch (JSONException e) { e.printStackTrace(); diff --git a/src/main/java/com/casic/swing/utils/CommandUtil.java b/src/main/java/com/casic/swing/utils/CommandUtil.java index f1a7fd0..55db0a1 100644 --- a/src/main/java/com/casic/swing/utils/CommandUtil.java +++ b/src/main/java/com/casic/swing/utils/CommandUtil.java @@ -72,4 +72,13 @@ } return builder.toString(); } + + /** + * 模拟授时返回值 + */ + public static String simulateNtpResult() { + String success = "5 Jan 11:20:24 ntpdate[807910]: adjust time server 114.118.7.161 offset -0.004064 sec"; + String fail = "5 Jan 11:24:06 ntpdate[824403]: no server suitable for synchronization found"; + return Math.random() > 0.5 ? success : fail; + } } diff --git a/src/main/java/com/casic/swing/utils/StringHelper.java b/src/main/java/com/casic/swing/utils/StringHelper.java index fa4b607..7d836ac 100644 --- a/src/main/java/com/casic/swing/utils/StringHelper.java +++ b/src/main/java/com/casic/swing/utils/StringHelper.java @@ -11,6 +11,9 @@ FrequencyBean bean = JSON.parseObject(json, FrequencyBean.class); if (bean.getCode() == 200) { FrequencyBean.DataBean data = bean.getData(); + if (data == null) { + return "10"; + } return data.getParaValue(); } else { return "10"; diff --git a/src/main/java/com/casic/swing/utils/TimeOrDateUtil.java b/src/main/java/com/casic/swing/utils/TimeOrDateUtil.java index 7adc5a6..32de4f2 100644 --- a/src/main/java/com/casic/swing/utils/TimeOrDateUtil.java +++ b/src/main/java/com/casic/swing/utils/TimeOrDateUtil.java @@ -1,5 +1,6 @@ package com.casic.swing.utils; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -11,8 +12,8 @@ /** * 时间戳转时间 */ - public static String timestampToTime(long millSeconds) { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - return format.format(new Date(millSeconds)); + public static String timestampToTime() { + DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return format.format(new Date()); } }