[add] 优化灯态实体类

pom.xml

@@ -35,6 +35,7 @@
         <module>wj-identity</module>
         <module>wj-portal</module>
         <module>signal-utc-dt-service</module>
+        <module>signal-utc-hisense-service</module>
     </modules>
 
     <!-- 依赖版本 -->

signal-utc-dt-service/src/main/java/net/wanji/utc/dt/service/controller/impl/DTSignalStatusServiceImpl.java

@@ -202,7 +202,7 @@ public class DTSignalStatusServiceImpl implements SignalStatusService {
             if (!CollectionUtils.isEmpty(schemeInfoPojos)) {
                 for (SchemeInfoPojo schemeInfoPojo : schemeInfoPojos) {
                     if (Objects.equals(schemeInfoPojo.getSchemeId(), currentSchemeId)) {
-                        lightsStatusVO.setPlanId(String.valueOf(currentSchemeId));
+                        lightsStatusVO.setSchemeId(String.valueOf(currentSchemeId));
                         lightsStatusVO.setCycleLen(schemeInfoPojo.getCycle());
                         List<SchemeInfoPojo.SchemeStagePojo> stageInfoList = SchemeInfoPojo.getStageInfoList(schemeInfoPojo);
                         List<PhaseStageInfoPojo> phaseStageInfoPojos = SignalDataCache.phaseStageInfoCache.get(crossId);

wj-databus/src/main/java/net/wanji/databus/vo/LightsStatusVO.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,47 +13,29 @@ import java.util.Map;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class LightsStatusVO extends BaseCrossInfo {
-    //运行模式
     @ApiModelProperty(value = "运行模式 `2=手动锁定当前相位`，`3=手动全红`，`4=手动黄闪`，`5=手动关灯`，" +
             "`6=全红闪控制`，`7=全黄控制`，`8=正常按计划运行`，`9=手动步进控制`，`10=自动步进控制`，`11=恢复时间表`，`255=临时控制方案`")
     private String runMode;
-    //控制模式
     @ApiModelProperty(value = "控制模式")
     private String controlMode;
-    //相位方案号
     @ApiModelProperty(value = "相位方案号")
     private String phasePlanId;
-    //相位配时方案
-    @ApiModelProperty(value = "相位配时方案")
-    private String timePlanId;
-    //方案开始时间
-    @ApiModelProperty(value = "方案开始时间")
-    private String planStartTime;
-    //方案运行时间
-    @ApiModelProperty(value = "方案运行时间")
-    private Integer runTime;
-    //相位周期剩余时长
+    @ApiModelProperty(value = "方案开始时间", notes = "目前没有用到")
+    private String schemeStartTime;
     @ApiModelProperty(value = "相位周期剩余时长")
     private Integer cycleCountDown;
-    @ApiModelProperty(value = "相位周期剩余时长")
+    @ApiModelProperty(value = "相位周期剩余时长", notes = "目前没有用到，周期剩余时长就是相位剩余时长")
     private Integer cyclePhaseCountDown;
-    //相位周期时长
     @ApiModelProperty(value = "相位周期时长")
     private Integer cycleLen;
-    //运行环数组
-    private List<SignalRunring> runrings;
 
-    //相位编号
     @ApiModelProperty(value = "当前相位号")
     private String phaseId;
-    //方案编号
     @ApiModelProperty(value = "当前方案号")
-    private String planId;
-    //灯组状态
+    private String schemeId;
     @ApiModelProperty(value = "灯组状态")
     private Map<String,Object> dirLampGroupMap;
-    //相位对象：key：相位编号，value：绿灯时长
-    @ApiModelProperty(value = "相位对象：key相位编号，value绿灯时长")
+    @ApiModelProperty(value = "相位对象：key相位编号，value绿灯时长,", notes = "目前没有用到")
     private Map<String,Object> phaseMap;
 
     public void setCycleCountDown(Integer cycleCountDown) {
@@ -64,7 +45,6 @@ public class LightsStatusVO extends BaseCrossInfo {
             this.cycleCountDown = cycleCountDown;
         }
     }
-
     public Integer getCycleCountDown() {
         if (null == cycleCountDown) {
             return -1;