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
c98cd06f
Commit
c98cd06f
authored
Jan 03, 2024
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] UTC模拟灯态优化,删除厂商,解决调用报错
parent
f217bd71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
BasicEnum.java
...rc/main/java/net/wanji/utc/common/typeenum/BasicEnum.java
+1
-2
SignalStatusTask.java
...ce/src/main/java/net/wanji/utc/task/SignalStatusTask.java
+1
-1
No files found.
signal-utc-service/src/main/java/net/wanji/utc/common/typeenum/BasicEnum.java
View file @
c98cd06f
...
@@ -9,8 +9,7 @@ public class BasicEnum {
...
@@ -9,8 +9,7 @@ public class BasicEnum {
public
enum
ManufacturerEnum
{
public
enum
ManufacturerEnum
{
HK
(
"海康"
,
"HK"
),
HK
(
"海康"
,
"HK"
),
DT
(
"东土"
,
"DT"
),
DT
(
"东土"
,
"DT"
),
HISENSE
(
"海信"
,
"HISENSE"
),
HISENSE
(
"海信"
,
"HISENSE"
);
STATIC
(
"静态方案灯态"
,
"STATIC"
);
private
String
nick
;
private
String
nick
;
private
String
code
;
private
String
code
;
...
...
signal-utc-service/src/main/java/net/wanji/utc/task/SignalStatusTask.java
View file @
c98cd06f
...
@@ -105,7 +105,7 @@ public class SignalStatusTask {
...
@@ -105,7 +105,7 @@ public class SignalStatusTask {
JsonViewObject
jsonViewObject
=
utcHisenseFeignClients
.
lightStatus
(
crossId
);
JsonViewObject
jsonViewObject
=
utcHisenseFeignClients
.
lightStatus
(
crossId
);
lightsStatusVOS
=
mapper
.
convertValue
(
jsonViewObject
.
getContent
(),
new
TypeReference
<
List
<
LightsStatusVO
>>()
{
lightsStatusVOS
=
mapper
.
convertValue
(
jsonViewObject
.
getContent
(),
new
TypeReference
<
List
<
LightsStatusVO
>>()
{
});
});
}
else
if
(
StringUtils
.
endsWithIgnoreCase
(
BasicEnum
.
ManufacturerEnum
.
STATIC
.
getCode
()
,
manufacturerInfoPO
.
getCode
()))
{
}
else
if
(
StringUtils
.
endsWithIgnoreCase
(
"STATIC"
,
manufacturerInfoPO
.
getCode
()))
{
LightsStatusVO
lightsStatusVO
=
SignalStatus4StaticSchemeTask
.
currentCrossLightStatusCache
.
get
(
crossId
);
LightsStatusVO
lightsStatusVO
=
SignalStatus4StaticSchemeTask
.
currentCrossLightStatusCache
.
get
(
crossId
);
if
(
Objects
.
nonNull
(
lightsStatusVO
))
{
if
(
Objects
.
nonNull
(
lightsStatusVO
))
{
lightsStatusVOS
=
new
ArrayList
<>();
lightsStatusVOS
=
new
ArrayList
<>();
...
...
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