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
jinan
traffic-signal-platform
Commits
d68c1478
Commit
d68c1478
authored
Mar 19, 2025
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[add] 查询历史灯态记录
parent
c0651db2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
57 additions
and
1 deletion
+57
-1
EHuaLuClientsConfig.java
...main/java/net/wanji/feign/config/EHuaLuClientsConfig.java
+1
-1
FeignCommon.java
...main/java/net/wanji/feign/service/common/FeignCommon.java
+8
-0
SignalCommandOptController.java
.../controller/signalcontrol/SignalCommandOptController.java
+14
-0
FeignProxyService.java
...et/wanji/opt/service/signalcontrol/FeignProxyService.java
+2
-0
FeignProxyServiceImpl.java
...opt/service/signalcontrol/impl/FeignProxyServiceImpl.java
+6
-0
CrossIdDateTimeDTO.java
...c/main/java/net/wanji/databus/dto/CrossIdDateTimeDTO.java
+26
-0
No files found.
signal-feign-service/src/main/java/net/wanji/feign/config/EHuaLuClientsConfig.java
View file @
d68c1478
...
...
@@ -18,6 +18,6 @@ public class EHuaLuClientsConfig {
private
String
url
;
@Bean
public
void
testUrl
()
{
log
.
info
(
"===========feign config url
utc
:"
+
url
);
log
.
info
(
"===========feign config url
EHuaLu
:"
+
url
);
}
}
signal-feign-service/src/main/java/net/wanji/feign/service/common/FeignCommon.java
View file @
d68c1478
...
...
@@ -154,4 +154,12 @@ public interface FeignCommon {
@PostMapping
(
"/staticInfo/selectCrossSchemeOptLogByParams"
)
JsonViewObject
selectCrossSchemeOptLogByParams
(
@RequestBody
CrossSchemeQueryDTO
crossSchemeQueryDT
);
/**
* 查询utc库历史灯态
* @param crossIdDateTimeDTO
* @return
*/
@PostMapping
(
"/signalStatus/lightStatusOneHist"
)
JsonViewObject
selectLightStatusHist
(
@RequestBody
CrossIdDateTimeDTO
crossIdDateTimeDTO
);
}
signal-optimize-service/src/main/java/net/wanji/opt/controller/signalcontrol/SignalCommandOptController.java
View file @
d68c1478
...
...
@@ -8,7 +8,9 @@ import net.wanji.common.annotation.aspect.AspectLog;
import
net.wanji.common.enums.BaseEnum
;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.databus.bo.CrossIdBO
;
import
net.wanji.databus.dto.CrossIdDateTimeDTO
;
import
net.wanji.databus.vo.ControlCommandVO
;
import
net.wanji.databus.vo.LightsStatusVO2
;
import
net.wanji.databus.vo.SchemeOptSendVO
;
import
net.wanji.opt.service.signalcontrol.FeignProxyService
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.Valid
;
import
javax.validation.constraints.NotBlank
;
import
javax.ws.rs.core.MediaType
;
...
...
@@ -115,4 +118,15 @@ public class SignalCommandOptController {
JsonViewObject
jsonViewObject
=
JsonViewObject
.
newInstance
().
success
();
return
jsonViewObject
;
}
@AspectLog
(
description
=
"查询某一时间灯态历史数据"
,
operationType
=
BaseEnum
.
OperationTypeEnum
.
QUERY
)
@PostMapping
(
value
=
"/lightStatusOneHist"
,
produces
=
MediaType
.
APPLICATION_JSON
)
@ApiOperation
(
value
=
"查询某一时间灯态历史数据"
,
notes
=
"查询某一时间灯态历史数据"
,
response
=
LightsStatusVO2
.
class
,
produces
=
MediaType
.
APPLICATION_JSON
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
LightsStatusVO2
.
class
)
})
public
JsonViewObject
lightStatusOneHist
(
@RequestBody
@Valid
CrossIdDateTimeDTO
crossIdDateTimeDTO
)
throws
Exception
{
return
feignProxyService
.
lightStatusOneHist
(
crossIdDateTimeDTO
);
}
}
signal-optimize-service/src/main/java/net/wanji/opt/service/signalcontrol/FeignProxyService.java
View file @
d68c1478
...
...
@@ -2,6 +2,7 @@ package net.wanji.opt.service.signalcontrol;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.databus.bo.CrossIdBO
;
import
net.wanji.databus.dto.CrossIdDateTimeDTO
;
import
net.wanji.databus.vo.ControlCommandVO
;
import
net.wanji.databus.vo.SchemeOptSendVO
;
...
...
@@ -28,4 +29,5 @@ public interface FeignProxyService {
JsonViewObject
lockControl
(
ControlCommandVO
vo
)
throws
Exception
;
JsonViewObject
recoverSchedule
(
CrossIdBO
crossIdBO
)
throws
Exception
;
JsonViewObject
lightStatusOneHist
(
CrossIdDateTimeDTO
crossIdDateTimeDTO
)
throws
Exception
;
}
signal-optimize-service/src/main/java/net/wanji/opt/service/signalcontrol/impl/FeignProxyServiceImpl.java
View file @
d68c1478
...
...
@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import
net.wanji.common.framework.exception.FeignServiceException
;
import
net.wanji.common.framework.rest.JsonViewObject
;
import
net.wanji.databus.bo.CrossIdBO
;
import
net.wanji.databus.dto.CrossIdDateTimeDTO
;
import
net.wanji.databus.entity.develop.servicedevelop.develop.StatusCodeEnum
;
import
net.wanji.databus.vo.ControlCommandVO
;
import
net.wanji.databus.vo.LockControlVO
;
...
...
@@ -161,4 +162,9 @@ public class FeignProxyServiceImpl implements FeignProxyService {
public
JsonViewObject
recoverSchedule
(
CrossIdBO
crossIdBO
)
throws
Exception
{
return
utcFeignClients
.
recoverSchedule
(
crossIdBO
.
getCrossId
());
}
@Override
public
JsonViewObject
lightStatusOneHist
(
CrossIdDateTimeDTO
crossIdDateTimeDTO
)
throws
Exception
{
return
utcFeignClients
.
selectLightStatusHist
(
crossIdDateTimeDTO
);
}
}
wj-databus/src/main/java/net/wanji/databus/dto/CrossIdDateTimeDTO.java
0 → 100644
View file @
d68c1478
package
net
.
wanji
.
databus
.
dto
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
import
java.util.Date
;
/**
* @author duanruiming
* @date 2025/03/19 11:18
*/
@Data
@ApiModel
(
value
=
"CrossIdDateTimeDTO"
,
description
=
"路口编号日期查询实体"
)
public
class
CrossIdDateTimeDTO
{
@ApiModelProperty
(
value
=
"路口ID,如:13NM30B5QR0"
,
required
=
true
)
@NotNull
(
message
=
"crossId不可为空"
)
private
String
crossId
;
@ApiModelProperty
(
value
=
"当前日期时间 yyyy-MM-dd HH:mm:ss"
,
required
=
true
)
@NotNull
(
message
=
"datetime不可为空"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
datetime
;
}
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