Commit efbb69ab authored by duanruiming's avatar duanruiming

[update] 优化系统服务实体返回

parent 9e8758c4
...@@ -4,13 +4,16 @@ import com.alibaba.fastjson.JSON; ...@@ -4,13 +4,16 @@ import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.wanji.common.dto.SystemServiceStatusDTO; import net.wanji.common.dto.SystemServiceStatusDTO;
import net.wanji.common.utils.tool.SocketUtil; import net.wanji.common.utils.tool.SocketUtil;
import net.wanji.common.utils.tool.StringUtils;
import net.wanji.web.common.constant.Constant; import net.wanji.web.common.constant.Constant;
import net.wanji.web.common.util.date.DateStyle;
import net.wanji.web.websocket.WebSocketServer; import net.wanji.web.websocket.WebSocketServer;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -40,7 +43,11 @@ public class SystemServiceStatusTask { ...@@ -40,7 +43,11 @@ public class SystemServiceStatusTask {
int currentStatus = SocketUtil.telnet(ip, port, timeout) == true ? 0 : 1; int currentStatus = SocketUtil.telnet(ip, port, timeout) == true ? 0 : 1;
if (currentStatus != lastStatus) { if (currentStatus != lastStatus) {
dto.setStatus(currentStatus); dto.setStatus(currentStatus);
dto.setStartTime(new Date()); }
if (StringUtils.isBlank(dto.getStartTime())) {
LocalTime now = LocalTime.now();
String format = now.format(DateTimeFormatter.ofPattern(DateStyle.HH_MM_SS.getValue()));
dto.setStartTime(format);
} }
} }
......
...@@ -6,8 +6,6 @@ import lombok.AllArgsConstructor; ...@@ -6,8 +6,6 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.Date;
/** /**
* @author duanruiming * @author duanruiming
* @date 2023/03/21 10:45 * @date 2023/03/21 10:45
...@@ -28,5 +26,5 @@ public class SystemServiceStatusDTO { ...@@ -28,5 +26,5 @@ public class SystemServiceStatusDTO {
@ApiModelProperty(value = "状态:0正常 1异常",notes = "") @ApiModelProperty(value = "状态:0正常 1异常",notes = "")
private int status; private int status;
@ApiModelProperty(value = "开始时间",notes = "") @ApiModelProperty(value = "开始时间",notes = "")
private Date startTime; private String startTime;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment