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
67df2652
Commit
67df2652
authored
Jul 26, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 优化枚举类,去掉多余注解
parent
a936cd91
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
19 deletions
+10
-19
ControlModelEnum.java
.../java/net/wanji/utc/dt/common/enums/ControlModelEnum.java
+0
-2
ControlTypeEnum.java
...n/java/net/wanji/utc/dt/common/enums/ControlTypeEnum.java
+0
-2
PhaseLightColorEnum.java
...va/net/wanji/utc/dt/common/enums/PhaseLightColorEnum.java
+3
-5
SectionControlModeEnum.java
...net/wanji/utc/dt/common/enums/SectionControlModeEnum.java
+4
-5
SignalInterfaceTypeEnum.java
...et/wanji/utc/dt/common/enums/SignalInterfaceTypeEnum.java
+3
-5
No files found.
signal-utc-dt-service/src/main/java/net/wanji/utc/dt/common/enums/ControlModelEnum.java
View file @
67df2652
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
/**
/**
...
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
*/
*/
@Getter
@Getter
@AllArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
public
enum
ControlModelEnum
{
public
enum
ControlModelEnum
{
FIXED_CYCLE
(
1
,
"21"
,
"定周期"
),
FIXED_CYCLE
(
1
,
"21"
,
"定周期"
),
GREEN_WAVE
(
2
,
"13"
,
"绿波协调"
),
GREEN_WAVE
(
2
,
"13"
,
"绿波协调"
),
...
...
signal-utc-dt-service/src/main/java/net/wanji/utc/dt/common/enums/ControlTypeEnum.java
View file @
67df2652
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
/**
/**
...
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
*/
*/
@Getter
@Getter
@AllArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
public
enum
ControlTypeEnum
{
public
enum
ControlTypeEnum
{
FIXED_CYCLE
(
1
,
"0021"
,
"定周期"
),
FIXED_CYCLE
(
1
,
"0021"
,
"定周期"
),
GREEN_WAVE
(
2
,
"0032"
,
"全红"
),
GREEN_WAVE
(
2
,
"0032"
,
"全红"
),
...
...
signal-utc-dt-service/src/main/java/net/wanji/utc/dt/common/enums/PhaseLightColorEnum.java
View file @
67df2652
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
/**
/**
...
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -11,7 +10,6 @@ import org.apache.commons.lang3.StringUtils;
*/
*/
@Getter
@Getter
@AllArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
public
enum
PhaseLightColorEnum
{
public
enum
PhaseLightColorEnum
{
LIGHT_OFF
(
"01"
,
"off"
,
"关灯"
),
LIGHT_OFF
(
"01"
,
"off"
,
"关灯"
),
...
@@ -35,9 +33,9 @@ public enum PhaseLightColorEnum {
...
@@ -35,9 +33,9 @@ public enum PhaseLightColorEnum {
LIGHT_RED_YELLOW
(
"40"
,
"redYellow"
,
"红黄灯"
);
LIGHT_RED_YELLOW
(
"40"
,
"redYellow"
,
"红黄灯"
);
private
String
dtLightColor
;
private
final
String
dtLightColor
;
private
String
wjLightColor
;
private
final
String
wjLightColor
;
private
String
message
;
private
final
String
message
;
public
static
String
getWjLightColor
(
String
dtLightColor
)
{
public
static
String
getWjLightColor
(
String
dtLightColor
)
{
for
(
PhaseLightColorEnum
value
:
PhaseLightColorEnum
.
values
())
{
for
(
PhaseLightColorEnum
value
:
PhaseLightColorEnum
.
values
())
{
...
...
signal-utc-dt-service/src/main/java/net/wanji/utc/dt/common/enums/SectionControlModeEnum.java
View file @
67df2652
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
java.util.Objects
;
import
java.util.Objects
;
...
@@ -12,7 +11,6 @@ import java.util.Objects;
...
@@ -12,7 +11,6 @@ import java.util.Objects;
*/
*/
@Getter
@Getter
@AllArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
public
enum
SectionControlModeEnum
{
public
enum
SectionControlModeEnum
{
FIXED_CYCLE
(
1
,
"21"
,
"定周期"
),
FIXED_CYCLE
(
1
,
"21"
,
"定周期"
),
GREEN_WAVE
(
2
,
"13"
,
"绿灯"
),
GREEN_WAVE
(
2
,
"13"
,
"绿灯"
),
...
@@ -23,9 +21,9 @@ public enum SectionControlModeEnum {
...
@@ -23,9 +21,9 @@ public enum SectionControlModeEnum {
FULL_INDUCTION
(
7
,
"31"
,
"黄闪"
),
FULL_INDUCTION
(
7
,
"31"
,
"黄闪"
),
HALF_INDUCTION
(
8
,
"32"
,
"红闪"
);
HALF_INDUCTION
(
8
,
"32"
,
"红闪"
);
private
Integer
wjControl
;
private
final
Integer
wjControl
;
private
String
dtControlHex
;
private
final
String
dtControlHex
;
private
String
message
;
private
final
String
message
;
public
static
String
getDtControlMode
(
Integer
wjControlHex
)
{
public
static
String
getDtControlMode
(
Integer
wjControlHex
)
{
for
(
ControlModelEnum
value
:
ControlModelEnum
.
values
())
{
for
(
ControlModelEnum
value
:
ControlModelEnum
.
values
())
{
...
@@ -35,4 +33,5 @@ public enum SectionControlModeEnum {
...
@@ -35,4 +33,5 @@ public enum SectionControlModeEnum {
}
}
return
null
;
return
null
;
}
}
}
}
signal-utc-dt-service/src/main/java/net/wanji/utc/dt/common/enums/SignalInterfaceTypeEnum.java
View file @
67df2652
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
...
@@ -2,7 +2,6 @@ package net.wanji.utc.dt.common.enums;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
import
net.wanji.utc.dt.service.ControlCommandService
;
import
net.wanji.utc.dt.service.ControlCommandService
;
import
net.wanji.utc.dt.service.SignalStatusService
;
import
net.wanji.utc.dt.service.SignalStatusService
;
import
net.wanji.utc.dt.service.StaticInfoService
;
import
net.wanji.utc.dt.service.StaticInfoService
;
...
@@ -15,7 +14,6 @@ import java.util.Objects;
...
@@ -15,7 +14,6 @@ import java.util.Objects;
*/
*/
@Getter
@Getter
@AllArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
public
enum
SignalInterfaceTypeEnum
{
public
enum
SignalInterfaceTypeEnum
{
CONTROL
(
"control"
,
ControlCommandService
.
class
,
"控制类型接口"
),
CONTROL
(
"control"
,
ControlCommandService
.
class
,
"控制类型接口"
),
...
@@ -24,11 +22,11 @@ public enum SignalInterfaceTypeEnum {
...
@@ -24,11 +22,11 @@ public enum SignalInterfaceTypeEnum {
STATIC
(
"static"
,
StaticInfoService
.
class
,
"静态类型接口"
);
STATIC
(
"static"
,
StaticInfoService
.
class
,
"静态类型接口"
);
private
String
code
;
private
final
String
code
;
private
Object
type
;
private
final
Object
type
;
private
String
desc
;
private
final
String
desc
;
/**
/**
* 通过编号获取接口类型
* 通过编号获取接口类型
...
...
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