diff --git a/pom.xml b/pom.xml
index aae04a7..ff82031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,12 @@
javax.websocket-api
1.0
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+
diff --git a/src/main/java/com/example/entity/ContainerRegisterQuery.java b/src/main/java/com/example/entity/ContainerRegisterQuery.java
index d40a7bb..2e19979 100644
--- a/src/main/java/com/example/entity/ContainerRegisterQuery.java
+++ b/src/main/java/com/example/entity/ContainerRegisterQuery.java
@@ -4,11 +4,11 @@ import java.io.Serializable;
public class ContainerRegisterQuery implements Serializable {
- private String messageHeader;
- private String opOrgCode;
- private String userCode;
- private String userName;
- private String province;
+// private String messageHeader;
+// private String opOrgCode;
+// private String userCode;
+// private String userName;
+// private String province;
private String pdaip;
private int commandCode;
@@ -19,46 +19,46 @@ public class ContainerRegisterQuery implements Serializable {
public void setCommandCode(int commandCode) {
this.commandCode = commandCode;
}
- public String getMessageHeader() {
- return messageHeader;
- }
-
- public void setMessageHeader(String messageHeader) {
- this.messageHeader = messageHeader;
- }
-
-
- public String getOpOrgCode() {
- return opOrgCode;
- }
-
- public void setOpOrgCode(String opOrgCode) {
- this.opOrgCode = opOrgCode;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getProvince() {
- return province;
- }
-
- public void setProvince(String province) {
- this.province = province;
- }
+// public String getMessageHeader() {
+// return messageHeader;
+// }
+//
+// public void setMessageHeader(String messageHeader) {
+// this.messageHeader = messageHeader;
+// }
+//
+//
+// public String getOpOrgCode() {
+// return opOrgCode;
+// }
+//
+// public void setOpOrgCode(String opOrgCode) {
+// this.opOrgCode = opOrgCode;
+// }
+//
+// public String getUserCode() {
+// return userCode;
+// }
+//
+// public void setUserCode(String userCode) {
+// this.userCode = userCode;
+// }
+//
+// public String getUserName() {
+// return userName;
+// }
+//
+// public void setUserName(String userName) {
+// this.userName = userName;
+// }
+//
+// public String getProvince() {
+// return province;
+// }
+//
+// public void setProvince(String province) {
+// this.province = province;
+// }
public String getPdaip() {
return pdaip;
diff --git a/src/main/java/com/example/services/impl/ServiceImpl.java b/src/main/java/com/example/services/impl/ServiceImpl.java
index 1784157..20ef823 100644
--- a/src/main/java/com/example/services/impl/ServiceImpl.java
+++ b/src/main/java/com/example/services/impl/ServiceImpl.java
@@ -74,11 +74,11 @@ public class ServiceImpl implements IService {
boolean isSendFlag = false;
//示例
ContainerRegisterQuery containerRegisterQuery1 = new ContainerRegisterQuery();
- containerRegisterQuery1.setMessageHeader(messageHeader);
- containerRegisterQuery1.setOpOrgCode(opOrgCode);
- containerRegisterQuery1.setUserCode(userCode);
- containerRegisterQuery1.setUserName(userName);
- containerRegisterQuery1.setProvince(province);
+// containerRegisterQuery1.setMessageHeader(messageHeader);
+// containerRegisterQuery1.setOpOrgCode(opOrgCode);
+// containerRegisterQuery1.setUserCode(userCode);
+// containerRegisterQuery1.setUserName(userName);
+// containerRegisterQuery1.setProvince(province);
containerRegisterQuery1.setPdaip(pdaip);
containerRegisterQuery1.setCommandCode(101);
String json = JSONObject.toJSONString(containerRegisterQuery1);
@@ -130,11 +130,11 @@ public class ServiceImpl implements IService {
boolean isSendFlag = false;
//示例
ContainerRegisterQuery containerRegisterQuery2 = new ContainerRegisterQuery();
- containerRegisterQuery2.setMessageHeader(messageHeader);
- containerRegisterQuery2.setOpOrgCode(opOrgCode);
- containerRegisterQuery2.setUserCode(userCode);
- containerRegisterQuery2.setUserName(userName);
- containerRegisterQuery2.setProvince(province);
+// containerRegisterQuery2.setMessageHeader(messageHeader);
+// containerRegisterQuery2.setOpOrgCode(opOrgCode);
+// containerRegisterQuery2.setUserCode(userCode);
+// containerRegisterQuery2.setUserName(userName);
+// containerRegisterQuery2.setProvince(province);
containerRegisterQuery2.setPdaip(pdaip);
containerRegisterQuery2.setCommandCode(102);
String json = JSONObject.toJSONString(containerRegisterQuery2);
diff --git a/src/main/java/com/example/services/impl/WebSocketServerContent.java b/src/main/java/com/example/services/impl/WebSocketServerContent.java
index cda26ca..d5b7701 100644
--- a/src/main/java/com/example/services/impl/WebSocketServerContent.java
+++ b/src/main/java/com/example/services/impl/WebSocketServerContent.java
@@ -1,7 +1,9 @@
package com.example.services.impl;
+import com.example.utils.DateUtils;
import lombok.SneakyThrows;
+import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@@ -87,9 +89,10 @@ public class WebSocketServerContent {
ServiceImpl.DealValidPack(RecMessage);
RecMessage = "";
}
+ System.out.println(DateUtils.getTime() +"一开始就运行");
+ Thread.sleep(1000);
}
-// System.out.println("一开始就运行");
- Thread.sleep(1000);
+
}
}
diff --git a/src/main/java/com/example/utils/DateUtils.java b/src/main/java/com/example/utils/DateUtils.java
new file mode 100644
index 0000000..23ee76d
--- /dev/null
+++ b/src/main/java/com/example/utils/DateUtils.java
@@ -0,0 +1,156 @@
+package com.example.utils;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 时间工具类
+ *
+ * @author Caesar Bao
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+{
+ public static String YYYY = "yyyy";
+
+ public static String YYYY_MM = "yyyy-MM";
+
+ public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+ public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+ public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+ private static String[] parsePatterns = {
+ "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+ "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+ "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+ /**
+ * 获取当前Date型日期
+ *
+ * @return Date() 当前日期
+ */
+ public static Date getNowDate()
+ {
+ return new Date();
+ }
+
+ /**
+ * 获取当前日期, 默认格式为yyyy-MM-dd
+ *
+ * @return String
+ */
+ public static String getDate()
+ {
+ return dateTimeNow(YYYY_MM_DD);
+ }
+
+ public static final String getTime()
+ {
+ return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+ }
+
+ public static final String dateTimeNow()
+ {
+ return dateTimeNow(YYYYMMDDHHMMSS);
+ }
+
+ public static final String dateTimeNow(final String format)
+ {
+ return parseDateToStr(format, new Date());
+ }
+
+ public static final String dateTime(final Date date)
+ {
+ return parseDateToStr(YYYY_MM_DD, date);
+ }
+
+ public static final String parseDateToStr(final String format, final Date date)
+ {
+ return new SimpleDateFormat(format).format(date);
+ }
+
+ public static final Date dateTime(final String format, final String ts)
+ {
+ try
+ {
+ return new SimpleDateFormat(format).parse(ts);
+ }
+ catch (ParseException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 日期路径 即年/月/日 如2018/08/08
+ */
+ public static final String datePath()
+ {
+ Date now = new Date();
+ return DateFormatUtils.format(now, "yyyy/MM/dd");
+ }
+
+ /**
+ * 日期路径 即年/月/日 如20180808
+ */
+ public static final String dateTime()
+ {
+ Date now = new Date();
+ return DateFormatUtils.format(now, "yyyyMMdd");
+ }
+
+ /**
+ * 日期型字符串转化为日期 格式
+ */
+ public static Date parseDate(Object str)
+ {
+ if (str == null)
+ {
+ return null;
+ }
+ try
+ {
+ return parseDate(str.toString(), parsePatterns);
+ }
+ catch (ParseException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * 获取服务器启动时间
+ */
+ public static Date getServerStartDate()
+ {
+ long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+ return new Date(time);
+ }
+
+ /**
+ * 计算两个时间差
+ */
+ public static String getDatePoor(Date endDate, Date nowDate)
+ {
+ long nd = 1000 * 24 * 60 * 60;
+ long nh = 1000 * 60 * 60;
+ long nm = 1000 * 60;
+ // long ns = 1000;
+ // 获得两个时间的毫秒时间差异
+ long diff = endDate.getTime() - nowDate.getTime();
+ // 计算差多少天
+ long day = diff / nd;
+ // 计算差多少小时
+ long hour = diff % nd / nh;
+ // 计算差多少分钟
+ long min = diff % nd % nh / nm;
+ // 计算差多少秒//输出结果
+ // long sec = diff % nd % nh % nm / ns;
+ return day + "天" + hour + "小时" + min + "分钟";
+ }
+}