joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test' into ci-restruct

Browse Source
This commit is contained in:
walker-sheng 2021-09-06 14:25:40 +08:00
commit 3bc0ce321f
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java
View File

@ -11,7 +11,8 @@ public enum MapPrdTypeEnum {
SCHEDULING("05", "派班工作站"),
ISCS("06", "ISCS工作站"),
BIG_SCREEN("07", "大屏工作站"),
RUN_PLAN_MAKE("08", "运行图编制工作站")
RUN_PLAN_MAKE("08", "运行图编制工作站"),
DEPOT_IL("09", "车辆段联锁工作站"),
;
private String code;

11
src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java
View File

@ -11,13 +11,7 @@ import club.joylink.rtss.vo.client.validGroup.DraftMapCreateCheck;
import club.joylink.rtss.vo.client.validGroup.DraftMapCreateFromCheck;
import club.joylink.rtss.vo.client.validGroup.DraftMapPublishCheck;
import club.joylink.rtss.vo.map.*;
import club.joylink.rtss.vo.map.logic.MapAutoReentryVO;
import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO;
import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO;
import club.joylink.rtss.vo.map.logic.MapRouteNewVO;
import club.joylink.rtss.vo.map.logic.MapRoutingDataVO;
import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO;
import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO;
import club.joylink.rtss.vo.map.logic.*;
import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO;
import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO;
import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO;
@ -111,9 +105,6 @@ public class DraftMapController {
this.iDraftMapService.updateCheckConfig(id, checkConfig);
}
/**
* 保存地图元素信息
*/
/**
*保存地图草稿对象数据
*/

2
src/main/java/club/joylink/rtss/vo/map/display/DisplayVO.java
View File

@ -1,5 +1,6 @@
package club.joylink.rtss.vo.map.display;
import club.joylink.rtss.constants.MapPrdTypeEnum;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@ -10,6 +11,7 @@ import java.util.List;
@Setter
@NoArgsConstructor
public class DisplayVO {
private MapPrdTypeEnum type;
private List<String> stationCodeList;
private List<String> elementList;