Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
efbb69ab
Commit
efbb69ab
authored
Mar 22, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 优化系统服务实体返回
parent
9e8758c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
SystemServiceStatusTask.java
...main/java/net/wanji/web/task/SystemServiceStatusTask.java
+9
-2
SystemServiceStatusDTO.java
...ain/java/net/wanji/common/dto/SystemServiceStatusDTO.java
+1
-3
No files found.
signal-control-service/src/main/java/net/wanji/web/task/SystemServiceStatusTask.java
View file @
efbb69ab
...
@@ -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
);
}
}
}
}
...
...
wj-common/src/main/java/net/wanji/common/dto/SystemServiceStatusDTO.java
View file @
efbb69ab
...
@@ -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
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment