From 977491210800cc35e4f8e7914f1a52cfbd915604 Mon Sep 17 00:00:00 2001 From: walker-sheng Date: Thu, 19 Nov 2020 13:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E9=81=93=E4=BA=A4=E9=80=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=81=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/controller/LoginController.java | 2 +- .../controller/RunPlanDraftController.java | 4 +- .../controller/SchedulingPlanController.java | 92 -- .../SimulationManageOldController.java | 40 - .../SimulationRecordController.java | 69 -- .../rtss/controller/TaskController.java | 48 - .../controller/WxAuthenticateController.java | 19 - .../draft/DraftMapRunPlanController.java | 45 - .../controller/draft/DraftPlanController.java | 11 - .../{ => draft}/LessonDraftController.java | 2 +- .../{ => publish}/ExamController.java | 9 +- .../{ => publish}/LessonController.java | 2 +- .../publish/RunPlanTemplateController.java | 3 + .../simulation/FaultRuleController.java | 53 - .../simulation/JointSimulationController.java | 3 +- .../simulation/JointTrainingV1Controller.java | 186 ---- .../simulation/SimulationV1Controller.java | 12 +- .../controller/{ => user}/UserController.java | 4 +- .../{ => user}/UserExamController.java | 6 +- .../{ => user}/UserInfoController.java | 2 +- .../{ => user}/UserPermissionController.java | 2 +- .../{ => user}/UserUsageStatsController.java | 4 +- .../joylink/rtss/dao/LsLessonChapterDAO.java | 18 - .../dao/SimulationConversationMapper.java | 33 - .../SimulationConversationMemberMapper.java | 33 - .../SimulationConversationMessageMapper.java | 33 - .../rtss/dao/SimulationFrameMapper.java | 53 - .../rtss/dao/SimulationProcessRecordDAO.java | 15 - .../joylink/rtss/dao/SimulationRecordDAO.java | 12 - .../joylink/rtss/dao/SimulationRoomDAO.java | 21 - .../rtss/dao/SimulationRoomDeviceDAO.java | 12 - .../rtss/dao/SimulationRoomMemberDAO.java | 12 - .../rtss/dao/SimulationRoomRealDeviceDAO.java | 12 - .../rtss/dao/SimulationRunAsPlanMapper.java | 33 - .../club/joylink/rtss/dao/TaskMapper.java | 33 - .../rtss/entity/SimulationConversation.java | 85 -- .../entity/SimulationConversationExample.java | 532 ---------- .../entity/SimulationConversationMember.java | 184 ---- .../SimulationConversationMemberExample.java | 822 ---------------- .../entity/SimulationConversationMessage.java | 166 ---- .../SimulationConversationMessageExample.java | 733 -------------- .../joylink/rtss/entity/SimulationFrame.java | 105 -- .../rtss/entity/SimulationFrameExample.java | 403 -------- .../rtss/entity/SimulationProcessRecord.java | 109 --- .../SimulationProcessRecordExample.java | 473 --------- .../joylink/rtss/entity/SimulationRecord.java | 169 ---- .../rtss/entity/SimulationRecordExample.java | 733 -------------- .../joylink/rtss/entity/SimulationRoom.java | 217 ---- .../rtss/entity/SimulationRoomDevice.java | 120 --- .../entity/SimulationRoomDeviceExample.java | 552 ----------- .../rtss/entity/SimulationRoomExample.java | 923 ------------------ .../rtss/entity/SimulationRoomMember.java | 200 ---- .../entity/SimulationRoomMemberExample.java | 872 ----------------- .../rtss/entity/SimulationRoomRealDevice.java | 104 -- .../SimulationRoomRealDeviceExample.java | 472 --------- .../rtss/entity/SimulationRunAsPlan.java | 137 --- .../entity/SimulationRunAsPlanExample.java | 583 ----------- .../BusinessExceptionAssertEnum.java | 1 + .../rtss/services/IRunPlanDraftService.java | 4 +- .../rtss/services/ISchedulingPlanService.java | 137 --- .../services/ISimulationRecordService.java | 107 -- .../joylink/rtss/services/ITaskService.java | 35 - .../rtss/services/LessonDraftService.java | 128 ++- .../joylink/rtss/services/LessonService.java | 3 - .../services/PermissionDistributeService.java | 1 + .../rtss/services/RunPlanDraftService.java | 274 ++---- .../rtss/services/RunPlanTemplateService.java | 10 - .../rtss/services/SchedulingPlanService.java | 266 ----- .../services/SimulationRecordService.java | 321 ------ .../joylink/rtss/services/TaskService.java | 97 -- .../rtss/services/UserExamService.java | 91 +- .../rtss/services/UserPermissionService.java | 28 +- .../{ => auth}/AuthenticateService.java | 50 +- .../{ => auth}/IAuthenticateService.java | 2 +- .../auth/ProjectDeviceLogoutEvent.java | 16 + .../rtss/services/auth/UserLogoutEvent.java | 16 + .../student/ClassStudentUserServiceImpl.java | 8 +- .../user/IUserSimulationStatService.java | 91 ++ .../user/UserSimulationStatStatService.java | 127 +++ .../joylink/rtss/vo/client/DragSortReqVO.java | 14 +- .../club/joylink/rtss/vo/client/TreeNode.java | 100 ++ .../vo/runplan/newdraw/RunPlanGenerator.java | 51 + .../rtss/vo/runplan/newdraw/RunPlanInput.java | 81 ++ .../newdraw/mainstack/DrawFuzhouRunPlan.java | 73 ++ .../newdraw/mainstack/DrawHarbinRunPlan.java | 73 ++ .../newdraw/mainstack/DrawRunPlan.java | 330 +++++++ .../newrunplan/BeiJingLine1RunPlanNew.java | 263 +++++ .../newrunplan/ChengDuLine1RunPlanNew.java | 262 +++++ .../newrunplan/ChengDuLine3RunPlanNew.java | 169 ++++ .../runplan/newrunplan/DefaultRunPlanNew.java | 38 + .../newrunplan/FoshanTramRunPlanNew.java | 128 +++ .../newrunplan/FuZhouLine1RunPlanNew.java | 308 ++++++ .../newrunplan/HarBinLine1RunPlanNew.java | 252 +++++ .../newrunplan/IRunPlanStrategyNew.java | 226 +++++ .../newrunplan/NingBoLine1RunPlanNew.java | 209 ++++ .../newrunplan/XianLine1RunPlanNew.java | 155 +++ .../newrunplan/XianLine2RunPlanNew.java | 121 +++ .../newrunplan/XianLine3RunPlanNew.java | 186 ++++ .../mapper/SimulationConversationMapper.xml | 219 ----- .../SimulationConversationMemberMapper.xml | 281 ------ .../SimulationConversationMessageMapper.xml | 266 ----- .../mybatis/mapper/SimulationFrameMapper.xml | 242 ----- .../mapper/SimulationProcessRecordDAO.xml | 261 ----- .../mybatis/mapper/SimulationRecordDAO.xml | 260 ----- .../mybatis/mapper/SimulationRoomDAO.xml | 308 ------ .../mapper/SimulationRoomDeviceDAO.xml | 213 ---- .../mapper/SimulationRoomMemberDAO.xml | 293 ------ .../mapper/SimulationRoomRealDeviceDAO.xml | 198 ---- .../mapper/SimulationRunAsPlanMapper.xml | 234 ----- .../resources/mybatis/mapper/TaskMapper.xml | 299 ------ 110 files changed, 3522 insertions(+), 14036 deletions(-) delete mode 100644 src/main/java/club/joylink/rtss/controller/SchedulingPlanController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/SimulationManageOldController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/SimulationRecordController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/TaskController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/WxAuthenticateController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/draft/DraftMapRunPlanController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/draft/DraftPlanController.java rename src/main/java/club/joylink/rtss/controller/{ => draft}/LessonDraftController.java (98%) rename src/main/java/club/joylink/rtss/controller/{ => publish}/ExamController.java (95%) rename src/main/java/club/joylink/rtss/controller/{ => publish}/LessonController.java (99%) delete mode 100644 src/main/java/club/joylink/rtss/controller/simulation/FaultRuleController.java delete mode 100644 src/main/java/club/joylink/rtss/controller/simulation/JointTrainingV1Controller.java rename src/main/java/club/joylink/rtss/controller/{ => user}/UserController.java (97%) rename src/main/java/club/joylink/rtss/controller/{ => user}/UserExamController.java (92%) rename src/main/java/club/joylink/rtss/controller/{ => user}/UserInfoController.java (98%) rename src/main/java/club/joylink/rtss/controller/{ => user}/UserPermissionController.java (98%) rename src/main/java/club/joylink/rtss/controller/{ => user}/UserUsageStatsController.java (97%) delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationConversationMapper.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationConversationMemberMapper.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationConversationMessageMapper.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationFrameMapper.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationProcessRecordDAO.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationRecordDAO.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationRoomDAO.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationRoomDeviceDAO.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationRoomMemberDAO.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationRoomRealDeviceDAO.java delete mode 100644 src/main/java/club/joylink/rtss/dao/SimulationRunAsPlanMapper.java delete mode 100644 src/main/java/club/joylink/rtss/dao/TaskMapper.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationConversation.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationConversationExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationConversationMember.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationConversationMemberExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationConversationMessage.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationConversationMessageExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationFrame.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationFrameExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationProcessRecord.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationProcessRecordExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRecord.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRecordExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoom.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomDevice.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomDeviceExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomMember.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomMemberExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomRealDevice.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRoomRealDeviceExample.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRunAsPlan.java delete mode 100644 src/main/java/club/joylink/rtss/entity/SimulationRunAsPlanExample.java delete mode 100644 src/main/java/club/joylink/rtss/services/ISchedulingPlanService.java delete mode 100644 src/main/java/club/joylink/rtss/services/ISimulationRecordService.java delete mode 100644 src/main/java/club/joylink/rtss/services/ITaskService.java delete mode 100644 src/main/java/club/joylink/rtss/services/SchedulingPlanService.java delete mode 100644 src/main/java/club/joylink/rtss/services/SimulationRecordService.java delete mode 100644 src/main/java/club/joylink/rtss/services/TaskService.java rename src/main/java/club/joylink/rtss/services/{ => auth}/AuthenticateService.java (92%) rename src/main/java/club/joylink/rtss/services/{ => auth}/IAuthenticateService.java (97%) create mode 100644 src/main/java/club/joylink/rtss/services/auth/ProjectDeviceLogoutEvent.java create mode 100644 src/main/java/club/joylink/rtss/services/auth/UserLogoutEvent.java create mode 100644 src/main/java/club/joylink/rtss/services/user/IUserSimulationStatService.java create mode 100644 src/main/java/club/joylink/rtss/services/user/UserSimulationStatStatService.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanGenerator.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanInput.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawFuzhouRunPlan.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawHarbinRunPlan.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawRunPlan.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/BeiJingLine1RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine1RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine3RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/DefaultRunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FoshanTramRunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FuZhouLine1RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/HarBinLine1RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/IRunPlanStrategyNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/NingBoLine1RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine1RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine2RunPlanNew.java create mode 100644 src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine3RunPlanNew.java delete mode 100644 src/main/resources/mybatis/mapper/SimulationConversationMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationConversationMemberMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationConversationMessageMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationFrameMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationProcessRecordDAO.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationRecordDAO.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationRoomDAO.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationRoomDeviceDAO.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationRoomMemberDAO.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationRoomRealDeviceDAO.xml delete mode 100644 src/main/resources/mybatis/mapper/SimulationRunAsPlanMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/TaskMapper.xml diff --git a/src/main/java/club/joylink/rtss/controller/LoginController.java b/src/main/java/club/joylink/rtss/controller/LoginController.java index bb3cb8c36..032b827d8 100644 --- a/src/main/java/club/joylink/rtss/controller/LoginController.java +++ b/src/main/java/club/joylink/rtss/controller/LoginController.java @@ -1,7 +1,7 @@ package club.joylink.rtss.controller; import club.joylink.rtss.constants.Project; -import club.joylink.rtss.services.IAuthenticateService; +import club.joylink.rtss.services.auth.IAuthenticateService; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.LoginStatusVO; diff --git a/src/main/java/club/joylink/rtss/controller/RunPlanDraftController.java b/src/main/java/club/joylink/rtss/controller/RunPlanDraftController.java index 6c1b02a8c..04cd840e6 100644 --- a/src/main/java/club/joylink/rtss/controller/RunPlanDraftController.java +++ b/src/main/java/club/joylink/rtss/controller/RunPlanDraftController.java @@ -6,15 +6,13 @@ import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IRunPlanDraftService; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.map.MapRoutingSectionVO; -import club.joylink.rtss.vo.client.map.MapRoutingVO; import club.joylink.rtss.vo.client.map.newmap.MapStationParkingTimeVO; import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO; import club.joylink.rtss.vo.client.runplan.*; -import club.joylink.rtss.runplan.newdraw.RunPlanInput; import club.joylink.rtss.vo.client.validGroup.RunPlanCreateCheck; import club.joylink.rtss.vo.client.validGroup.RunPlanNameCheck; import club.joylink.rtss.vo.client.validGroup.ValidList; +import club.joylink.rtss.vo.runplan.newdraw.RunPlanInput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/controller/SchedulingPlanController.java b/src/main/java/club/joylink/rtss/controller/SchedulingPlanController.java deleted file mode 100644 index 04efe41df..000000000 --- a/src/main/java/club/joylink/rtss/controller/SchedulingPlanController.java +++ /dev/null @@ -1,92 +0,0 @@ -package club.joylink.rtss.controller; - -import club.joylink.rtss.services.ISchedulingPlanService; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.scheduling.SchedulingCheckResult; -import club.joylink.rtss.vo.client.scheduling.SchedulingPlanVO; -import club.joylink.rtss.vo.client.scheduling.SchedulingTrainEditVO; -import club.joylink.rtss.vo.client.scheduling.TrainBaseInfoVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.validation.constraints.NotBlank; -import java.time.LocalDate; -import java.util.List; - -@Api(tags = { "派班计划接口" }) -@RestController -@RequestMapping(path = "/api/scheduling") -public class SchedulingPlanController { - - @Autowired - private ISchedulingPlanService iSchedulingPlanService; - - @ApiOperation(value = "创建派班计划仿真") - @PostMapping(path = "/simulation") - public String schedulingPlanSimulation(@RequestParam Long mapId, - @RequestParam String prdType, - @ApiIgnore @RequestAttribute UserVO user) { - return this.iSchedulingPlanService.schedulingPlanSimulation(mapId, prdType, user); - } - - @ApiOperation(value = "查询某天的派班计划") - @GetMapping(path = "/{group}/day") - public SchedulingPlanVO findSchedulingPlanOfDay(@PathVariable @NotBlank String group, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate day, - @ApiIgnore @RequestAttribute UserVO user) { - return this.iSchedulingPlanService.findSchedulingPlan(group, day, user); - } - - @ApiOperation(value = "生成某天的基础派班计划") - @PostMapping(path = "/{group}/generate") - public SchedulingPlanVO generateBaseSchedulingPlanOfDay(@PathVariable @NotBlank String group, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate day, - @ApiIgnore @RequestAttribute UserVO user) { - return this.iSchedulingPlanService.generateBaseSchedulingPlanOfDay(group, day, user); - } - - @ApiOperation(value = "获取所有列车") - @GetMapping(path = "/{group}/train/all") - public List getAllTrains(@PathVariable @NotBlank String group) { - return this.iSchedulingPlanService.getAllTrains(group); - } - - @ApiOperation(value = "检查派班计划冲突") - @PostMapping(path = "/{group}/check") - public SchedulingCheckResult checkConflict(@PathVariable @NotBlank String group, - @Validated @RequestBody List editVOList) { - return this.iSchedulingPlanService.checkConflict(group, editVOList); - } - - @ApiOperation(value = "保存派班计划数据") - @PostMapping(path = "/{group}/save") - public void saveSchedulingPlan(@PathVariable @NotBlank String group, - @Validated @RequestBody List editVOList) { - this.iSchedulingPlanService.saveSchedulingPlan(group, editVOList); - } - - @ApiOperation(value = "删除派班计划,并重新生成基础计划") - @DeleteMapping(path = "/{group}/rebuild") - public SchedulingPlanVO deleteAndRebuildSchedulingPlan(@PathVariable @NotBlank String group, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate day, - @ApiIgnore @RequestAttribute UserVO user) { - return this.iSchedulingPlanService.deleteAndRebuildSchedulingPlan(group, day, user); - } - - @ApiOperation(value = "生成地图通用派班计划") - @PostMapping(path = "/common/generate") - public void generateMapCommonSchedulingPlan(Long mapId, @ApiIgnore @RequestAttribute UserVO user) { - this.iSchedulingPlanService.generateMapCommonSchedulingPlan(mapId, user); - } - - @ApiOperation(value = "生成所有已发布地图的通用派班计划", hidden = true) - @PostMapping(path = "/common/generate/all") - public void generateCommonSchedulingPlan(@ApiIgnore @RequestAttribute UserVO user) { - this.iSchedulingPlanService.generateCommonSchedulingPlan(user); - } -} diff --git a/src/main/java/club/joylink/rtss/controller/SimulationManageOldController.java b/src/main/java/club/joylink/rtss/controller/SimulationManageOldController.java deleted file mode 100644 index dc9ddf02c..000000000 --- a/src/main/java/club/joylink/rtss/controller/SimulationManageOldController.java +++ /dev/null @@ -1,40 +0,0 @@ -package club.joylink.rtss.controller; - -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.constant.ExceptionMapping; -import club.joylink.rtss.services.ISimulationService; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.SimulationVO; -import club.joylink.rtss.vo.client.simulation.SimulationPageQueryVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.validation.constraints.NotBlank; - -@Api(tags = { "仿真管理接口" }) -@RestController -@RequestMapping(path = "/api/simulation/manage") -public class SimulationManageOldController { - - @Autowired - private ISimulationService iSimulationService; - - @ApiOperation(value = "分页查询存在的仿真") - @GetMapping(path = "/page") - public PageVO pageQueryExistSimulations(SimulationPageQueryVO queryVO, @ApiIgnore @RequestAttribute UserVO user) { - if(!user.isAdmin()) return null; - return this.iSimulationService.pageQueryExistSimulations(queryVO); - } - - @ApiOperation(value = "结束仿真") - @DeleteMapping(path = "/{group}") - public void overSimulation(@PathVariable @NotBlank String group, @ApiIgnore @RequestAttribute UserVO user) { - if(!user.isSuperAdmin()) throw new BusinessException(ExceptionMapping.ROLE_OPERATION_REFUSE); - this.iSimulationService.adminForceClearSimulation(group); - } - -} diff --git a/src/main/java/club/joylink/rtss/controller/SimulationRecordController.java b/src/main/java/club/joylink/rtss/controller/SimulationRecordController.java deleted file mode 100644 index 04265bf61..000000000 --- a/src/main/java/club/joylink/rtss/controller/SimulationRecordController.java +++ /dev/null @@ -1,69 +0,0 @@ -package club.joylink.rtss.controller; - -import club.joylink.rtss.services.ISimulationRecordService; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.PageQueryVO; -import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.SimulationRecordVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -@Api(tags = { "仿真记录管理接口" }) -@RestController -@RequestMapping(path = "/api/simulationRecord") -public class SimulationRecordController { - - @Autowired - private ISimulationRecordService iSimulationRecordService; - - @ApiOperation(value = "分页查询仿真记录") - @GetMapping(path = "") - public PageVO queryPagedRecord(PageQueryVO queryVO) { - return this.iSimulationRecordService.queryPagedRecord(queryVO); - } - - @ApiOperation(value = "回放") - @GetMapping(path = "/{id}/playBack") - public void playBack(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.playBack(id, user); - } - - @ApiOperation(value = "设置播放速度") - @PutMapping(path = "/{id}/playSpeed") - public void setPlaySpeed(@PathVariable Long id, float playSpeed, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.setPlaySpeed(id, playSpeed, user); - } - - @ApiOperation(value = "暂停") - @PutMapping(path = "/{id}/pause") - public void pause(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.pause(id, user); - } - - @ApiOperation(value = "播放") - @PutMapping(path = "/{id}/play") - public void play(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.play(id, user); - } - - @ApiOperation(value = "设置播放时间点") - @PutMapping(path = "/{id}/playTime") - public void setPlayTime(@PathVariable Long id, Long offsetSeconds, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.setPlayTime(id, offsetSeconds, user); - } - - @ApiOperation(value = "结束") - @PutMapping(path = "/{id}/over") - public void over(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.over(id, user); - } - - @ApiOperation(value = "删除记录") - @DeleteMapping(path = "/{id}") - public void delete(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { - this.iSimulationRecordService.delete(id, user); - } -} diff --git a/src/main/java/club/joylink/rtss/controller/TaskController.java b/src/main/java/club/joylink/rtss/controller/TaskController.java deleted file mode 100644 index 46286204c..000000000 --- a/src/main/java/club/joylink/rtss/controller/TaskController.java +++ /dev/null @@ -1,48 +0,0 @@ -package club.joylink.rtss.controller; - -import club.joylink.rtss.services.ITaskService; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.TaskListVO; -import club.joylink.rtss.vo.client.TaskQueryVO; -import club.joylink.rtss.vo.client.TaskVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -@Api(tags = { "任务接口" }) -@RestController -@RequestMapping(path = "/api/task") -public class TaskController { - - @Autowired - private ITaskService iTaskService; - - @ApiOperation(value = "分页查询任务数据") - @GetMapping(path = "") - public PageVO queryPagedTask(TaskQueryVO queryVO) { - return this.iTaskService.queryPagedTask(queryVO); - } - - @ApiOperation(value = "创建任务") - @PostMapping(path = "") - public void createTask(@RequestBody @Validated TaskVO taskVO, @ApiIgnore @RequestAttribute UserVO user) { - this.iTaskService.createTask(taskVO, user); - } - - @ApiOperation(value = "开始任务") - @PostMapping(path = "/{id}/execute") - public void start(@PathVariable Long id) { - this.iTaskService.execute(id); - } - - @ApiOperation(value = "取消任务") - @PostMapping(path = "/{id}/cancel") - public void cancel(@PathVariable Long id) { - this.iTaskService.cancel(id); - } - -} diff --git a/src/main/java/club/joylink/rtss/controller/WxAuthenticateController.java b/src/main/java/club/joylink/rtss/controller/WxAuthenticateController.java deleted file mode 100644 index bdd03d807..000000000 --- a/src/main/java/club/joylink/rtss/controller/WxAuthenticateController.java +++ /dev/null @@ -1,19 +0,0 @@ -package club.joylink.rtss.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/wxauth") -public class WxAuthenticateController { - -// @Autowired -// private IAuthenticateService iAuthenticateService; -// -// @ApiOperation(value = "根据微信小程序code获取用户信息") -// @GetMapping(path = "/micro") -// public UserVO getUserInfoByWMCode(String wmCode) { -// return this.iAuthenticateService.getUserInfoByWMCode(wmCode); -// } - -} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunPlanController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunPlanController.java deleted file mode 100644 index 6e5bb207d..000000000 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunPlanController.java +++ /dev/null @@ -1,45 +0,0 @@ -package club.joylink.rtss.controller.draft; - -import club.joylink.rtss.entity.DraftMapRunPlan; -import club.joylink.rtss.services.IDraftMapRunPlanService; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.runplan.RunPlanEChartsDataVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@Api(tags = {"草稿地图运行计划接口"}) -@RestController -@RequestMapping("/api/draftMap/runPlan") -public class DraftMapRunPlanController { - - @Autowired - private IDraftMapRunPlanService iDraftMapRunPlanService; - - @ApiOperation(value = "根据草稿地图id查询草稿地图运行图") - @GetMapping("/findByDraftMapId/{draftMapId}") - public List findByDraftMapId(@PathVariable Long draftMapId){ - return iDraftMapRunPlanService.findByDraftMapId(draftMapId); - } - - @ApiOperation(value = "根据草稿运行图id查询数据绘制运行图") - @GetMapping("/selectDiagramData/{planId}") - public RunPlanEChartsDataVO selectDiagramData(@PathVariable Long planId){ - return iDraftMapRunPlanService.selectDiagramData(planId); - } - - @ApiOperation(value = "运行图仿真测试") - @GetMapping("/simulationCheck/{planId}") - public String simulationCheck(@PathVariable Long planId, @RequestAttribute UserVO user){ - return iDraftMapRunPlanService.simulationCheck(planId,user); - } - - @ApiOperation(value = "根据草稿地图id查询车站") - @GetMapping("/selectMapStation/{draftMapId}") - public List selectMapStation(@PathVariable Long draftMapId){ - return iDraftMapRunPlanService.selectMapStation(draftMapId); - } -} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftPlanController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftPlanController.java deleted file mode 100644 index 20e46066f..000000000 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftPlanController.java +++ /dev/null @@ -1,11 +0,0 @@ -package club.joylink.rtss.controller.draft; - -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = {"发布地图用户运行计划接口"}) -@RestController -@RequestMapping("/api/plan") -public class DraftPlanController { -} diff --git a/src/main/java/club/joylink/rtss/controller/LessonDraftController.java b/src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java similarity index 98% rename from src/main/java/club/joylink/rtss/controller/LessonDraftController.java rename to src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java index 4ef292b0a..547314f61 100644 --- a/src/main/java/club/joylink/rtss/controller/LessonDraftController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.ILessonDraftService; import club.joylink.rtss.vo.UserVO; diff --git a/src/main/java/club/joylink/rtss/controller/ExamController.java b/src/main/java/club/joylink/rtss/controller/publish/ExamController.java similarity index 95% rename from src/main/java/club/joylink/rtss/controller/ExamController.java rename to src/main/java/club/joylink/rtss/controller/publish/ExamController.java index a56ce074f..d10e44ca3 100644 --- a/src/main/java/club/joylink/rtss/controller/ExamController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/ExamController.java @@ -1,10 +1,11 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.publish; -import club.joylink.rtss.constants.RoleEnum; -import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IExamService; import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.*; +import club.joylink.rtss.vo.client.ExamDefinitionQueryVO; +import club.joylink.rtss.vo.client.ExamDefinitionVO; +import club.joylink.rtss.vo.client.ExamsLessonVO; +import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.validGroup.ExamDefinitionCheck; import club.joylink.rtss.vo.client.validGroup.ExamDefinitionRulesCheck; import io.swagger.annotations.Api; diff --git a/src/main/java/club/joylink/rtss/controller/LessonController.java b/src/main/java/club/joylink/rtss/controller/publish/LessonController.java similarity index 99% rename from src/main/java/club/joylink/rtss/controller/LessonController.java rename to src/main/java/club/joylink/rtss/controller/publish/LessonController.java index a2e15351e..a7b247b6a 100644 --- a/src/main/java/club/joylink/rtss/controller/LessonController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/LessonController.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.publish; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; diff --git a/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java b/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java index ff0718824..993a9f3f2 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java @@ -1,5 +1,7 @@ package club.joylink.rtss.controller.publish; +import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IRunPlanTemplateService; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; @@ -50,6 +52,7 @@ public class RunPlanTemplateController { @ApiOperation(value = "删除运行图模板") @DeleteMapping(path = "/{planId}") + @Role({RoleEnum.SuperAdmin,RoleEnum.Admin}) public void deleteTemplatePlan(@PathVariable Long planId, @ApiIgnore @RequestAttribute UserVO user) { this.iRunPlanTemplateService.deletePlan(planId, user); } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/FaultRuleController.java b/src/main/java/club/joylink/rtss/controller/simulation/FaultRuleController.java deleted file mode 100644 index 00b0d8961..000000000 --- a/src/main/java/club/joylink/rtss/controller/simulation/FaultRuleController.java +++ /dev/null @@ -1,53 +0,0 @@ -package club.joylink.rtss.controller.simulation;//package club.joylink.rtss.controller.simulation; -// -//import club.joylink.rtss.services.fault.IFaultRuleService; -//import club.joylink.rtss.vo.client.PageVO; -//import club.joylink.rtss.vo.client.fault.FaultRuleQueryVO; -//import club.joylink.rtss.vo.client.fault.FaultRuleVO; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.*; -// -//import javax.validation.Valid; -// -//@Api(tags = {"故障规则管理接口"}) -//@RestController -//@RequestMapping(path = "/api/v1/faultRule") -//public class FaultRuleController { -// -// @Autowired -// private IFaultRuleService faultRuleService; -// -// @ApiOperation(value = "创建故障规则") -// @RequestMapping(method = RequestMethod.POST) -// public void createFaultRule(@Valid @RequestBody FaultRuleVO faultRuleVO) { -// faultRuleService.addFaultRule(faultRuleVO); -// } -// -// @ApiOperation(value = "修改故障规则") -// @RequestMapping(method = RequestMethod.PUT) -// public void updateFaultRule(@Valid @RequestBody FaultRuleVO faultRuleVO) { -// faultRuleService.updateFaultRule(faultRuleVO); -// } -// -// @ApiOperation(value = "条件分页查询") -// @RequestMapping(path = "/page",method = RequestMethod.GET) -// public PageVO selectFaultRules(FaultRuleQueryVO faultRuleQueryVO) { -// return faultRuleService.getByPage(faultRuleQueryVO); -// -// } -// -// @ApiOperation(value = "根据指令id查询故障规则信息") -// @RequestMapping(path = "{id}",method = RequestMethod.GET) -// public FaultRuleVO selectFaultRuleById(@PathVariable Long id) { -// return faultRuleService.getBy(id); -// -// } -// -// @ApiOperation(value = "根据id删除故障规则") -// @RequestMapping(path = "{id}", method = RequestMethod.DELETE) -// public void deleteCommand(@PathVariable Long id) { -// faultRuleService.deleteFaultRule(id); -// } -//} diff --git a/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java b/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java index 187a3c3f2..358f27e97 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java @@ -1,14 +1,13 @@ package club.joylink.rtss.controller.simulation; +import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; -import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.simulationv1.MemberAddParamVO; import club.joylink.rtss.vo.client.simulationv1.PlayRoleConfigVO; import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO; -import club.joylink.rtss.vo.client.simulationv1.SimulationUserVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/controller/simulation/JointTrainingV1Controller.java b/src/main/java/club/joylink/rtss/controller/simulation/JointTrainingV1Controller.java deleted file mode 100644 index 572c7d97f..000000000 --- a/src/main/java/club/joylink/rtss/controller/simulation/JointTrainingV1Controller.java +++ /dev/null @@ -1,186 +0,0 @@ -package club.joylink.rtss.controller.simulation;//package club.joylink.rtss.controller.simulation; -// -//import club.joylink.rtss.services.IJointTrainingV1Service; -//import club.joylink.rtss.vo.UserVO; -//import club.joylink.rtss.vo.client.*; -//import club.joylink.rtss.vo.client.room.RoomSimulationRealDeviceVO; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -//import org.springframework.web.multipart.MultipartFile; -//import springfox.documentation.annotations.ApiIgnore; -// -//import java.util.List; -// -//@Api(tags = { "新联合实训接口" }) -//@RestController -//@RequestMapping(path = "api/v1/jointTraining") -//public class JointTrainingV1Controller { -// -// @Autowired -// private IJointTrainingV1Service iJointTrainingService; -// -// @ApiOperation(value = "创建房间") -// @PostMapping(path = "/room") -// public String createRoom(@ApiIgnore @RequestAttribute UserVO user, -// @RequestBody @Validated JointTrainingRoomRequestVO requestVO) { -// return iJointTrainingService.createRoom(user, requestVO); -// } -// -// @ApiOperation(value = "查询房间") -// @GetMapping(path = "/room/{group}") -// public JointTrainingRoomNewVO selectRoom(@PathVariable String group) { -// return iJointTrainingService.selectRoom(group); -// } -// -// @ApiOperation(value = "查询创建的房间") -// @GetMapping(path = "/room") -// public List selectSelfRoom(@RequestParam long mapId, @ApiIgnore @RequestAttribute UserVO user) { -// return iJointTrainingService.findCreatedRoom(mapId, user); -// } -// -// @ApiOperation(value = "获取邀请房间列表") -// @GetMapping(path = "/room/list") -// public List getRoomList(@RequestParam(required = false) String projectCode,@ApiIgnore @RequestAttribute UserVO user) { -// return iJointTrainingService.getRoomListByProject(user.getId(),projectCode); -// } -// -// @ApiOperation(value = "加入房间") -// @PutMapping(path = "/room/join") -// public void join(@RequestParam String group, @ApiIgnore @RequestAttribute UserVO user) { -// iJointTrainingService.join(group, user.getId()); -// } -// -// @ApiOperation(value = "退出房间") -// @PutMapping(path = "/room/exit") -// public void exit(@RequestParam String group, @ApiIgnore @RequestAttribute UserVO user) { -// iJointTrainingService.exit(group, user.getId()); -// } -// -// @ApiOperation(value = "销毁房间") -// @DeleteMapping(path = "/room") -// public void destroy(@RequestParam String group, @ApiIgnore @RequestAttribute UserVO user) { -// iJointTrainingService.destroy(group,user); -// } -// -// @ApiOperation(value = "设置用户角色") -// @PutMapping(path = "/room/user/role") -// public void setUserRole(@RequestBody List jointTrainingUserVOList, -// @RequestParam String group, @ApiIgnore @RequestAttribute UserVO user) { -// iJointTrainingService.setUserRole(group, jointTrainingUserVOList, user); -// } -// -// @ApiOperation(value = "添加或更新真实设备和仿真对象连接") -// @PostMapping(path = "/room/realDevice") -// public void addOrUpdateRealDeviceConnection(@RequestParam String group, -// @RequestBody JointTrainingRoomDeviceVO roomDeviceVO) { -// this.iJointTrainingService.addOrUpdateRealDeviceConnection(group, roomDeviceVO); -// } -// -// @ApiOperation(value = "删除真实设备和仿真对象连接") -// @DeleteMapping(path = "/room/realDevice/{id}") -// public void deleteRealDeviceConnection(@RequestParam String group, @PathVariable Long id) { -// this.iJointTrainingService.deleteRealDeviceConnection(group, id); -// } -// -// @ApiOperation(value = "踢出用户") -// @PutMapping(path = "/room/user") -// public void deleteUser(@RequestParam Long userId, @ApiIgnore @RequestAttribute UserVO user, @RequestParam String group) { -// iJointTrainingService.deleteUser(group, userId); -// } -// -// @ApiOperation(value = "获取用户角色信息") -// @GetMapping(path = "/room/user/role") -// public JointTrainingUserNewVO selectUserRole(@RequestParam String group, @ApiIgnore @RequestAttribute UserVO user) { -// return iJointTrainingService.getUserInfoById(group, user.getId()); -// } -// -// @ApiOperation(value = "生成分发二维码") -// @PostMapping(path = "/qrCode") -// public String generateQrCode(String group, @ApiIgnore @RequestAttribute UserVO user) { -// return this.iJointTrainingService.generateQrCode(group); -// } -// -// @ApiOperation(value = "扫码领取仿真权限") -// @GetMapping(path = "/qrCode") -// public JointTrainingUserNewVO scanQrCode(String group, @ApiIgnore @RequestAttribute UserVO user) { -// return this.iJointTrainingService.scanQrCode(group, user); -// } -// -// @ApiOperation(value = "扫描综合演练房间二维码获取权限加入房间") -// @GetMapping(path = "/permission") -// public JointTrainingUserNewVO getPermission(String code, String group) { -// return this.iJointTrainingService.getPermission(code, group); -// } -// -// @ApiOperation(value = "获取房间里的用户列表") -// @GetMapping(path = "/room/{group}/user/list") -// public List selectUserList(@PathVariable String group) { -// return iJointTrainingService.selectUserList(group); -// } -// -// @ApiOperation(value = "获取房间真实设备连接关系列表（旧，西铁院项目用）") -// @GetMapping(path = "/room/{group}/devices") -// public List getRoomDeviceList(@PathVariable String group) { -// return iJointTrainingService.getRoomDeviceList(group); -// } -// -// @ApiOperation(value = "获取房间真实设备连接关系（新）") -// @GetMapping(path = "/room/{group}/realDevice/connect") -// public List getRoomRealDeviceList(@PathVariable String group) { -// return this.iJointTrainingService.getRoomRealDeviceList(group); -// } -// -// @ApiOperation(value = "连接真实设备(新)") -// @PutMapping(path = "/room/{group}/realDevice") -// public void updateRealDeviceConnect(@PathVariable String group, -// @RequestBody @Validated List deviceVOList) { -// this.iJointTrainingService.updateRealDeviceConnect(group, deviceVOList); -// } -// -// @ApiOperation(value = "通过文字聊天") -// @PostMapping(path = "/chatWithText") -// public void chatWithText(@RequestParam String group, -// @RequestBody ConversationMessageNewVO chatResponseVO, -// @ApiIgnore @RequestAttribute UserVO user) { -// this.iJointTrainingService.chatWithText(group, chatResponseVO.getMessage(), user); -// } -// -// @ApiOperation(value = "通过语音聊天") -// @PostMapping(path = "/chatWithAudio") -// public void chatWithAudio(@RequestParam String group, MultipartFile file, @ApiIgnore @RequestAttribute UserVO user) { -// this.iJointTrainingService.chatWithAudio(group, file, user); -// } -// -// @ApiOperation(value = "是否真实设备被其他仿真使用") -// @GetMapping(path = "/room/{group}/realDeviceUsed") -// public boolean isRealDeviceUsed(@PathVariable String group, String projectCode) { -// return this.iJointTrainingService.isRealDeviceUsed(group, projectCode); -// } -// -// @ApiOperation(value = "开始仿真") -// @PostMapping(path = "/room/simulation") -// public void startSimulation(String group, @ApiIgnore @RequestAttribute UserVO user) { -// iJointTrainingService.startSimulation(group, user); -// } -// -// @ApiOperation(value = "进入仿真") -// @PutMapping(path = "/room/simulation/user/entrance") -// public void userEntranceSimulation(@ApiIgnore @RequestAttribute UserVO user, @RequestParam String group) { -// iJointTrainingService.userEnterSimulation(user.getId(), group); -// } -// -// @ApiOperation(value = "结束仿真返回房间") -// @PutMapping(path = "/room/simulation/user/exit") -// public JointTrainingRoomNewVO userClosureSimulation(@ApiIgnore @RequestAttribute UserVO user, @RequestParam String group) { -// return iJointTrainingService.userExitSimulation(user.getId(), group); -// } -// -// @ApiOperation(value = "管理员结束所有人的仿真") -// @PutMapping(path = "/room/simulation/all") -// public JointTrainingRoomNewVO adminClosureSimulation(@RequestParam String group, @ApiIgnore @RequestAttribute UserVO user) { -// return iJointTrainingService.adminFinishSimulation(user, group); -// } -//} diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java index 1364a2f2c..69b3b79f4 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java @@ -1,7 +1,8 @@ package club.joylink.rtss.controller.simulation; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.constant.ExceptionMapping; +import club.joylink.rtss.controller.advice.AuthenticateInterceptor; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.services.IVirtualRealityIbpService; import club.joylink.rtss.simulation.cbtc.ATS.data.AtsAlarm; import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.simulation.cbtc.Simulation; @@ -12,8 +13,6 @@ import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityIbp; import club.joylink.rtss.simulation.cbtc.member.SimulationMember; import club.joylink.rtss.simulation.cbtc.script.ScriptBO; -import club.joylink.rtss.controller.advice.AuthenticateInterceptor; -import club.joylink.rtss.services.IVirtualRealityIbpService; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.fault.FaultRuleVO; @@ -170,10 +169,7 @@ public class SimulationV1Controller { @GetMapping("/{group}/loadTrainNumber") public int getLoadTrainNumber(@PathVariable String group, @DateTimeFormat(pattern = "HH:mm:ss") LocalTime time) { - if (Objects.isNull(time)) { - throw new BusinessException(ExceptionMapping.INTERFACE_PARAM_ERROR, - String.format("时间不能为空")); - } + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotNull(time, "时间不能为空"); return this.groupSimulationService.getGivenTimeCouldLoadedTrainNumber(group, time); } diff --git a/src/main/java/club/joylink/rtss/controller/UserController.java b/src/main/java/club/joylink/rtss/controller/user/UserController.java similarity index 97% rename from src/main/java/club/joylink/rtss/controller/UserController.java rename to src/main/java/club/joylink/rtss/controller/user/UserController.java index 9d5112d02..bdf8abe13 100644 --- a/src/main/java/club/joylink/rtss/controller/UserController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserController.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.user; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; @@ -9,8 +9,6 @@ import club.joylink.rtss.vo.UserQueryVO; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.UserConfigVO; -import club.joylink.rtss.vo.client.UserSubscribeVO; -import club.joylink.rtss.vo.client.map.MapVO; import club.joylink.rtss.vo.client.student.ExportStudentInfo; import club.joylink.rtss.vo.client.student.ImportStudentInfo; import club.joylink.rtss.vo.client.student.StudentClassVO; diff --git a/src/main/java/club/joylink/rtss/controller/UserExamController.java b/src/main/java/club/joylink/rtss/controller/user/UserExamController.java similarity index 92% rename from src/main/java/club/joylink/rtss/controller/UserExamController.java rename to src/main/java/club/joylink/rtss/controller/user/UserExamController.java index 05cea1f5e..cc7115c5d 100644 --- a/src/main/java/club/joylink/rtss/controller/UserExamController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserExamController.java @@ -1,5 +1,7 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.user; +import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.*; import org.springframework.beans.factory.annotation.Autowired; @@ -59,12 +61,14 @@ public class UserExamController { @ApiOperation(value = "修改用户考试数据") @PutMapping(path = "/{id}") + @Role({RoleEnum.SuperAdmin, RoleEnum.Admin}) public void updateUserExam(@PathVariable Long id, @RequestBody UserExamVO userExamVO, @ApiIgnore @RequestAttribute UserVO user) { this.iUserExamService.updateUserExam(id, userExamVO, user); } @ApiOperation(value = "删除用户考试数据") @DeleteMapping(path = "/{id}") + @Role({RoleEnum.SuperAdmin, RoleEnum.Admin}) public void queryPagedUserExam(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { this.iUserExamService.deleteUserExam(id, user); } diff --git a/src/main/java/club/joylink/rtss/controller/UserInfoController.java b/src/main/java/club/joylink/rtss/controller/user/UserInfoController.java similarity index 98% rename from src/main/java/club/joylink/rtss/controller/UserInfoController.java rename to src/main/java/club/joylink/rtss/controller/user/UserInfoController.java index 95318b47a..c68d45ad5 100644 --- a/src/main/java/club/joylink/rtss/controller/UserInfoController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserInfoController.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.user; import club.joylink.rtss.services.ISysUserService; import club.joylink.rtss.vo.UserVO; diff --git a/src/main/java/club/joylink/rtss/controller/UserPermissionController.java b/src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java similarity index 98% rename from src/main/java/club/joylink/rtss/controller/UserPermissionController.java rename to src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java index 8f3c6e80b..87f70c1f6 100644 --- a/src/main/java/club/joylink/rtss/controller/UserPermissionController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.user; import club.joylink.rtss.services.IUserPermissionService; import club.joylink.rtss.vo.UserVO; diff --git a/src/main/java/club/joylink/rtss/controller/UserUsageStatsController.java b/src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java similarity index 97% rename from src/main/java/club/joylink/rtss/controller/UserUsageStatsController.java rename to src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java index be80eb548..42702c22f 100644 --- a/src/main/java/club/joylink/rtss/controller/UserUsageStatsController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java @@ -1,7 +1,7 @@ -package club.joylink.rtss.controller; +package club.joylink.rtss.controller.user; -import club.joylink.rtss.services.IUserSimulationStatService; import club.joylink.rtss.services.IUserUsageStatsService; +import club.joylink.rtss.services.user.IUserSimulationStatService; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.UsageTotalStatsVO; import club.joylink.rtss.vo.client.UserRankStatsVO; diff --git a/src/main/java/club/joylink/rtss/dao/LsLessonChapterDAO.java b/src/main/java/club/joylink/rtss/dao/LsLessonChapterDAO.java index 55cf6f6d5..47fa8296d 100644 --- a/src/main/java/club/joylink/rtss/dao/LsLessonChapterDAO.java +++ b/src/main/java/club/joylink/rtss/dao/LsLessonChapterDAO.java @@ -2,10 +2,8 @@ package club.joylink.rtss.dao; import club.joylink.rtss.entity.LsLessonChapter; import club.joylink.rtss.entity.LsLessonChapterExample; -import club.joylink.rtss.vo.client.training.TrainingVO; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import java.util.List; @@ -15,22 +13,6 @@ import java.util.List; */ @Repository public interface LsLessonChapterDAO extends MyBatisBaseDao { - @Select("SELECT " + - "t.id AS id, " + - "t.name AS name, " + - "t.remarks AS remarks, " + - "t.skin_code AS skinCode, " + - "t.prd_type AS prdType, " + - "t.type AS type, " + - "t.locate_device_code AS locateDeviceCode, " + - "rel.trial AS trial, " + - "rel.order_num AS orderNum " + - "FROM training t " + - "INNER JOIN ls_rel_chapter_training rel " + - "ON t.id = rel.training_id " + - "WHERE rel.chapter_id = #{ chapterId }") - @SuppressWarnings("unused") - List selectChapterTrainingByChapterId(Long chapterId); @Insert(value = "") - void batchInsert(List list); -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/SimulationProcessRecordDAO.java b/src/main/java/club/joylink/rtss/dao/SimulationProcessRecordDAO.java deleted file mode 100644 index 59fa81188..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationProcessRecordDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationProcessRecord; -import club.joylink.rtss.entity.SimulationProcessRecordExample; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * SimulationProcessRecordDAO继承基类 - */ -@Repository -public interface SimulationProcessRecordDAO extends MyBatisBaseDao { - List selectByExampleWithBLOBs(SimulationProcessRecordExample example); -} diff --git a/src/main/java/club/joylink/rtss/dao/SimulationRecordDAO.java b/src/main/java/club/joylink/rtss/dao/SimulationRecordDAO.java deleted file mode 100644 index 2ac23298f..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationRecordDAO.java +++ /dev/null @@ -1,12 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationRecord; -import club.joylink.rtss.entity.SimulationRecordExample; -import org.springframework.stereotype.Repository; - -/** - * SimulationRecordDAO继承基类 - */ -@Repository -public interface SimulationRecordDAO extends MyBatisBaseDao { -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/SimulationRoomDAO.java b/src/main/java/club/joylink/rtss/dao/SimulationRoomDAO.java deleted file mode 100644 index 9b304be4f..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationRoomDAO.java +++ /dev/null @@ -1,21 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationRoom; -import club.joylink.rtss.entity.SimulationRoomExample; -import org.apache.ibatis.annotations.Update; -import org.springframework.stereotype.Repository; - -/** - * SimulationRoomDAO继承基类 - */ -@Repository -public interface SimulationRoomDAO extends MyBatisBaseDao { - - @Update("UPDATE " + - "simulation_room " + - "SET " + - "prd_type=#{prdType} " + - "WHERE " + - "map_prd_id=#{prdId}") - void fillPrdType(Long prdId, String prdType); -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/SimulationRoomDeviceDAO.java b/src/main/java/club/joylink/rtss/dao/SimulationRoomDeviceDAO.java deleted file mode 100644 index c2617874d..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationRoomDeviceDAO.java +++ /dev/null @@ -1,12 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationRoomDevice; -import club.joylink.rtss.entity.SimulationRoomDeviceExample; -import org.springframework.stereotype.Repository; - -/** - * SimulationRoomDeviceDAO继承基类 - */ -@Repository -public interface SimulationRoomDeviceDAO extends MyBatisBaseDao { -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/SimulationRoomMemberDAO.java b/src/main/java/club/joylink/rtss/dao/SimulationRoomMemberDAO.java deleted file mode 100644 index c2ee282b3..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationRoomMemberDAO.java +++ /dev/null @@ -1,12 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationRoomMember; -import club.joylink.rtss.entity.SimulationRoomMemberExample; -import org.springframework.stereotype.Repository; - -/** - * SimulationRoomMemberDAO继承基类 - */ -@Repository -public interface SimulationRoomMemberDAO extends MyBatisBaseDao { -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/SimulationRoomRealDeviceDAO.java b/src/main/java/club/joylink/rtss/dao/SimulationRoomRealDeviceDAO.java deleted file mode 100644 index f9ad8c7ca..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationRoomRealDeviceDAO.java +++ /dev/null @@ -1,12 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationRoomRealDevice; -import club.joylink.rtss.entity.SimulationRoomRealDeviceExample; -import org.springframework.stereotype.Repository; - -/** - * SimulationRoomRealDeviceDAO继承基类 - */ -@Repository -public interface SimulationRoomRealDeviceDAO extends MyBatisBaseDao { -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/SimulationRunAsPlanMapper.java b/src/main/java/club/joylink/rtss/dao/SimulationRunAsPlanMapper.java deleted file mode 100644 index 336b4d9e6..000000000 --- a/src/main/java/club/joylink/rtss/dao/SimulationRunAsPlanMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SimulationRunAsPlan; -import club.joylink.rtss.entity.SimulationRunAsPlanExample; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface SimulationRunAsPlanMapper { - long countByExample(SimulationRunAsPlanExample example); - - int deleteByExample(SimulationRunAsPlanExample example); - - int deleteByPrimaryKey(Long id); - - int insert(SimulationRunAsPlan record); - - int insertSelective(SimulationRunAsPlan record); - - List selectByExample(SimulationRunAsPlanExample example); - - SimulationRunAsPlan selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") SimulationRunAsPlan record, @Param("example") SimulationRunAsPlanExample example); - - int updateByExample(@Param("record") SimulationRunAsPlan record, @Param("example") SimulationRunAsPlanExample example); - - int updateByPrimaryKeySelective(SimulationRunAsPlan record); - - int updateByPrimaryKey(SimulationRunAsPlan record); -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/TaskMapper.java b/src/main/java/club/joylink/rtss/dao/TaskMapper.java deleted file mode 100644 index 312ff9a83..000000000 --- a/src/main/java/club/joylink/rtss/dao/TaskMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.Task; -import club.joylink.rtss.entity.TaskExample; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface TaskMapper { - long countByExample(TaskExample example); - - int deleteByExample(TaskExample example); - - int deleteByPrimaryKey(Long id); - - int insert(Task record); - - int insertSelective(Task record); - - List selectByExample(TaskExample example); - - Task selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") Task record, @Param("example") TaskExample example); - - int updateByExample(@Param("record") Task record, @Param("example") TaskExample example); - - int updateByPrimaryKeySelective(Task record); - - int updateByPrimaryKey(Task record); -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationConversation.java b/src/main/java/club/joylink/rtss/entity/SimulationConversation.java deleted file mode 100644 index 964a48f84..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationConversation.java +++ /dev/null @@ -1,85 +0,0 @@ -package club.joylink.rtss.entity; - -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; - -/** - * simulation_conversation - * @author - */ -@Getter -@Setter -public class SimulationConversation implements Serializable { - private Long id; - - /** - * 仿真记录id - */ - private Long recordId; - - /** - * 会话名称 - */ - private String name; - - /** - * 创建人id - */ - private Long creatorId; - - /** - * 是否群聊 - */ - private Boolean isGroup; - - private static final long serialVersionUID = 1L; - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationConversation other = (SimulationConversation) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRecordId() == null ? other.getRecordId() == null : this.getRecordId().equals(other.getRecordId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId())) - && (this.getIsGroup() == null ? other.getIsGroup() == null : this.getIsGroup().equals(other.getIsGroup())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRecordId() == null) ? 0 : getRecordId().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode()); - result = prime * result + ((getIsGroup() == null) ? 0 : getIsGroup().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", recordId=").append(recordId); - sb.append(", name=").append(name); - sb.append(", creatorId=").append(creatorId); - sb.append(", isGroup=").append(isGroup); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationConversationExample.java b/src/main/java/club/joylink/rtss/entity/SimulationConversationExample.java deleted file mode 100644 index 53bf699f9..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationConversationExample.java +++ /dev/null @@ -1,532 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.List; - -public class SimulationConversationExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SimulationConversationExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNull() { - addCriterion("creator_id is null"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNotNull() { - addCriterion("creator_id is not null"); - return (Criteria) this; - } - - public Criteria andCreatorIdEqualTo(Long value) { - addCriterion("creator_id =", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotEqualTo(Long value) { - addCriterion("creator_id <>", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThan(Long value) { - addCriterion("creator_id >", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) { - addCriterion("creator_id >=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThan(Long value) { - addCriterion("creator_id <", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThanOrEqualTo(Long value) { - addCriterion("creator_id <=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdIn(List values) { - addCriterion("creator_id in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotIn(List values) { - addCriterion("creator_id not in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdBetween(Long value1, Long value2) { - addCriterion("creator_id between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotBetween(Long value1, Long value2) { - addCriterion("creator_id not between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andIsGroupIsNull() { - addCriterion("is_group is null"); - return (Criteria) this; - } - - public Criteria andIsGroupIsNotNull() { - addCriterion("is_group is not null"); - return (Criteria) this; - } - - public Criteria andIsGroupEqualTo(Boolean value) { - addCriterion("is_group =", value, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupNotEqualTo(Boolean value) { - addCriterion("is_group <>", value, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupGreaterThan(Boolean value) { - addCriterion("is_group >", value, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_group >=", value, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupLessThan(Boolean value) { - addCriterion("is_group <", value, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupLessThanOrEqualTo(Boolean value) { - addCriterion("is_group <=", value, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupIn(List values) { - addCriterion("is_group in", values, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupNotIn(List values) { - addCriterion("is_group not in", values, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupBetween(Boolean value1, Boolean value2) { - addCriterion("is_group between", value1, value2, "isGroup"); - return (Criteria) this; - } - - public Criteria andIsGroupNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_group not between", value1, value2, "isGroup"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationConversationMember.java b/src/main/java/club/joylink/rtss/entity/SimulationConversationMember.java deleted file mode 100644 index 08450f08e..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationConversationMember.java +++ /dev/null @@ -1,184 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; - -/** - * simulation_conversation_member - * @author - */ -public class SimulationConversationMember implements Serializable { - private Long id; - - /** - * 会话id - */ - private Long conversationId; - - /** - * 成员角色(行调/车站值班员/列车司机等) - */ - private String role; - - /** - * 用户id - */ - private Long userId; - - /** - * 名称 - */ - private String name; - - /** - * 昵称 - */ - private String nickName; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 设备编号 - */ - private String deviceCode; - - /** - * 头像地址 - */ - private String avatarUrl; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getConversationId() { - return conversationId; - } - - public void setConversationId(Long conversationId) { - this.conversationId = conversationId; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getDeviceType() { - return deviceType; - } - - public void setDeviceType(String deviceType) { - this.deviceType = deviceType; - } - - public String getDeviceCode() { - return deviceCode; - } - - public void setDeviceCode(String deviceCode) { - this.deviceCode = deviceCode; - } - - public String getAvatarUrl() { - return avatarUrl; - } - - public void setAvatarUrl(String avatarUrl) { - this.avatarUrl = avatarUrl; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationConversationMember other = (SimulationConversationMember) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getConversationId() == null ? other.getConversationId() == null : this.getConversationId().equals(other.getConversationId())) - && (this.getRole() == null ? other.getRole() == null : this.getRole().equals(other.getRole())) - && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getNickName() == null ? other.getNickName() == null : this.getNickName().equals(other.getNickName())) - && (this.getDeviceType() == null ? other.getDeviceType() == null : this.getDeviceType().equals(other.getDeviceType())) - && (this.getDeviceCode() == null ? other.getDeviceCode() == null : this.getDeviceCode().equals(other.getDeviceCode())) - && (this.getAvatarUrl() == null ? other.getAvatarUrl() == null : this.getAvatarUrl().equals(other.getAvatarUrl())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getConversationId() == null) ? 0 : getConversationId().hashCode()); - result = prime * result + ((getRole() == null) ? 0 : getRole().hashCode()); - result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getNickName() == null) ? 0 : getNickName().hashCode()); - result = prime * result + ((getDeviceType() == null) ? 0 : getDeviceType().hashCode()); - result = prime * result + ((getDeviceCode() == null) ? 0 : getDeviceCode().hashCode()); - result = prime * result + ((getAvatarUrl() == null) ? 0 : getAvatarUrl().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", conversationId=").append(conversationId); - sb.append(", role=").append(role); - sb.append(", userId=").append(userId); - sb.append(", name=").append(name); - sb.append(", nickName=").append(nickName); - sb.append(", deviceType=").append(deviceType); - sb.append(", deviceCode=").append(deviceCode); - sb.append(", avatarUrl=").append(avatarUrl); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationConversationMemberExample.java b/src/main/java/club/joylink/rtss/entity/SimulationConversationMemberExample.java deleted file mode 100644 index c6a53bbc9..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationConversationMemberExample.java +++ /dev/null @@ -1,822 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.List; - -public class SimulationConversationMemberExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SimulationConversationMemberExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andConversationIdIsNull() { - addCriterion("conversation_id is null"); - return (Criteria) this; - } - - public Criteria andConversationIdIsNotNull() { - addCriterion("conversation_id is not null"); - return (Criteria) this; - } - - public Criteria andConversationIdEqualTo(Long value) { - addCriterion("conversation_id =", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdNotEqualTo(Long value) { - addCriterion("conversation_id <>", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdGreaterThan(Long value) { - addCriterion("conversation_id >", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdGreaterThanOrEqualTo(Long value) { - addCriterion("conversation_id >=", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdLessThan(Long value) { - addCriterion("conversation_id <", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdLessThanOrEqualTo(Long value) { - addCriterion("conversation_id <=", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdIn(List values) { - addCriterion("conversation_id in", values, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdNotIn(List values) { - addCriterion("conversation_id not in", values, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdBetween(Long value1, Long value2) { - addCriterion("conversation_id between", value1, value2, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdNotBetween(Long value1, Long value2) { - addCriterion("conversation_id not between", value1, value2, "conversationId"); - return (Criteria) this; - } - - public Criteria andRoleIsNull() { - addCriterion("role is null"); - return (Criteria) this; - } - - public Criteria andRoleIsNotNull() { - addCriterion("role is not null"); - return (Criteria) this; - } - - public Criteria andRoleEqualTo(String value) { - addCriterion("role =", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotEqualTo(String value) { - addCriterion("role <>", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleGreaterThan(String value) { - addCriterion("role >", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleGreaterThanOrEqualTo(String value) { - addCriterion("role >=", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleLessThan(String value) { - addCriterion("role <", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleLessThanOrEqualTo(String value) { - addCriterion("role <=", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleLike(String value) { - addCriterion("role like", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotLike(String value) { - addCriterion("role not like", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleIn(List values) { - addCriterion("role in", values, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotIn(List values) { - addCriterion("role not in", values, "role"); - return (Criteria) this; - } - - public Criteria andRoleBetween(String value1, String value2) { - addCriterion("role between", value1, value2, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotBetween(String value1, String value2) { - addCriterion("role not between", value1, value2, "role"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(Long value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(Long value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(Long value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(Long value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(Long value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(Long value1, Long value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(Long value1, Long value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNickNameIsNull() { - addCriterion("nick_name is null"); - return (Criteria) this; - } - - public Criteria andNickNameIsNotNull() { - addCriterion("nick_name is not null"); - return (Criteria) this; - } - - public Criteria andNickNameEqualTo(String value) { - addCriterion("nick_name =", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotEqualTo(String value) { - addCriterion("nick_name <>", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameGreaterThan(String value) { - addCriterion("nick_name >", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameGreaterThanOrEqualTo(String value) { - addCriterion("nick_name >=", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameLessThan(String value) { - addCriterion("nick_name <", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameLessThanOrEqualTo(String value) { - addCriterion("nick_name <=", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameLike(String value) { - addCriterion("nick_name like", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotLike(String value) { - addCriterion("nick_name not like", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameIn(List values) { - addCriterion("nick_name in", values, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotIn(List values) { - addCriterion("nick_name not in", values, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameBetween(String value1, String value2) { - addCriterion("nick_name between", value1, value2, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotBetween(String value1, String value2) { - addCriterion("nick_name not between", value1, value2, "nickName"); - return (Criteria) this; - } - - public Criteria andDeviceTypeIsNull() { - addCriterion("device_type is null"); - return (Criteria) this; - } - - public Criteria andDeviceTypeIsNotNull() { - addCriterion("device_type is not null"); - return (Criteria) this; - } - - public Criteria andDeviceTypeEqualTo(String value) { - addCriterion("device_type =", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotEqualTo(String value) { - addCriterion("device_type <>", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeGreaterThan(String value) { - addCriterion("device_type >", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeGreaterThanOrEqualTo(String value) { - addCriterion("device_type >=", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeLessThan(String value) { - addCriterion("device_type <", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeLessThanOrEqualTo(String value) { - addCriterion("device_type <=", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeLike(String value) { - addCriterion("device_type like", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotLike(String value) { - addCriterion("device_type not like", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeIn(List values) { - addCriterion("device_type in", values, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotIn(List values) { - addCriterion("device_type not in", values, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeBetween(String value1, String value2) { - addCriterion("device_type between", value1, value2, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotBetween(String value1, String value2) { - addCriterion("device_type not between", value1, value2, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNull() { - addCriterion("device_code is null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNotNull() { - addCriterion("device_code is not null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeEqualTo(String value) { - addCriterion("device_code =", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotEqualTo(String value) { - addCriterion("device_code <>", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThan(String value) { - addCriterion("device_code >", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThanOrEqualTo(String value) { - addCriterion("device_code >=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThan(String value) { - addCriterion("device_code <", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThanOrEqualTo(String value) { - addCriterion("device_code <=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLike(String value) { - addCriterion("device_code like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotLike(String value) { - addCriterion("device_code not like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIn(List values) { - addCriterion("device_code in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotIn(List values) { - addCriterion("device_code not in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeBetween(String value1, String value2) { - addCriterion("device_code between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotBetween(String value1, String value2) { - addCriterion("device_code not between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andAvatarUrlIsNull() { - addCriterion("avatar_url is null"); - return (Criteria) this; - } - - public Criteria andAvatarUrlIsNotNull() { - addCriterion("avatar_url is not null"); - return (Criteria) this; - } - - public Criteria andAvatarUrlEqualTo(String value) { - addCriterion("avatar_url =", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlNotEqualTo(String value) { - addCriterion("avatar_url <>", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlGreaterThan(String value) { - addCriterion("avatar_url >", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlGreaterThanOrEqualTo(String value) { - addCriterion("avatar_url >=", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlLessThan(String value) { - addCriterion("avatar_url <", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlLessThanOrEqualTo(String value) { - addCriterion("avatar_url <=", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlLike(String value) { - addCriterion("avatar_url like", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlNotLike(String value) { - addCriterion("avatar_url not like", value, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlIn(List values) { - addCriterion("avatar_url in", values, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlNotIn(List values) { - addCriterion("avatar_url not in", values, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlBetween(String value1, String value2) { - addCriterion("avatar_url between", value1, value2, "avatarUrl"); - return (Criteria) this; - } - - public Criteria andAvatarUrlNotBetween(String value1, String value2) { - addCriterion("avatar_url not between", value1, value2, "avatarUrl"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationConversationMessage.java b/src/main/java/club/joylink/rtss/entity/SimulationConversationMessage.java deleted file mode 100644 index 3bc6819da..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationConversationMessage.java +++ /dev/null @@ -1,166 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * simulation_conversation_message - * @author - */ -public class SimulationConversationMessage implements Serializable { - private Long id; - - /** - * 会话id - */ - private Long conversationId; - - /** - * 成员id - */ - private Long memberId; - - private Long targetMemberId; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 消息类型 - */ - private String type; - - /** - * 文本内容 - */ - private String content; - - /** - * 文件路径 - */ - private String fileUrl; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getConversationId() { - return conversationId; - } - - public void setConversationId(Long conversationId) { - this.conversationId = conversationId; - } - - public Long getMemberId() { - return memberId; - } - - public void setMemberId(Long memberId) { - this.memberId = memberId; - } - - public Long getTargetMemberId() { - return targetMemberId; - } - - public void setTargetMemberId(Long targetMemberId) { - this.targetMemberId = targetMemberId; - } - - public LocalDateTime getCreateTime() { - return createTime; - } - - public void setCreateTime(LocalDateTime createTime) { - this.createTime = createTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getFileUrl() { - return fileUrl; - } - - public void setFileUrl(String fileUrl) { - this.fileUrl = fileUrl; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationConversationMessage other = (SimulationConversationMessage) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getConversationId() == null ? other.getConversationId() == null : this.getConversationId().equals(other.getConversationId())) - && (this.getMemberId() == null ? other.getMemberId() == null : this.getMemberId().equals(other.getMemberId())) - && (this.getTargetMemberId() == null ? other.getTargetMemberId() == null : this.getTargetMemberId().equals(other.getTargetMemberId())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) - && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())) - && (this.getFileUrl() == null ? other.getFileUrl() == null : this.getFileUrl().equals(other.getFileUrl())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getConversationId() == null) ? 0 : getConversationId().hashCode()); - result = prime * result + ((getMemberId() == null) ? 0 : getMemberId().hashCode()); - result = prime * result + ((getTargetMemberId() == null) ? 0 : getTargetMemberId().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); - result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); - result = prime * result + ((getFileUrl() == null) ? 0 : getFileUrl().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", conversationId=").append(conversationId); - sb.append(", memberId=").append(memberId); - sb.append(", targetMemberId=").append(targetMemberId); - sb.append(", createTime=").append(createTime); - sb.append(", type=").append(type); - sb.append(", content=").append(content); - sb.append(", fileUrl=").append(fileUrl); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationConversationMessageExample.java b/src/main/java/club/joylink/rtss/entity/SimulationConversationMessageExample.java deleted file mode 100644 index 2eb66b892..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationConversationMessageExample.java +++ /dev/null @@ -1,733 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SimulationConversationMessageExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SimulationConversationMessageExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andConversationIdIsNull() { - addCriterion("conversation_id is null"); - return (Criteria) this; - } - - public Criteria andConversationIdIsNotNull() { - addCriterion("conversation_id is not null"); - return (Criteria) this; - } - - public Criteria andConversationIdEqualTo(Long value) { - addCriterion("conversation_id =", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdNotEqualTo(Long value) { - addCriterion("conversation_id <>", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdGreaterThan(Long value) { - addCriterion("conversation_id >", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdGreaterThanOrEqualTo(Long value) { - addCriterion("conversation_id >=", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdLessThan(Long value) { - addCriterion("conversation_id <", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdLessThanOrEqualTo(Long value) { - addCriterion("conversation_id <=", value, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdIn(List values) { - addCriterion("conversation_id in", values, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdNotIn(List values) { - addCriterion("conversation_id not in", values, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdBetween(Long value1, Long value2) { - addCriterion("conversation_id between", value1, value2, "conversationId"); - return (Criteria) this; - } - - public Criteria andConversationIdNotBetween(Long value1, Long value2) { - addCriterion("conversation_id not between", value1, value2, "conversationId"); - return (Criteria) this; - } - - public Criteria andMemberIdIsNull() { - addCriterion("member_id is null"); - return (Criteria) this; - } - - public Criteria andMemberIdIsNotNull() { - addCriterion("member_id is not null"); - return (Criteria) this; - } - - public Criteria andMemberIdEqualTo(Long value) { - addCriterion("member_id =", value, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdNotEqualTo(Long value) { - addCriterion("member_id <>", value, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdGreaterThan(Long value) { - addCriterion("member_id >", value, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { - addCriterion("member_id >=", value, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdLessThan(Long value) { - addCriterion("member_id <", value, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdLessThanOrEqualTo(Long value) { - addCriterion("member_id <=", value, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdIn(List values) { - addCriterion("member_id in", values, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdNotIn(List values) { - addCriterion("member_id not in", values, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdBetween(Long value1, Long value2) { - addCriterion("member_id between", value1, value2, "memberId"); - return (Criteria) this; - } - - public Criteria andMemberIdNotBetween(Long value1, Long value2) { - addCriterion("member_id not between", value1, value2, "memberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdIsNull() { - addCriterion("target_member_id is null"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdIsNotNull() { - addCriterion("target_member_id is not null"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdEqualTo(Long value) { - addCriterion("target_member_id =", value, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdNotEqualTo(Long value) { - addCriterion("target_member_id <>", value, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdGreaterThan(Long value) { - addCriterion("target_member_id >", value, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdGreaterThanOrEqualTo(Long value) { - addCriterion("target_member_id >=", value, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdLessThan(Long value) { - addCriterion("target_member_id <", value, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdLessThanOrEqualTo(Long value) { - addCriterion("target_member_id <=", value, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdIn(List values) { - addCriterion("target_member_id in", values, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdNotIn(List values) { - addCriterion("target_member_id not in", values, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdBetween(Long value1, Long value2) { - addCriterion("target_member_id between", value1, value2, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andTargetMemberIdNotBetween(Long value1, Long value2) { - addCriterion("target_member_id not between", value1, value2, "targetMemberId"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andTypeIsNull() { - addCriterion("type is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("type is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("type =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("type <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("type >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("type >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("type <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("type <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("type like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("type not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("type in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("type not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("type between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("type not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andContentIsNull() { - addCriterion("content is null"); - return (Criteria) this; - } - - public Criteria andContentIsNotNull() { - addCriterion("content is not null"); - return (Criteria) this; - } - - public Criteria andContentEqualTo(String value) { - addCriterion("content =", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotEqualTo(String value) { - addCriterion("content <>", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThan(String value) { - addCriterion("content >", value, "content"); - return (Criteria) this; - } - - public Criteria andContentGreaterThanOrEqualTo(String value) { - addCriterion("content >=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThan(String value) { - addCriterion("content <", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLessThanOrEqualTo(String value) { - addCriterion("content <=", value, "content"); - return (Criteria) this; - } - - public Criteria andContentLike(String value) { - addCriterion("content like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentNotLike(String value) { - addCriterion("content not like", value, "content"); - return (Criteria) this; - } - - public Criteria andContentIn(List values) { - addCriterion("content in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentNotIn(List values) { - addCriterion("content not in", values, "content"); - return (Criteria) this; - } - - public Criteria andContentBetween(String value1, String value2) { - addCriterion("content between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andContentNotBetween(String value1, String value2) { - addCriterion("content not between", value1, value2, "content"); - return (Criteria) this; - } - - public Criteria andFileUrlIsNull() { - addCriterion("file_url is null"); - return (Criteria) this; - } - - public Criteria andFileUrlIsNotNull() { - addCriterion("file_url is not null"); - return (Criteria) this; - } - - public Criteria andFileUrlEqualTo(String value) { - addCriterion("file_url =", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlNotEqualTo(String value) { - addCriterion("file_url <>", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlGreaterThan(String value) { - addCriterion("file_url >", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlGreaterThanOrEqualTo(String value) { - addCriterion("file_url >=", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlLessThan(String value) { - addCriterion("file_url <", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlLessThanOrEqualTo(String value) { - addCriterion("file_url <=", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlLike(String value) { - addCriterion("file_url like", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlNotLike(String value) { - addCriterion("file_url not like", value, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlIn(List values) { - addCriterion("file_url in", values, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlNotIn(List values) { - addCriterion("file_url not in", values, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlBetween(String value1, String value2) { - addCriterion("file_url between", value1, value2, "fileUrl"); - return (Criteria) this; - } - - public Criteria andFileUrlNotBetween(String value1, String value2) { - addCriterion("file_url not between", value1, value2, "fileUrl"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationFrame.java b/src/main/java/club/joylink/rtss/entity/SimulationFrame.java deleted file mode 100644 index 2ef82f3a7..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationFrame.java +++ /dev/null @@ -1,105 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * simulation_frame - * @author - */ -public class SimulationFrame implements Serializable { - private Long id; - - /** - * 仿真记录id - */ - private Long recordId; - - /** - * 帧的记录时间 - */ - private LocalDateTime time; - - /** - * 此帧数据 - */ - private String data; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public LocalDateTime getTime() { - return time; - } - - public void setTime(LocalDateTime time) { - this.time = time; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationFrame other = (SimulationFrame) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRecordId() == null ? other.getRecordId() == null : this.getRecordId().equals(other.getRecordId())) - && (this.getTime() == null ? other.getTime() == null : this.getTime().equals(other.getTime())) - && (this.getData() == null ? other.getData() == null : this.getData().equals(other.getData())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRecordId() == null) ? 0 : getRecordId().hashCode()); - result = prime * result + ((getTime() == null) ? 0 : getTime().hashCode()); - result = prime * result + ((getData() == null) ? 0 : getData().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", recordId=").append(recordId); - sb.append(", time=").append(time); - sb.append(", data=").append(data); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationFrameExample.java b/src/main/java/club/joylink/rtss/entity/SimulationFrameExample.java deleted file mode 100644 index 32ad9d481..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationFrameExample.java +++ /dev/null @@ -1,403 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SimulationFrameExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SimulationFrameExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andTimeIsNull() { - addCriterion("time is null"); - return (Criteria) this; - } - - public Criteria andTimeIsNotNull() { - addCriterion("time is not null"); - return (Criteria) this; - } - - public Criteria andTimeEqualTo(Date value) { - addCriterion("time =", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotEqualTo(Date value) { - addCriterion("time <>", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeGreaterThan(Date value) { - addCriterion("time >", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeGreaterThanOrEqualTo(Date value) { - addCriterion("time >=", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeLessThan(Date value) { - addCriterion("time <", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeLessThanOrEqualTo(Date value) { - addCriterion("time <=", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeIn(List values) { - addCriterion("time in", values, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotIn(List values) { - addCriterion("time not in", values, "time"); - return (Criteria) this; - } - - public Criteria andTimeBetween(Date value1, Date value2) { - addCriterion("time between", value1, value2, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotBetween(Date value1, Date value2) { - addCriterion("time not between", value1, value2, "time"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationProcessRecord.java b/src/main/java/club/joylink/rtss/entity/SimulationProcessRecord.java deleted file mode 100644 index afd5bd7ff..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationProcessRecord.java +++ /dev/null @@ -1,109 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * simulation_process_record - * @author - */ -public class SimulationProcessRecord implements Serializable { - private Long id; - - private String simulationGroup; - - private Long mapId; - - private LocalDateTime dateTime; - - private String socketMessage; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSimulationGroup() { - return simulationGroup; - } - - public void setSimulationGroup(String simulationGroup) { - this.simulationGroup = simulationGroup; - } - - public Long getMapId() { - return mapId; - } - - public void setMapId(Long mapId) { - this.mapId = mapId; - } - - public LocalDateTime getDateTime() { - return dateTime; - } - - public void setDateTime(LocalDateTime dateTime) { - this.dateTime = dateTime; - } - - public String getSocketMessage() { - return socketMessage; - } - - public void setSocketMessage(String socketMessage) { - this.socketMessage = socketMessage; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationProcessRecord other = (SimulationProcessRecord) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getSimulationGroup() == null ? other.getSimulationGroup() == null : this.getSimulationGroup().equals(other.getSimulationGroup())) - && (this.getMapId() == null ? other.getMapId() == null : this.getMapId().equals(other.getMapId())) - && (this.getDateTime() == null ? other.getDateTime() == null : this.getDateTime().equals(other.getDateTime())) - && (this.getSocketMessage() == null ? other.getSocketMessage() == null : this.getSocketMessage().equals(other.getSocketMessage())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getSimulationGroup() == null) ? 0 : getSimulationGroup().hashCode()); - result = prime * result + ((getMapId() == null) ? 0 : getMapId().hashCode()); - result = prime * result + ((getDateTime() == null) ? 0 : getDateTime().hashCode()); - result = prime * result + ((getSocketMessage() == null) ? 0 : getSocketMessage().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", simulationGroup=").append(simulationGroup); - sb.append(", mapId=").append(mapId); - sb.append(", dateTime=").append(dateTime); - sb.append(", socketMessage=").append(socketMessage); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationProcessRecordExample.java b/src/main/java/club/joylink/rtss/entity/SimulationProcessRecordExample.java deleted file mode 100644 index 0999255ec..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationProcessRecordExample.java +++ /dev/null @@ -1,473 +0,0 @@ -package club.joylink.rtss.entity; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class SimulationProcessRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public SimulationProcessRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Long offset) { - this.offset = offset; - } - - public Long getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andSimulationGroupIsNull() { - addCriterion("simulation_group is null"); - return (Criteria) this; - } - - public Criteria andSimulationGroupIsNotNull() { - addCriterion("simulation_group is not null"); - return (Criteria) this; - } - - public Criteria andSimulationGroupEqualTo(String value) { - addCriterion("simulation_group =", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupNotEqualTo(String value) { - addCriterion("simulation_group <>", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupGreaterThan(String value) { - addCriterion("simulation_group >", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupGreaterThanOrEqualTo(String value) { - addCriterion("simulation_group >=", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupLessThan(String value) { - addCriterion("simulation_group <", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupLessThanOrEqualTo(String value) { - addCriterion("simulation_group <=", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupLike(String value) { - addCriterion("simulation_group like", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupNotLike(String value) { - addCriterion("simulation_group not like", value, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupIn(List values) { - addCriterion("simulation_group in", values, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupNotIn(List values) { - addCriterion("simulation_group not in", values, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupBetween(String value1, String value2) { - addCriterion("simulation_group between", value1, value2, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andSimulationGroupNotBetween(String value1, String value2) { - addCriterion("simulation_group not between", value1, value2, "simulationGroup"); - return (Criteria) this; - } - - public Criteria andMapIdIsNull() { - addCriterion("map_id is null"); - return (Criteria) this; - } - - public Criteria andMapIdIsNotNull() { - addCriterion("map_id is not null"); - return (Criteria) this; - } - - public Criteria andMapIdEqualTo(Long value) { - addCriterion("map_id =", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotEqualTo(Long value) { - addCriterion("map_id <>", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdGreaterThan(Long value) { - addCriterion("map_id >", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdGreaterThanOrEqualTo(Long value) { - addCriterion("map_id >=", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdLessThan(Long value) { - addCriterion("map_id <", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdLessThanOrEqualTo(Long value) { - addCriterion("map_id <=", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdIn(List values) { - addCriterion("map_id in", values, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotIn(List values) { - addCriterion("map_id not in", values, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdBetween(Long value1, Long value2) { - addCriterion("map_id between", value1, value2, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotBetween(Long value1, Long value2) { - addCriterion("map_id not between", value1, value2, "mapId"); - return (Criteria) this; - } - - public Criteria andDateTimeIsNull() { - addCriterion("date_time is null"); - return (Criteria) this; - } - - public Criteria andDateTimeIsNotNull() { - addCriterion("date_time is not null"); - return (Criteria) this; - } - - public Criteria andDateTimeEqualTo(LocalDateTime value) { - addCriterion("date_time =", value, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeNotEqualTo(LocalDateTime value) { - addCriterion("date_time <>", value, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeGreaterThan(LocalDateTime value) { - addCriterion("date_time >", value, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("date_time >=", value, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeLessThan(LocalDateTime value) { - addCriterion("date_time <", value, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("date_time <=", value, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeIn(List values) { - addCriterion("date_time in", values, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeNotIn(List values) { - addCriterion("date_time not in", values, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("date_time between", value1, value2, "dateTime"); - return (Criteria) this; - } - - public Criteria andDateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("date_time not between", value1, value2, "dateTime"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRecord.java b/src/main/java/club/joylink/rtss/entity/SimulationRecord.java deleted file mode 100644 index ddf185dd4..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRecord.java +++ /dev/null @@ -1,169 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * simulation_record - * @author - */ -public class SimulationRecord implements Serializable { - private Long id; - - /** - * 地图id - */ - private Long mapId; - - /** - * 地图名称 - */ - private String mapName; - - /** - * 产品类型 - */ - private String prdType; - - /** - * 创建用户id - */ - private Long creatorId; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 销毁时间 - */ - private LocalDateTime destroyTime; - - /** - * 状态 - */ - private String status; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getMapId() { - return mapId; - } - - public void setMapId(Long mapId) { - this.mapId = mapId; - } - - public String getMapName() { - return mapName; - } - - public void setMapName(String mapName) { - this.mapName = mapName; - } - - public String getPrdType() { - return prdType; - } - - public void setPrdType(String prdType) { - this.prdType = prdType; - } - - public Long getCreatorId() { - return creatorId; - } - - public void setCreatorId(Long creatorId) { - this.creatorId = creatorId; - } - - public LocalDateTime getCreateTime() { - return createTime; - } - - public void setCreateTime(LocalDateTime createTime) { - this.createTime = createTime; - } - - public LocalDateTime getDestroyTime() { - return destroyTime; - } - - public void setDestroyTime(LocalDateTime destroyTime) { - this.destroyTime = destroyTime; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationRecord other = (SimulationRecord) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getMapId() == null ? other.getMapId() == null : this.getMapId().equals(other.getMapId())) - && (this.getMapName() == null ? other.getMapName() == null : this.getMapName().equals(other.getMapName())) - && (this.getPrdType() == null ? other.getPrdType() == null : this.getPrdType().equals(other.getPrdType())) - && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getDestroyTime() == null ? other.getDestroyTime() == null : this.getDestroyTime().equals(other.getDestroyTime())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getMapId() == null) ? 0 : getMapId().hashCode()); - result = prime * result + ((getMapName() == null) ? 0 : getMapName().hashCode()); - result = prime * result + ((getPrdType() == null) ? 0 : getPrdType().hashCode()); - result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getDestroyTime() == null) ? 0 : getDestroyTime().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", mapId=").append(mapId); - sb.append(", mapName=").append(mapName); - sb.append(", prdType=").append(prdType); - sb.append(", creatorId=").append(creatorId); - sb.append(", createTime=").append(createTime); - sb.append(", destroyTime=").append(destroyTime); - sb.append(", status=").append(status); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRecordExample.java b/src/main/java/club/joylink/rtss/entity/SimulationRecordExample.java deleted file mode 100644 index dd42418f0..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRecordExample.java +++ /dev/null @@ -1,733 +0,0 @@ -package club.joylink.rtss.entity; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class SimulationRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public SimulationRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Long offset) { - this.offset = offset; - } - - public Long getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andMapIdIsNull() { - addCriterion("map_id is null"); - return (Criteria) this; - } - - public Criteria andMapIdIsNotNull() { - addCriterion("map_id is not null"); - return (Criteria) this; - } - - public Criteria andMapIdEqualTo(Long value) { - addCriterion("map_id =", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotEqualTo(Long value) { - addCriterion("map_id <>", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdGreaterThan(Long value) { - addCriterion("map_id >", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdGreaterThanOrEqualTo(Long value) { - addCriterion("map_id >=", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdLessThan(Long value) { - addCriterion("map_id <", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdLessThanOrEqualTo(Long value) { - addCriterion("map_id <=", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdIn(List values) { - addCriterion("map_id in", values, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotIn(List values) { - addCriterion("map_id not in", values, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdBetween(Long value1, Long value2) { - addCriterion("map_id between", value1, value2, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotBetween(Long value1, Long value2) { - addCriterion("map_id not between", value1, value2, "mapId"); - return (Criteria) this; - } - - public Criteria andMapNameIsNull() { - addCriterion("map_name is null"); - return (Criteria) this; - } - - public Criteria andMapNameIsNotNull() { - addCriterion("map_name is not null"); - return (Criteria) this; - } - - public Criteria andMapNameEqualTo(String value) { - addCriterion("map_name =", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameNotEqualTo(String value) { - addCriterion("map_name <>", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameGreaterThan(String value) { - addCriterion("map_name >", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameGreaterThanOrEqualTo(String value) { - addCriterion("map_name >=", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameLessThan(String value) { - addCriterion("map_name <", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameLessThanOrEqualTo(String value) { - addCriterion("map_name <=", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameLike(String value) { - addCriterion("map_name like", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameNotLike(String value) { - addCriterion("map_name not like", value, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameIn(List values) { - addCriterion("map_name in", values, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameNotIn(List values) { - addCriterion("map_name not in", values, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameBetween(String value1, String value2) { - addCriterion("map_name between", value1, value2, "mapName"); - return (Criteria) this; - } - - public Criteria andMapNameNotBetween(String value1, String value2) { - addCriterion("map_name not between", value1, value2, "mapName"); - return (Criteria) this; - } - - public Criteria andPrdTypeIsNull() { - addCriterion("prd_type is null"); - return (Criteria) this; - } - - public Criteria andPrdTypeIsNotNull() { - addCriterion("prd_type is not null"); - return (Criteria) this; - } - - public Criteria andPrdTypeEqualTo(String value) { - addCriterion("prd_type =", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotEqualTo(String value) { - addCriterion("prd_type <>", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeGreaterThan(String value) { - addCriterion("prd_type >", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeGreaterThanOrEqualTo(String value) { - addCriterion("prd_type >=", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeLessThan(String value) { - addCriterion("prd_type <", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeLessThanOrEqualTo(String value) { - addCriterion("prd_type <=", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeLike(String value) { - addCriterion("prd_type like", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotLike(String value) { - addCriterion("prd_type not like", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeIn(List values) { - addCriterion("prd_type in", values, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotIn(List values) { - addCriterion("prd_type not in", values, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeBetween(String value1, String value2) { - addCriterion("prd_type between", value1, value2, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotBetween(String value1, String value2) { - addCriterion("prd_type not between", value1, value2, "prdType"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNull() { - addCriterion("creator_id is null"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNotNull() { - addCriterion("creator_id is not null"); - return (Criteria) this; - } - - public Criteria andCreatorIdEqualTo(Long value) { - addCriterion("creator_id =", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotEqualTo(Long value) { - addCriterion("creator_id <>", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThan(Long value) { - addCriterion("creator_id >", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) { - addCriterion("creator_id >=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThan(Long value) { - addCriterion("creator_id <", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThanOrEqualTo(Long value) { - addCriterion("creator_id <=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdIn(List values) { - addCriterion("creator_id in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotIn(List values) { - addCriterion("creator_id not in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdBetween(Long value1, Long value2) { - addCriterion("creator_id between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotBetween(Long value1, Long value2) { - addCriterion("creator_id not between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(LocalDateTime value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(LocalDateTime value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(LocalDateTime value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(LocalDateTime value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeIsNull() { - addCriterion("destroy_time is null"); - return (Criteria) this; - } - - public Criteria andDestroyTimeIsNotNull() { - addCriterion("destroy_time is not null"); - return (Criteria) this; - } - - public Criteria andDestroyTimeEqualTo(LocalDateTime value) { - addCriterion("destroy_time =", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeNotEqualTo(LocalDateTime value) { - addCriterion("destroy_time <>", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeGreaterThan(LocalDateTime value) { - addCriterion("destroy_time >", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("destroy_time >=", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeLessThan(LocalDateTime value) { - addCriterion("destroy_time <", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("destroy_time <=", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeIn(List values) { - addCriterion("destroy_time in", values, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeNotIn(List values) { - addCriterion("destroy_time not in", values, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("destroy_time between", value1, value2, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("destroy_time not between", value1, value2, "destroyTime"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("`status` =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoom.java b/src/main/java/club/joylink/rtss/entity/SimulationRoom.java deleted file mode 100644 index 78a98485f..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoom.java +++ /dev/null @@ -1,217 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * simulation_room - * @author - */ -public class SimulationRoom implements Serializable { - private Long id; - - /** - * 地图id - */ - private Long mapId; - - /** - * 产品类型 - */ - private String prdType; - - /** - * 综合演练房间编码 - */ - private String code; - - /** - * 名称 - */ - private String name; - - /** - * 可分配角色的权限数量 - */ - private Integer rolePermitAmount; - - /** - * 观众权限数量 - */ - private Integer audiencePermitAmount; - - /** - * 创建人id - */ - private Long creatorId; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 销毁时间 - */ - private LocalDateTime destroyTime; - - /** - * 状态 - */ - private String status; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getMapId() { - return mapId; - } - - public void setMapId(Long mapId) { - this.mapId = mapId; - } - - public String getPrdType() { - return prdType; - } - - public void setPrdType(String prdType) { - this.prdType = prdType; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getRolePermitAmount() { - return rolePermitAmount; - } - - public void setRolePermitAmount(Integer rolePermitAmount) { - this.rolePermitAmount = rolePermitAmount; - } - - public Integer getAudiencePermitAmount() { - return audiencePermitAmount; - } - - public void setAudiencePermitAmount(Integer audiencePermitAmount) { - this.audiencePermitAmount = audiencePermitAmount; - } - - public Long getCreatorId() { - return creatorId; - } - - public void setCreatorId(Long creatorId) { - this.creatorId = creatorId; - } - - public LocalDateTime getCreateTime() { - return createTime; - } - - public void setCreateTime(LocalDateTime createTime) { - this.createTime = createTime; - } - - public LocalDateTime getDestroyTime() { - return destroyTime; - } - - public void setDestroyTime(LocalDateTime destroyTime) { - this.destroyTime = destroyTime; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationRoom other = (SimulationRoom) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getMapId() == null ? other.getMapId() == null : this.getMapId().equals(other.getMapId())) - && (this.getPrdType() == null ? other.getPrdType() == null : this.getPrdType().equals(other.getPrdType())) - && (this.getCode() == null ? other.getCode() == null : this.getCode().equals(other.getCode())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getRolePermitAmount() == null ? other.getRolePermitAmount() == null : this.getRolePermitAmount().equals(other.getRolePermitAmount())) - && (this.getAudiencePermitAmount() == null ? other.getAudiencePermitAmount() == null : this.getAudiencePermitAmount().equals(other.getAudiencePermitAmount())) - && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getDestroyTime() == null ? other.getDestroyTime() == null : this.getDestroyTime().equals(other.getDestroyTime())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getMapId() == null) ? 0 : getMapId().hashCode()); - result = prime * result + ((getPrdType() == null) ? 0 : getPrdType().hashCode()); - result = prime * result + ((getCode() == null) ? 0 : getCode().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getRolePermitAmount() == null) ? 0 : getRolePermitAmount().hashCode()); - result = prime * result + ((getAudiencePermitAmount() == null) ? 0 : getAudiencePermitAmount().hashCode()); - result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getDestroyTime() == null) ? 0 : getDestroyTime().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", mapId=").append(mapId); - sb.append(", prdType=").append(prdType); - sb.append(", code=").append(code); - sb.append(", name=").append(name); - sb.append(", rolePermitAmount=").append(rolePermitAmount); - sb.append(", audiencePermitAmount=").append(audiencePermitAmount); - sb.append(", creatorId=").append(creatorId); - sb.append(", createTime=").append(createTime); - sb.append(", destroyTime=").append(destroyTime); - sb.append(", status=").append(status); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomDevice.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomDevice.java deleted file mode 100644 index cae5f32b3..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomDevice.java +++ /dev/null @@ -1,120 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; - -/** - * simulation_room_device - * @author - */ -public class SimulationRoomDevice implements Serializable { - private Long id; - - /** - * 房间id - */ - private Long roomId; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 关联的设备编码 - */ - private String deviceCode; - - /** - * 状态 - */ - private String status; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getRoomId() { - return roomId; - } - - public void setRoomId(Long roomId) { - this.roomId = roomId; - } - - public String getDeviceType() { - return deviceType; - } - - public void setDeviceType(String deviceType) { - this.deviceType = deviceType; - } - - public String getDeviceCode() { - return deviceCode; - } - - public void setDeviceCode(String deviceCode) { - this.deviceCode = deviceCode; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationRoomDevice other = (SimulationRoomDevice) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRoomId() == null ? other.getRoomId() == null : this.getRoomId().equals(other.getRoomId())) - && (this.getDeviceType() == null ? other.getDeviceType() == null : this.getDeviceType().equals(other.getDeviceType())) - && (this.getDeviceCode() == null ? other.getDeviceCode() == null : this.getDeviceCode().equals(other.getDeviceCode())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRoomId() == null) ? 0 : getRoomId().hashCode()); - result = prime * result + ((getDeviceType() == null) ? 0 : getDeviceType().hashCode()); - result = prime * result + ((getDeviceCode() == null) ? 0 : getDeviceCode().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", roomId=").append(roomId); - sb.append(", deviceType=").append(deviceType); - sb.append(", deviceCode=").append(deviceCode); - sb.append(", status=").append(status); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomDeviceExample.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomDeviceExample.java deleted file mode 100644 index ecad6786d..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomDeviceExample.java +++ /dev/null @@ -1,552 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.List; - -public class SimulationRoomDeviceExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public SimulationRoomDeviceExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Long offset) { - this.offset = offset; - } - - public Long getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRoomIdIsNull() { - addCriterion("room_id is null"); - return (Criteria) this; - } - - public Criteria andRoomIdIsNotNull() { - addCriterion("room_id is not null"); - return (Criteria) this; - } - - public Criteria andRoomIdEqualTo(Long value) { - addCriterion("room_id =", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotEqualTo(Long value) { - addCriterion("room_id <>", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdGreaterThan(Long value) { - addCriterion("room_id >", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdGreaterThanOrEqualTo(Long value) { - addCriterion("room_id >=", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdLessThan(Long value) { - addCriterion("room_id <", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdLessThanOrEqualTo(Long value) { - addCriterion("room_id <=", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdIn(List values) { - addCriterion("room_id in", values, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotIn(List values) { - addCriterion("room_id not in", values, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdBetween(Long value1, Long value2) { - addCriterion("room_id between", value1, value2, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotBetween(Long value1, Long value2) { - addCriterion("room_id not between", value1, value2, "roomId"); - return (Criteria) this; - } - - public Criteria andDeviceTypeIsNull() { - addCriterion("device_type is null"); - return (Criteria) this; - } - - public Criteria andDeviceTypeIsNotNull() { - addCriterion("device_type is not null"); - return (Criteria) this; - } - - public Criteria andDeviceTypeEqualTo(String value) { - addCriterion("device_type =", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotEqualTo(String value) { - addCriterion("device_type <>", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeGreaterThan(String value) { - addCriterion("device_type >", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeGreaterThanOrEqualTo(String value) { - addCriterion("device_type >=", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeLessThan(String value) { - addCriterion("device_type <", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeLessThanOrEqualTo(String value) { - addCriterion("device_type <=", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeLike(String value) { - addCriterion("device_type like", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotLike(String value) { - addCriterion("device_type not like", value, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeIn(List values) { - addCriterion("device_type in", values, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotIn(List values) { - addCriterion("device_type not in", values, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeBetween(String value1, String value2) { - addCriterion("device_type between", value1, value2, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceTypeNotBetween(String value1, String value2) { - addCriterion("device_type not between", value1, value2, "deviceType"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNull() { - addCriterion("device_code is null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNotNull() { - addCriterion("device_code is not null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeEqualTo(String value) { - addCriterion("device_code =", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotEqualTo(String value) { - addCriterion("device_code <>", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThan(String value) { - addCriterion("device_code >", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThanOrEqualTo(String value) { - addCriterion("device_code >=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThan(String value) { - addCriterion("device_code <", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThanOrEqualTo(String value) { - addCriterion("device_code <=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLike(String value) { - addCriterion("device_code like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotLike(String value) { - addCriterion("device_code not like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIn(List values) { - addCriterion("device_code in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotIn(List values) { - addCriterion("device_code not in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeBetween(String value1, String value2) { - addCriterion("device_code between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotBetween(String value1, String value2) { - addCriterion("device_code not between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("`status` =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomExample.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomExample.java deleted file mode 100644 index 03893684f..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomExample.java +++ /dev/null @@ -1,923 +0,0 @@ -package club.joylink.rtss.entity; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class SimulationRoomExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public SimulationRoomExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Long offset) { - this.offset = offset; - } - - public Long getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andMapIdIsNull() { - addCriterion("map_id is null"); - return (Criteria) this; - } - - public Criteria andMapIdIsNotNull() { - addCriterion("map_id is not null"); - return (Criteria) this; - } - - public Criteria andMapIdEqualTo(Long value) { - addCriterion("map_id =", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotEqualTo(Long value) { - addCriterion("map_id <>", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdGreaterThan(Long value) { - addCriterion("map_id >", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdGreaterThanOrEqualTo(Long value) { - addCriterion("map_id >=", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdLessThan(Long value) { - addCriterion("map_id <", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdLessThanOrEqualTo(Long value) { - addCriterion("map_id <=", value, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdIn(List values) { - addCriterion("map_id in", values, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotIn(List values) { - addCriterion("map_id not in", values, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdBetween(Long value1, Long value2) { - addCriterion("map_id between", value1, value2, "mapId"); - return (Criteria) this; - } - - public Criteria andMapIdNotBetween(Long value1, Long value2) { - addCriterion("map_id not between", value1, value2, "mapId"); - return (Criteria) this; - } - - public Criteria andPrdTypeIsNull() { - addCriterion("prd_type is null"); - return (Criteria) this; - } - - public Criteria andPrdTypeIsNotNull() { - addCriterion("prd_type is not null"); - return (Criteria) this; - } - - public Criteria andPrdTypeEqualTo(String value) { - addCriterion("prd_type =", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotEqualTo(String value) { - addCriterion("prd_type <>", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeGreaterThan(String value) { - addCriterion("prd_type >", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeGreaterThanOrEqualTo(String value) { - addCriterion("prd_type >=", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeLessThan(String value) { - addCriterion("prd_type <", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeLessThanOrEqualTo(String value) { - addCriterion("prd_type <=", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeLike(String value) { - addCriterion("prd_type like", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotLike(String value) { - addCriterion("prd_type not like", value, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeIn(List values) { - addCriterion("prd_type in", values, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotIn(List values) { - addCriterion("prd_type not in", values, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeBetween(String value1, String value2) { - addCriterion("prd_type between", value1, value2, "prdType"); - return (Criteria) this; - } - - public Criteria andPrdTypeNotBetween(String value1, String value2) { - addCriterion("prd_type not between", value1, value2, "prdType"); - return (Criteria) this; - } - - public Criteria andCodeIsNull() { - addCriterion("code is null"); - return (Criteria) this; - } - - public Criteria andCodeIsNotNull() { - addCriterion("code is not null"); - return (Criteria) this; - } - - public Criteria andCodeEqualTo(String value) { - addCriterion("code =", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotEqualTo(String value) { - addCriterion("code <>", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThan(String value) { - addCriterion("code >", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeGreaterThanOrEqualTo(String value) { - addCriterion("code >=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThan(String value) { - addCriterion("code <", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLessThanOrEqualTo(String value) { - addCriterion("code <=", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeLike(String value) { - addCriterion("code like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotLike(String value) { - addCriterion("code not like", value, "code"); - return (Criteria) this; - } - - public Criteria andCodeIn(List values) { - addCriterion("code in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotIn(List values) { - addCriterion("code not in", values, "code"); - return (Criteria) this; - } - - public Criteria andCodeBetween(String value1, String value2) { - addCriterion("code between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andCodeNotBetween(String value1, String value2) { - addCriterion("code not between", value1, value2, "code"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("`name` is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("`name` is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("`name` =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("`name` <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("`name` >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("`name` >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("`name` <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("`name` <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("`name` like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("`name` not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("`name` in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("`name` not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("`name` between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("`name` not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountIsNull() { - addCriterion("role_permit_amount is null"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountIsNotNull() { - addCriterion("role_permit_amount is not null"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountEqualTo(Integer value) { - addCriterion("role_permit_amount =", value, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountNotEqualTo(Integer value) { - addCriterion("role_permit_amount <>", value, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountGreaterThan(Integer value) { - addCriterion("role_permit_amount >", value, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountGreaterThanOrEqualTo(Integer value) { - addCriterion("role_permit_amount >=", value, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountLessThan(Integer value) { - addCriterion("role_permit_amount <", value, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountLessThanOrEqualTo(Integer value) { - addCriterion("role_permit_amount <=", value, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountIn(List values) { - addCriterion("role_permit_amount in", values, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountNotIn(List values) { - addCriterion("role_permit_amount not in", values, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountBetween(Integer value1, Integer value2) { - addCriterion("role_permit_amount between", value1, value2, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andRolePermitAmountNotBetween(Integer value1, Integer value2) { - addCriterion("role_permit_amount not between", value1, value2, "rolePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountIsNull() { - addCriterion("audience_permit_amount is null"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountIsNotNull() { - addCriterion("audience_permit_amount is not null"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountEqualTo(Integer value) { - addCriterion("audience_permit_amount =", value, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountNotEqualTo(Integer value) { - addCriterion("audience_permit_amount <>", value, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountGreaterThan(Integer value) { - addCriterion("audience_permit_amount >", value, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountGreaterThanOrEqualTo(Integer value) { - addCriterion("audience_permit_amount >=", value, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountLessThan(Integer value) { - addCriterion("audience_permit_amount <", value, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountLessThanOrEqualTo(Integer value) { - addCriterion("audience_permit_amount <=", value, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountIn(List values) { - addCriterion("audience_permit_amount in", values, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountNotIn(List values) { - addCriterion("audience_permit_amount not in", values, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountBetween(Integer value1, Integer value2) { - addCriterion("audience_permit_amount between", value1, value2, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andAudiencePermitAmountNotBetween(Integer value1, Integer value2) { - addCriterion("audience_permit_amount not between", value1, value2, "audiencePermitAmount"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNull() { - addCriterion("creator_id is null"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNotNull() { - addCriterion("creator_id is not null"); - return (Criteria) this; - } - - public Criteria andCreatorIdEqualTo(Long value) { - addCriterion("creator_id =", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotEqualTo(Long value) { - addCriterion("creator_id <>", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThan(Long value) { - addCriterion("creator_id >", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) { - addCriterion("creator_id >=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThan(Long value) { - addCriterion("creator_id <", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThanOrEqualTo(Long value) { - addCriterion("creator_id <=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdIn(List values) { - addCriterion("creator_id in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotIn(List values) { - addCriterion("creator_id not in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdBetween(Long value1, Long value2) { - addCriterion("creator_id between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotBetween(Long value1, Long value2) { - addCriterion("creator_id not between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(LocalDateTime value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(LocalDateTime value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(LocalDateTime value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(LocalDateTime value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeIsNull() { - addCriterion("destroy_time is null"); - return (Criteria) this; - } - - public Criteria andDestroyTimeIsNotNull() { - addCriterion("destroy_time is not null"); - return (Criteria) this; - } - - public Criteria andDestroyTimeEqualTo(LocalDateTime value) { - addCriterion("destroy_time =", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeNotEqualTo(LocalDateTime value) { - addCriterion("destroy_time <>", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeGreaterThan(LocalDateTime value) { - addCriterion("destroy_time >", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("destroy_time >=", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeLessThan(LocalDateTime value) { - addCriterion("destroy_time <", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("destroy_time <=", value, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeIn(List values) { - addCriterion("destroy_time in", values, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeNotIn(List values) { - addCriterion("destroy_time not in", values, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("destroy_time between", value1, value2, "destroyTime"); - return (Criteria) this; - } - - public Criteria andDestroyTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("destroy_time not between", value1, value2, "destroyTime"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("`status` =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomMember.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomMember.java deleted file mode 100644 index 905589e8b..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomMember.java +++ /dev/null @@ -1,200 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; - -/** - * simulation_room_member - * @author - */ -public class SimulationRoomMember implements Serializable { - private Long id; - - /** - * 综合演练室id - */ - private Long roomId; - - /** - * 用户id - */ - private Long userId; - - /** - * 用户昵称 - */ - private String nickName; - - /** - * 用户仿真角色 - */ - private String role; - - /** - * 设备编号 - */ - private String deviceCode; - - /** - * IBP盘角色选择显示的部分 - */ - private String ibpPart; - - /** - * 状态：在线/不在线（在房间/不在房间） - */ - private String status; - - /** - * 是否在房间 - */ - private Boolean inRoom; - - /** - * 是否在仿真 - */ - private Boolean inSimulation; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getRoomId() { - return roomId; - } - - public void setRoomId(Long roomId) { - this.roomId = roomId; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - - public String getDeviceCode() { - return deviceCode; - } - - public void setDeviceCode(String deviceCode) { - this.deviceCode = deviceCode; - } - - public String getIbpPart() { - return ibpPart; - } - - public void setIbpPart(String ibpPart) { - this.ibpPart = ibpPart; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Boolean getInRoom() { - return inRoom; - } - - public void setInRoom(Boolean inRoom) { - this.inRoom = inRoom; - } - - public Boolean getInSimulation() { - return inSimulation; - } - - public void setInSimulation(Boolean inSimulation) { - this.inSimulation = inSimulation; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationRoomMember other = (SimulationRoomMember) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRoomId() == null ? other.getRoomId() == null : this.getRoomId().equals(other.getRoomId())) - && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getNickName() == null ? other.getNickName() == null : this.getNickName().equals(other.getNickName())) - && (this.getRole() == null ? other.getRole() == null : this.getRole().equals(other.getRole())) - && (this.getDeviceCode() == null ? other.getDeviceCode() == null : this.getDeviceCode().equals(other.getDeviceCode())) - && (this.getIbpPart() == null ? other.getIbpPart() == null : this.getIbpPart().equals(other.getIbpPart())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getInRoom() == null ? other.getInRoom() == null : this.getInRoom().equals(other.getInRoom())) - && (this.getInSimulation() == null ? other.getInSimulation() == null : this.getInSimulation().equals(other.getInSimulation())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRoomId() == null) ? 0 : getRoomId().hashCode()); - result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getNickName() == null) ? 0 : getNickName().hashCode()); - result = prime * result + ((getRole() == null) ? 0 : getRole().hashCode()); - result = prime * result + ((getDeviceCode() == null) ? 0 : getDeviceCode().hashCode()); - result = prime * result + ((getIbpPart() == null) ? 0 : getIbpPart().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getInRoom() == null) ? 0 : getInRoom().hashCode()); - result = prime * result + ((getInSimulation() == null) ? 0 : getInSimulation().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", roomId=").append(roomId); - sb.append(", userId=").append(userId); - sb.append(", nickName=").append(nickName); - sb.append(", role=").append(role); - sb.append(", deviceCode=").append(deviceCode); - sb.append(", ibpPart=").append(ibpPart); - sb.append(", status=").append(status); - sb.append(", inRoom=").append(inRoom); - sb.append(", inSimulation=").append(inSimulation); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomMemberExample.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomMemberExample.java deleted file mode 100644 index f57409de4..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomMemberExample.java +++ /dev/null @@ -1,872 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.List; - -public class SimulationRoomMemberExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public SimulationRoomMemberExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Long offset) { - this.offset = offset; - } - - public Long getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRoomIdIsNull() { - addCriterion("room_id is null"); - return (Criteria) this; - } - - public Criteria andRoomIdIsNotNull() { - addCriterion("room_id is not null"); - return (Criteria) this; - } - - public Criteria andRoomIdEqualTo(Long value) { - addCriterion("room_id =", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotEqualTo(Long value) { - addCriterion("room_id <>", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdGreaterThan(Long value) { - addCriterion("room_id >", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdGreaterThanOrEqualTo(Long value) { - addCriterion("room_id >=", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdLessThan(Long value) { - addCriterion("room_id <", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdLessThanOrEqualTo(Long value) { - addCriterion("room_id <=", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdIn(List values) { - addCriterion("room_id in", values, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotIn(List values) { - addCriterion("room_id not in", values, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdBetween(Long value1, Long value2) { - addCriterion("room_id between", value1, value2, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotBetween(Long value1, Long value2) { - addCriterion("room_id not between", value1, value2, "roomId"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(Long value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(Long value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(Long value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(Long value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(Long value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(Long value1, Long value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(Long value1, Long value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andNickNameIsNull() { - addCriterion("nick_name is null"); - return (Criteria) this; - } - - public Criteria andNickNameIsNotNull() { - addCriterion("nick_name is not null"); - return (Criteria) this; - } - - public Criteria andNickNameEqualTo(String value) { - addCriterion("nick_name =", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotEqualTo(String value) { - addCriterion("nick_name <>", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameGreaterThan(String value) { - addCriterion("nick_name >", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameGreaterThanOrEqualTo(String value) { - addCriterion("nick_name >=", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameLessThan(String value) { - addCriterion("nick_name <", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameLessThanOrEqualTo(String value) { - addCriterion("nick_name <=", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameLike(String value) { - addCriterion("nick_name like", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotLike(String value) { - addCriterion("nick_name not like", value, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameIn(List values) { - addCriterion("nick_name in", values, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotIn(List values) { - addCriterion("nick_name not in", values, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameBetween(String value1, String value2) { - addCriterion("nick_name between", value1, value2, "nickName"); - return (Criteria) this; - } - - public Criteria andNickNameNotBetween(String value1, String value2) { - addCriterion("nick_name not between", value1, value2, "nickName"); - return (Criteria) this; - } - - public Criteria andRoleIsNull() { - addCriterion("`role` is null"); - return (Criteria) this; - } - - public Criteria andRoleIsNotNull() { - addCriterion("`role` is not null"); - return (Criteria) this; - } - - public Criteria andRoleEqualTo(String value) { - addCriterion("`role` =", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotEqualTo(String value) { - addCriterion("`role` <>", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleGreaterThan(String value) { - addCriterion("`role` >", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleGreaterThanOrEqualTo(String value) { - addCriterion("`role` >=", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleLessThan(String value) { - addCriterion("`role` <", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleLessThanOrEqualTo(String value) { - addCriterion("`role` <=", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleLike(String value) { - addCriterion("`role` like", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotLike(String value) { - addCriterion("`role` not like", value, "role"); - return (Criteria) this; - } - - public Criteria andRoleIn(List values) { - addCriterion("`role` in", values, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotIn(List values) { - addCriterion("`role` not in", values, "role"); - return (Criteria) this; - } - - public Criteria andRoleBetween(String value1, String value2) { - addCriterion("`role` between", value1, value2, "role"); - return (Criteria) this; - } - - public Criteria andRoleNotBetween(String value1, String value2) { - addCriterion("`role` not between", value1, value2, "role"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNull() { - addCriterion("device_code is null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNotNull() { - addCriterion("device_code is not null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeEqualTo(String value) { - addCriterion("device_code =", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotEqualTo(String value) { - addCriterion("device_code <>", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThan(String value) { - addCriterion("device_code >", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThanOrEqualTo(String value) { - addCriterion("device_code >=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThan(String value) { - addCriterion("device_code <", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThanOrEqualTo(String value) { - addCriterion("device_code <=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLike(String value) { - addCriterion("device_code like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotLike(String value) { - addCriterion("device_code not like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIn(List values) { - addCriterion("device_code in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotIn(List values) { - addCriterion("device_code not in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeBetween(String value1, String value2) { - addCriterion("device_code between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotBetween(String value1, String value2) { - addCriterion("device_code not between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andIbpPartIsNull() { - addCriterion("ibp_part is null"); - return (Criteria) this; - } - - public Criteria andIbpPartIsNotNull() { - addCriterion("ibp_part is not null"); - return (Criteria) this; - } - - public Criteria andIbpPartEqualTo(String value) { - addCriterion("ibp_part =", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartNotEqualTo(String value) { - addCriterion("ibp_part <>", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartGreaterThan(String value) { - addCriterion("ibp_part >", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartGreaterThanOrEqualTo(String value) { - addCriterion("ibp_part >=", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartLessThan(String value) { - addCriterion("ibp_part <", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartLessThanOrEqualTo(String value) { - addCriterion("ibp_part <=", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartLike(String value) { - addCriterion("ibp_part like", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartNotLike(String value) { - addCriterion("ibp_part not like", value, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartIn(List values) { - addCriterion("ibp_part in", values, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartNotIn(List values) { - addCriterion("ibp_part not in", values, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartBetween(String value1, String value2) { - addCriterion("ibp_part between", value1, value2, "ibpPart"); - return (Criteria) this; - } - - public Criteria andIbpPartNotBetween(String value1, String value2) { - addCriterion("ibp_part not between", value1, value2, "ibpPart"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("`status` =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andInRoomIsNull() { - addCriterion("in_room is null"); - return (Criteria) this; - } - - public Criteria andInRoomIsNotNull() { - addCriterion("in_room is not null"); - return (Criteria) this; - } - - public Criteria andInRoomEqualTo(Boolean value) { - addCriterion("in_room =", value, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomNotEqualTo(Boolean value) { - addCriterion("in_room <>", value, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomGreaterThan(Boolean value) { - addCriterion("in_room >", value, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomGreaterThanOrEqualTo(Boolean value) { - addCriterion("in_room >=", value, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomLessThan(Boolean value) { - addCriterion("in_room <", value, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomLessThanOrEqualTo(Boolean value) { - addCriterion("in_room <=", value, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomIn(List values) { - addCriterion("in_room in", values, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomNotIn(List values) { - addCriterion("in_room not in", values, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomBetween(Boolean value1, Boolean value2) { - addCriterion("in_room between", value1, value2, "inRoom"); - return (Criteria) this; - } - - public Criteria andInRoomNotBetween(Boolean value1, Boolean value2) { - addCriterion("in_room not between", value1, value2, "inRoom"); - return (Criteria) this; - } - - public Criteria andInSimulationIsNull() { - addCriterion("in_simulation is null"); - return (Criteria) this; - } - - public Criteria andInSimulationIsNotNull() { - addCriterion("in_simulation is not null"); - return (Criteria) this; - } - - public Criteria andInSimulationEqualTo(Boolean value) { - addCriterion("in_simulation =", value, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationNotEqualTo(Boolean value) { - addCriterion("in_simulation <>", value, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationGreaterThan(Boolean value) { - addCriterion("in_simulation >", value, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationGreaterThanOrEqualTo(Boolean value) { - addCriterion("in_simulation >=", value, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationLessThan(Boolean value) { - addCriterion("in_simulation <", value, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationLessThanOrEqualTo(Boolean value) { - addCriterion("in_simulation <=", value, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationIn(List values) { - addCriterion("in_simulation in", values, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationNotIn(List values) { - addCriterion("in_simulation not in", values, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationBetween(Boolean value1, Boolean value2) { - addCriterion("in_simulation between", value1, value2, "inSimulation"); - return (Criteria) this; - } - - public Criteria andInSimulationNotBetween(Boolean value1, Boolean value2) { - addCriterion("in_simulation not between", value1, value2, "inSimulation"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomRealDevice.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomRealDevice.java deleted file mode 100644 index 84d611cd8..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomRealDevice.java +++ /dev/null @@ -1,104 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; - -/** - * simulation_room_real_device - * @author - */ -public class SimulationRoomRealDevice implements Serializable { - private Long id; - - /** - * 房间id - */ - private Long roomId; - - /** - * 项目真实设备id - */ - private Long projectDeviceId; - - /** - * 关联设备编码 - */ - private String deviceCode; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getRoomId() { - return roomId; - } - - public void setRoomId(Long roomId) { - this.roomId = roomId; - } - - public Long getProjectDeviceId() { - return projectDeviceId; - } - - public void setProjectDeviceId(Long projectDeviceId) { - this.projectDeviceId = projectDeviceId; - } - - public String getDeviceCode() { - return deviceCode; - } - - public void setDeviceCode(String deviceCode) { - this.deviceCode = deviceCode; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationRoomRealDevice other = (SimulationRoomRealDevice) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRoomId() == null ? other.getRoomId() == null : this.getRoomId().equals(other.getRoomId())) - && (this.getProjectDeviceId() == null ? other.getProjectDeviceId() == null : this.getProjectDeviceId().equals(other.getProjectDeviceId())) - && (this.getDeviceCode() == null ? other.getDeviceCode() == null : this.getDeviceCode().equals(other.getDeviceCode())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRoomId() == null) ? 0 : getRoomId().hashCode()); - result = prime * result + ((getProjectDeviceId() == null) ? 0 : getProjectDeviceId().hashCode()); - result = prime * result + ((getDeviceCode() == null) ? 0 : getDeviceCode().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", roomId=").append(roomId); - sb.append(", projectDeviceId=").append(projectDeviceId); - sb.append(", deviceCode=").append(deviceCode); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRoomRealDeviceExample.java b/src/main/java/club/joylink/rtss/entity/SimulationRoomRealDeviceExample.java deleted file mode 100644 index 9da79819b..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRoomRealDeviceExample.java +++ /dev/null @@ -1,472 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.List; - -public class SimulationRoomRealDeviceExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Long offset; - - public SimulationRoomRealDeviceExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Long offset) { - this.offset = offset; - } - - public Long getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRoomIdIsNull() { - addCriterion("room_id is null"); - return (Criteria) this; - } - - public Criteria andRoomIdIsNotNull() { - addCriterion("room_id is not null"); - return (Criteria) this; - } - - public Criteria andRoomIdEqualTo(Long value) { - addCriterion("room_id =", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotEqualTo(Long value) { - addCriterion("room_id <>", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdGreaterThan(Long value) { - addCriterion("room_id >", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdGreaterThanOrEqualTo(Long value) { - addCriterion("room_id >=", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdLessThan(Long value) { - addCriterion("room_id <", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdLessThanOrEqualTo(Long value) { - addCriterion("room_id <=", value, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdIn(List values) { - addCriterion("room_id in", values, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotIn(List values) { - addCriterion("room_id not in", values, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdBetween(Long value1, Long value2) { - addCriterion("room_id between", value1, value2, "roomId"); - return (Criteria) this; - } - - public Criteria andRoomIdNotBetween(Long value1, Long value2) { - addCriterion("room_id not between", value1, value2, "roomId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdIsNull() { - addCriterion("project_device_id is null"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdIsNotNull() { - addCriterion("project_device_id is not null"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdEqualTo(Long value) { - addCriterion("project_device_id =", value, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdNotEqualTo(Long value) { - addCriterion("project_device_id <>", value, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdGreaterThan(Long value) { - addCriterion("project_device_id >", value, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdGreaterThanOrEqualTo(Long value) { - addCriterion("project_device_id >=", value, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdLessThan(Long value) { - addCriterion("project_device_id <", value, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdLessThanOrEqualTo(Long value) { - addCriterion("project_device_id <=", value, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdIn(List values) { - addCriterion("project_device_id in", values, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdNotIn(List values) { - addCriterion("project_device_id not in", values, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdBetween(Long value1, Long value2) { - addCriterion("project_device_id between", value1, value2, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andProjectDeviceIdNotBetween(Long value1, Long value2) { - addCriterion("project_device_id not between", value1, value2, "projectDeviceId"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNull() { - addCriterion("device_code is null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIsNotNull() { - addCriterion("device_code is not null"); - return (Criteria) this; - } - - public Criteria andDeviceCodeEqualTo(String value) { - addCriterion("device_code =", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotEqualTo(String value) { - addCriterion("device_code <>", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThan(String value) { - addCriterion("device_code >", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeGreaterThanOrEqualTo(String value) { - addCriterion("device_code >=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThan(String value) { - addCriterion("device_code <", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLessThanOrEqualTo(String value) { - addCriterion("device_code <=", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeLike(String value) { - addCriterion("device_code like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotLike(String value) { - addCriterion("device_code not like", value, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeIn(List values) { - addCriterion("device_code in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotIn(List values) { - addCriterion("device_code not in", values, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeBetween(String value1, String value2) { - addCriterion("device_code between", value1, value2, "deviceCode"); - return (Criteria) this; - } - - public Criteria andDeviceCodeNotBetween(String value1, String value2) { - addCriterion("device_code not between", value1, value2, "deviceCode"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRunAsPlan.java b/src/main/java/club/joylink/rtss/entity/SimulationRunAsPlan.java deleted file mode 100644 index 4b33909d7..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRunAsPlan.java +++ /dev/null @@ -1,137 +0,0 @@ -package club.joylink.rtss.entity; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * simulation_run_as_plan - * @author - */ -public class SimulationRunAsPlan implements Serializable { - private Long id; - - /** - * 仿真记录id - */ - private Long recordId; - - /** - * 开始时间 - */ - private LocalDateTime startTime; - - /** - * 结束时间 - */ - private LocalDateTime endTime; - - /** - * 使用的每日运行图id - */ - private Long runPlanDailyId; - - /** - * 仿真时刻 - */ - private LocalDateTime systemTime; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public LocalDateTime getStartTime() { - return startTime; - } - - public void setStartTime(LocalDateTime startTime) { - this.startTime = startTime; - } - - public LocalDateTime getEndTime() { - return endTime; - } - - public void setEndTime(LocalDateTime endTime) { - this.endTime = endTime; - } - - public Long getRunPlanDailyId() { - return runPlanDailyId; - } - - public void setRunPlanDailyId(Long runPlanDailyId) { - this.runPlanDailyId = runPlanDailyId; - } - - public LocalDateTime getSystemTime() { - return systemTime; - } - - public void setSystemTime(LocalDateTime systemTime) { - this.systemTime = systemTime; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SimulationRunAsPlan other = (SimulationRunAsPlan) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRecordId() == null ? other.getRecordId() == null : this.getRecordId().equals(other.getRecordId())) - && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime())) - && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime())) - && (this.getRunPlanDailyId() == null ? other.getRunPlanDailyId() == null : this.getRunPlanDailyId().equals(other.getRunPlanDailyId())) - && (this.getSystemTime() == null ? other.getSystemTime() == null : this.getSystemTime().equals(other.getSystemTime())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRecordId() == null) ? 0 : getRecordId().hashCode()); - result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode()); - result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode()); - result = prime * result + ((getRunPlanDailyId() == null) ? 0 : getRunPlanDailyId().hashCode()); - result = prime * result + ((getSystemTime() == null) ? 0 : getSystemTime().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", recordId=").append(recordId); - sb.append(", startTime=").append(startTime); - sb.append(", endTime=").append(endTime); - sb.append(", runPlanDailyId=").append(runPlanDailyId); - sb.append(", systemTime=").append(systemTime); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/entity/SimulationRunAsPlanExample.java b/src/main/java/club/joylink/rtss/entity/SimulationRunAsPlanExample.java deleted file mode 100644 index 6744c3960..000000000 --- a/src/main/java/club/joylink/rtss/entity/SimulationRunAsPlanExample.java +++ /dev/null @@ -1,583 +0,0 @@ -package club.joylink.rtss.entity; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SimulationRunAsPlanExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public SimulationRunAsPlanExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getLimit() { - return limit; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getOffset() { - return offset; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Date value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Date value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Date value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Date value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Date value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Date value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Date value1, Date value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Date value1, Date value2) { - addCriterion("start_time not between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Date value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Date value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Date value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Date value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Date value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Date value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Date value1, Date value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Date value1, Date value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdIsNull() { - addCriterion("run_plan_daily_id is null"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdIsNotNull() { - addCriterion("run_plan_daily_id is not null"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdEqualTo(Long value) { - addCriterion("run_plan_daily_id =", value, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdNotEqualTo(Long value) { - addCriterion("run_plan_daily_id <>", value, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdGreaterThan(Long value) { - addCriterion("run_plan_daily_id >", value, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdGreaterThanOrEqualTo(Long value) { - addCriterion("run_plan_daily_id >=", value, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdLessThan(Long value) { - addCriterion("run_plan_daily_id <", value, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdLessThanOrEqualTo(Long value) { - addCriterion("run_plan_daily_id <=", value, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdIn(List values) { - addCriterion("run_plan_daily_id in", values, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdNotIn(List values) { - addCriterion("run_plan_daily_id not in", values, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdBetween(Long value1, Long value2) { - addCriterion("run_plan_daily_id between", value1, value2, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andRunPlanDailyIdNotBetween(Long value1, Long value2) { - addCriterion("run_plan_daily_id not between", value1, value2, "runPlanDailyId"); - return (Criteria) this; - } - - public Criteria andSystemTimeIsNull() { - addCriterion("system_time is null"); - return (Criteria) this; - } - - public Criteria andSystemTimeIsNotNull() { - addCriterion("system_time is not null"); - return (Criteria) this; - } - - public Criteria andSystemTimeEqualTo(Date value) { - addCriterion("system_time =", value, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeNotEqualTo(Date value) { - addCriterion("system_time <>", value, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeGreaterThan(Date value) { - addCriterion("system_time >", value, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeGreaterThanOrEqualTo(Date value) { - addCriterion("system_time >=", value, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeLessThan(Date value) { - addCriterion("system_time <", value, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeLessThanOrEqualTo(Date value) { - addCriterion("system_time <=", value, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeIn(List values) { - addCriterion("system_time in", values, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeNotIn(List values) { - addCriterion("system_time not in", values, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeBetween(Date value1, Date value2) { - addCriterion("system_time between", value1, value2, "systemTime"); - return (Criteria) this; - } - - public Criteria andSystemTimeNotBetween(Date value1, Date value2) { - addCriterion("system_time not between", value1, value2, "systemTime"); - return (Criteria) this; - } - } - - /** - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/exception/BusinessExceptionAssertEnum.java b/src/main/java/club/joylink/rtss/exception/BusinessExceptionAssertEnum.java index 774a3772b..63a50516b 100644 --- a/src/main/java/club/joylink/rtss/exception/BusinessExceptionAssertEnum.java +++ b/src/main/java/club/joylink/rtss/exception/BusinessExceptionAssertEnum.java @@ -40,6 +40,7 @@ public enum BusinessExceptionAssertEnum implements BusinessExceptionAssert { // + LOGIN_INFO_ERROR(40003, "login info error"), LOGIN_EXPIRED(40004, "login expired"), NOT_LOGIN(40005, "not login"), INVALID_CLIENT(40031, "invalid client"), diff --git a/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java b/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java index 4be51417a..1048f8d12 100644 --- a/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java +++ b/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java @@ -1,6 +1,5 @@ package club.joylink.rtss.services; -import club.joylink.rtss.runplan.newdraw.RunPlanInput; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; @@ -8,6 +7,7 @@ import club.joylink.rtss.vo.client.map.MapRoutingSectionVO; import club.joylink.rtss.vo.client.map.newmap.MapStationParkingTimeVO; import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO; import club.joylink.rtss.vo.client.runplan.*; +import club.joylink.rtss.vo.runplan.newdraw.RunPlanInput; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -218,7 +218,7 @@ public interface IRunPlanDraftService { /** * 运行图仿真测试 * @param planId - * @param userVO + * @param loginUserInfoVO * @return */ String simulationCheck(Long planId, LoginUserInfoVO loginUserInfoVO); diff --git a/src/main/java/club/joylink/rtss/services/ISchedulingPlanService.java b/src/main/java/club/joylink/rtss/services/ISchedulingPlanService.java deleted file mode 100644 index 59e67c3fc..000000000 --- a/src/main/java/club/joylink/rtss/services/ISchedulingPlanService.java +++ /dev/null @@ -1,137 +0,0 @@ -package club.joylink.rtss.services; - -import club.joylink.rtss.entity.SchedulingPlan; -import club.joylink.rtss.simulation.scheduling.SchedulingPlanBO; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.map.MapVO; -import club.joylink.rtss.vo.client.runplan.RunPlanVO; -import club.joylink.rtss.vo.client.scheduling.SchedulingCheckResult; -import club.joylink.rtss.vo.client.scheduling.SchedulingPlanVO; -import club.joylink.rtss.vo.client.scheduling.SchedulingTrainEditVO; -import club.joylink.rtss.vo.client.scheduling.TrainBaseInfoVO; - -import java.time.LocalDate; -import java.util.List; - -/** - * 派班计划服务 - */ -public interface ISchedulingPlanService { - /** - * 构建派班计划的仿真数据 - * @param mapId - * @param prdType - * @param user - */ - String schedulingPlanSimulation(Long mapId, String prdType, UserVO user); - - /** - * 查询某天的派班计划-在派班计划仿真 - * @param group - * @param day - * @param user - * @return - */ - SchedulingPlanVO findSchedulingPlan(String group, LocalDate day, UserVO user); - - /** - * 查询用户某天的派班计划 - * @param mapId - * @param date - * @param userId - * @return - */ - SchedulingPlan findUserPlan(Long mapId, LocalDate date, Long userId); - - /** - * 获取用户某天的派班计划 - * @param mapId - * @param date - * @param userId - * @return - */ - SchedulingPlan getUserPlan(Long mapId, LocalDate date, Long userId); - - /** - * 查询通用的派班计划 - * @param mapId - * @return - */ - SchedulingPlan findCommonPlan(Long mapId); - - /** - * 获取通用的派班计划 - * @param mapId - * @return - */ - SchedulingPlan getCommonPlan(Long mapId); - - /** - * 生成某天的基础派班计划 - * @param group - * @param day - * @param user - * @return - */ - SchedulingPlanVO generateBaseSchedulingPlanOfDay(String group, LocalDate day, UserVO user); - - /** - * 获取所有列车 - * @param group - * @return - */ - List getAllTrains(String group); - - /** - * 派班计划冲突检查 - * @param group - * @param editVOList - * @return - */ - SchedulingCheckResult checkConflict(String group, List editVOList); - - /** - * 保存派班计划数据 - * @param group - * @param editVOList - */ - void saveSchedulingPlan(String group, List editVOList); - - SchedulingPlanVO deleteAndRebuildSchedulingPlan(String group, LocalDate day, UserVO user); - - /** - * 生成某张地图通用派班计划 - * @param mapId - * @param user - */ - void generateMapCommonSchedulingPlan(Long mapId, UserVO user); - - /** - * 生成某张地图通用派班计划 - * @param mapVO - * @param commonDailyRunPlan - * @param user - */ - void generateMapCommonSchedulingPlan(MapVO mapVO, RunPlanVO commonDailyRunPlan, UserVO user); - - /** - * 生成通用的派班计划 - * @param user - */ - void generateCommonSchedulingPlan(UserVO user); - - /** - * 获取派班计划（先获取用户的，若不存在，获取通用的） - * @param mapId - * @param userId - * @return - */ - SchedulingPlanBO getSchedulingPlan(Long mapId, Long userId); - - /** - * 拷贝通用派班计划 - * @param sourceMapId - * @param targetMapId - */ - void copyCommonSchedulingPlan(Long sourceMapId, Long targetMapId); -} diff --git a/src/main/java/club/joylink/rtss/services/ISimulationRecordService.java b/src/main/java/club/joylink/rtss/services/ISimulationRecordService.java deleted file mode 100644 index b8c064fd5..000000000 --- a/src/main/java/club/joylink/rtss/services/ISimulationRecordService.java +++ /dev/null @@ -1,107 +0,0 @@ -package club.joylink.rtss.services; - -import club.joylink.rtss.simulation.record.SimulationFrameData; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.*; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; - -public interface ISimulationRecordService { - - /** - * 保存仿真记录 - */ - Long saveRecord(String group); - - /** - * 仿真结束更新记录 - * @param recordId - */ - void updateRecord(Long recordId); - - /** - * 保存按计划行车记录 - * @param recordId - * @param runPlanDailyId - * @param systemTime - */ - void saveRunAsPlanRecord(Long recordId, Long runPlanDailyId, LocalDateTime systemTime); - - /** - * 退出按计划行车更新记录 - * @param recordId - */ - void updateRunAsPlanRecord(Long recordId); - - /** - * 保存会话 - * @param recordId - * @param conversationMap - */ - void saveConversation(Long recordId, Map conversationMap); - - /** - * 保存帧 - * @param recordId - * @param simulationFrameDataList - */ - void saveFrame(Long recordId, List simulationFrameDataList); - - /** - * 分页查询仿真记录 - * @param queryVO - * @return - */ - PageVO queryPagedRecord(PageQueryVO queryVO); - - /** - * 回放 - * @param id - */ - void playBack(Long id, UserVO userVO); - - /** - * 设置播放速度 - * @param id - * @param playSpeed - */ - void setPlaySpeed(Long id, float playSpeed, UserVO userVO); - - /** - * 暂停 - * @param id - * @param userVO - */ - void pause(Long id, UserVO userVO); - - /** - * 播放 - * @param id - * @param userVO - */ - void play(Long id, UserVO userVO); - - /** - * 设置播放时间 - * @param id - * @param offsetSeconds - * @param userVO - */ - void setPlayTime(Long id, Long offsetSeconds, UserVO userVO); - - /** - * 结束 - * @param id - * @param userVO - */ - void over(Long id, UserVO userVO); - - /** - * 删除记录 - * @param id - * @param userVO - */ - void delete(Long id, UserVO userVO); -} diff --git a/src/main/java/club/joylink/rtss/services/ITaskService.java b/src/main/java/club/joylink/rtss/services/ITaskService.java deleted file mode 100644 index ca8934e76..000000000 --- a/src/main/java/club/joylink/rtss/services/ITaskService.java +++ /dev/null @@ -1,35 +0,0 @@ -package club.joylink.rtss.services; - -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.TaskListVO; -import club.joylink.rtss.vo.client.TaskQueryVO; -import club.joylink.rtss.vo.client.TaskVO; - -public interface ITaskService { - - /** - * 分页查询任务 - * @return - */ - PageVO queryPagedTask(TaskQueryVO queryVO); - - /** - * 创建任务 - * @param taskVO - * @param userVO - */ - void createTask(TaskVO taskVO, UserVO userVO); - - /** - * 开始任务 - * @param id - */ - void execute(Long id); - - /** - * 取消任务 - * @param id - */ - void cancel(Long id); -} diff --git a/src/main/java/club/joylink/rtss/services/LessonDraftService.java b/src/main/java/club/joylink/rtss/services/LessonDraftService.java index 52da114b8..33788efe5 100644 --- a/src/main/java/club/joylink/rtss/services/LessonDraftService.java +++ b/src/main/java/club/joylink/rtss/services/LessonDraftService.java @@ -1,18 +1,15 @@ package club.joylink.rtss.services; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.constants.TreeNodeTypeEnum; import club.joylink.rtss.dao.*; import club.joylink.rtss.entity.*; import club.joylink.rtss.entity.LsDraftLessonChapterExample.Criteria; -import club.joylink.rtss.util.ConvertUtil; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.*; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -70,19 +67,17 @@ public class LessonDraftService implements ILessonDraftService { @Override public List getLessonTree(Long lessonId, UserVO userVO) { LsDraftLesson draftLesson = lsDraftLessonDAO.selectByPrimaryKey(lessonId); - if (Objects.isNull(draftLesson)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(draftLesson); // 批量查询课程对应的章节、实训列表 List chapterVos = this.draftLessonChapterDAO.selectChapterTrainingByLessonId(lessonId); // 构建课程树 - return ConvertUtil.buildLessonTreeList(Collections.singletonList(new LessonVO(draftLesson)), chapterVos); + return TreeNode.buildLessonTreeList(Collections.singletonList(new LessonVO(draftLesson)), chapterVos); } @Override public LessonVO getLesson(Long id) { LsDraftLesson lesson = this.lsDraftLessonDAO.selectByPrimaryKey(id); - if(null == lesson) throw new DBException(ExceptionMapping.DATA_NOT_EXIST); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(lesson); return new LessonVO(lesson); } @@ -101,9 +96,7 @@ public class LessonDraftService implements ILessonDraftService { public void createFrom(LessonVO lessonVo, UserVO userVO) { // 创建课程 LsLesson lesson = this.lessonDAO.selectByPrimaryKey(lessonVo.getId()); - if(Objects.isNull(lesson)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(lesson); LsDraftLesson lsDraftLesson = new LessonVO(lesson).convert2Draft(); lsDraftLesson.setName(lessonVo.getName()); lsDraftLesson.setMapId(lessonVo.getMapId()); @@ -146,7 +139,7 @@ public class LessonDraftService implements ILessonDraftService { @Transactional public void updateLesson(Long id, LessonVO lessonVo, UserVO userVO) { LsDraftLesson lesson = this.lsDraftLessonDAO.selectByPrimaryKey(id); - if(null == lesson) throw new DBException(ExceptionMapping.DATA_NOT_EXIST); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(lesson); LsDraftLesson newLesson = lessonVo.convert2Draft(); newLesson.setCreatorId(lesson.getCreatorId()); newLesson.setId(id); @@ -158,7 +151,7 @@ public class LessonDraftService implements ILessonDraftService { @Override public LessonChapterVO getChapter(Long id) { LsDraftLessonChapter chapter = this.draftLessonChapterDAO.selectByPrimaryKey(id); - if(null == chapter) throw new DBException(ExceptionMapping.DATA_NOT_EXIST); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(chapter); LessonChapterVO chapterVo = new LessonChapterVO(chapter); // 查询关联的实训ids LsDraftRelChapterTrainingExample example = new LsDraftRelChapterTrainingExample(); @@ -257,7 +250,7 @@ public class LessonDraftService implements ILessonDraftService { @Transactional public void updateChapter(Long id, LessonChapterVO chapterVo) { LsDraftLessonChapter chapter = this.draftLessonChapterDAO.selectByPrimaryKey(id); - if(null == chapter) throw new DBException(ExceptionMapping.DATA_NOT_EXIST); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(chapter); chapter = chapterVo.toDraftDB(); chapter.setId(id); this.draftLessonChapterDAO.updateByPrimaryKey(chapter); @@ -320,7 +313,7 @@ public class LessonDraftService implements ILessonDraftService { */ private LessonVO getDraftLessonDetail(Long id) { LsDraftLesson lesson = this.lsDraftLessonDAO.selectByPrimaryKey(id); - if(null == lesson) throw new DBException(ExceptionMapping.DATA_NOT_EXIST); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(lesson); LessonVO lessonVo = new LessonVO(lesson); // 查询章节数据 LsDraftLessonChapterExample chapterExample = new LsDraftLessonChapterExample(); @@ -375,9 +368,9 @@ public class LessonDraftService implements ILessonDraftService { private void chapterOrder (DragSortReqVO sortReq) { if(TreeNodeTypeEnum.Chapter.name().equals(sortReq.getSourceType()) && TreeNodeTypeEnum.Chapter.name().equals(sortReq.getTargetType())) { - LsDraftLessonChapter source = this.draftLessonChapterDAO.selectByPrimaryKey(ConvertUtil.str2Long(sortReq.getSourceId())); + LsDraftLessonChapter source = this.draftLessonChapterDAO.selectByPrimaryKey(sortReq.getSourceId()); if(null != source) { - LsDraftLessonChapter target = this.draftLessonChapterDAO.selectByPrimaryKey(ConvertUtil.str2Long(sortReq.getTargetId())); + LsDraftLessonChapter target = this.draftLessonChapterDAO.selectByPrimaryKey(sortReq.getTargetId()); if(null != target) { LsDraftLessonChapterExample example = new LsDraftLessonChapterExample(); Criteria criteria = example.createCriteria(); @@ -450,56 +443,53 @@ public class LessonDraftService implements ILessonDraftService { if(TreeNodeTypeEnum.Training.name().equals(sortReq.getSourceType()) && TreeNodeTypeEnum.Training.name().equals(sortReq.getTargetType()) && !DragSortReqVO.LocateType.Inner.equals(sortReq.getLocation())){ - if(null==sortReq.getLessonId() || null==sortReq.getChapterId()) { - throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); - } else { - Integer order = 1; - LsDraftRelChapterTraining sourceRel = null; - LsDraftRelChapterTraining targetRel = null; - LsDraftRelChapterTrainingExample rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(ConvertUtil.str2Long(sortReq.getLessonId())).andChapterIdEqualTo(ConvertUtil.str2Long(sortReq.getChapterId())).andTrainingIdEqualTo(ConvertUtil.str2Long(sortReq.getSourceId())); - if(!draftRelChapterTrainingDAO.selectByExample(rExample).isEmpty()) { - sourceRel = draftRelChapterTrainingDAO.selectByExample(rExample).get(0); - } - rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(ConvertUtil.str2Long(sortReq.getLessonId())).andChapterIdEqualTo(ConvertUtil.str2Long(sortReq.getChapterId())).andTrainingIdEqualTo(ConvertUtil.str2Long(sortReq.getTargetId())); - if(!draftRelChapterTrainingDAO.selectByExample(rExample).isEmpty()) { - targetRel = draftRelChapterTrainingDAO.selectByExample(rExample).get(0); - } - if(DragSortReqVO.LocateType.Before.equals(sortReq.getLocation())) { - if(sourceRel.getLessonId().equals(targetRel.getLessonId()) && sourceRel.getChapterId().equals(targetRel.getChapterId())) { //同级 - if(sourceRel.getOrderNum().intValue()>targetRel.getOrderNum().intValue()) { //source位置大于target - order = targetRel.getOrderNum(); - rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThanOrEqualTo(targetRel.getOrderNum()).andOrderNumLessThan(sourceRel.getOrderNum()); - this.updateTrainingOrder(rExample, 1); - } else { //source位置小于target - order = targetRel.getOrderNum()-1; - rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThan(sourceRel.getOrderNum()).andOrderNumLessThan(targetRel.getOrderNum()); - this.updateTrainingOrder(rExample, -1); - } - } - } else if(DragSortReqVO.LocateType.After.equals(sortReq.getLocation())) { - if(sourceRel.getChapterId().equals(targetRel.getChapterId())) { //同级 - if(sourceRel.getOrderNum().intValue()>targetRel.getOrderNum().intValue()) { //source位置大于target - order = targetRel.getOrderNum()+1; - rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThan(targetRel.getOrderNum()).andOrderNumLessThan(sourceRel.getOrderNum()); - this.updateTrainingOrder(rExample, 1); - } else { //source位置小于target - order = targetRel.getOrderNum(); - rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThan(sourceRel.getOrderNum()).andOrderNumLessThanOrEqualTo(targetRel.getOrderNum()); - this.updateTrainingOrder(rExample, -1); - } - } - } - sourceRel.setOrderNum(order); - rExample = new LsDraftRelChapterTrainingExample(); - rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andTrainingIdEqualTo(sourceRel.getTrainingId()); - this.draftRelChapterTrainingDAO.updateByExample(sourceRel, rExample); + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(null!=sortReq.getLessonId() && null!=sortReq.getChapterId()); + Integer order = 1; + LsDraftRelChapterTraining sourceRel = null; + LsDraftRelChapterTraining targetRel = null; + LsDraftRelChapterTrainingExample rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo(sortReq.getLessonId()).andChapterIdEqualTo(sortReq.getChapterId()).andTrainingIdEqualTo(sortReq.getSourceId()); + if(!draftRelChapterTrainingDAO.selectByExample(rExample).isEmpty()) { + sourceRel = draftRelChapterTrainingDAO.selectByExample(rExample).get(0); } + rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo((sortReq.getLessonId())).andChapterIdEqualTo((sortReq.getChapterId())).andTrainingIdEqualTo((sortReq.getTargetId())); + if(!draftRelChapterTrainingDAO.selectByExample(rExample).isEmpty()) { + targetRel = draftRelChapterTrainingDAO.selectByExample(rExample).get(0); + } + if(DragSortReqVO.LocateType.Before.equals(sortReq.getLocation())) { + if(sourceRel.getLessonId().equals(targetRel.getLessonId()) && sourceRel.getChapterId().equals(targetRel.getChapterId())) { //同级 + if(sourceRel.getOrderNum().intValue()>targetRel.getOrderNum().intValue()) { //source位置大于target + order = targetRel.getOrderNum(); + rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThanOrEqualTo(targetRel.getOrderNum()).andOrderNumLessThan(sourceRel.getOrderNum()); + this.updateTrainingOrder(rExample, 1); + } else { //source位置小于target + order = targetRel.getOrderNum()-1; + rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThan(sourceRel.getOrderNum()).andOrderNumLessThan(targetRel.getOrderNum()); + this.updateTrainingOrder(rExample, -1); + } + } + } else if(DragSortReqVO.LocateType.After.equals(sortReq.getLocation())) { + if(sourceRel.getChapterId().equals(targetRel.getChapterId())) { //同级 + if(sourceRel.getOrderNum().intValue()>targetRel.getOrderNum().intValue()) { //source位置大于target + order = targetRel.getOrderNum()+1; + rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThan(targetRel.getOrderNum()).andOrderNumLessThan(sourceRel.getOrderNum()); + this.updateTrainingOrder(rExample, 1); + } else { //source位置小于target + order = targetRel.getOrderNum(); + rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andOrderNumGreaterThan(sourceRel.getOrderNum()).andOrderNumLessThanOrEqualTo(targetRel.getOrderNum()); + this.updateTrainingOrder(rExample, -1); + } + } + } + sourceRel.setOrderNum(order); + rExample = new LsDraftRelChapterTrainingExample(); + rExample.createCriteria().andLessonIdEqualTo(sourceRel.getLessonId()).andChapterIdEqualTo(sourceRel.getChapterId()).andTrainingIdEqualTo(sourceRel.getTrainingId()); + this.draftRelChapterTrainingDAO.updateByExample(sourceRel, rExample); } } diff --git a/src/main/java/club/joylink/rtss/services/LessonService.java b/src/main/java/club/joylink/rtss/services/LessonService.java index fa011035d..84c6bec1c 100644 --- a/src/main/java/club/joylink/rtss/services/LessonService.java +++ b/src/main/java/club/joylink/rtss/services/LessonService.java @@ -62,9 +62,6 @@ public class LessonService implements ILessonService { @Autowired private IUserPermissionService iUserPermissionService; - @Autowired - private ISysUserService iSysUserService; - @Autowired private ITrainingV1Service iTrainingV1Service; diff --git a/src/main/java/club/joylink/rtss/services/PermissionDistributeService.java b/src/main/java/club/joylink/rtss/services/PermissionDistributeService.java index 50c5acd7c..0653abce5 100644 --- a/src/main/java/club/joylink/rtss/services/PermissionDistributeService.java +++ b/src/main/java/club/joylink/rtss/services/PermissionDistributeService.java @@ -1,5 +1,6 @@ package club.joylink.rtss.services; +import club.joylink.rtss.services.auth.IAuthenticateService; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.joylink.base.exception.BusinessException; diff --git a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java index 754b0607b..7ab0050b0 100644 --- a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java +++ b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java @@ -1,26 +1,13 @@ package club.joylink.rtss.services; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; -import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.dao.MpStationRunningDAO; import club.joylink.rtss.dao.RealLineDAO; import club.joylink.rtss.dao.RunPlanDraftDAO; import club.joylink.rtss.dao.RunPlanLevelDAO; import club.joylink.rtss.entity.*; -import club.joylink.rtss.runplan.*; -import club.joylink.rtss.runplan.newdraw.RunPlanGenerator; -import club.joylink.rtss.runplan.newdraw.RunPlanInput; -import club.joylink.rtss.runplan.newrunplan.*; -import club.joylink.rtss.simulation.GroupSimulationManager; -import club.joylink.rtss.simulation.SimulationConstructData; -import club.joylink.rtss.simulation.constant.SimulationType; -import club.joylink.rtss.simulation.util.SimulationIdGenerator; -import club.joylink.rtss.util.ConvertUtil; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.util.JsonUtils; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; @@ -28,12 +15,17 @@ import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.*; import club.joylink.rtss.vo.client.map.newmap.*; import club.joylink.rtss.vo.client.runplan.*; +import club.joylink.rtss.vo.runplan.newdraw.RunPlanGenerator; +import club.joylink.rtss.vo.runplan.newdraw.RunPlanInput; +import club.joylink.rtss.vo.runplan.newrunplan.*; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.time.LocalDateTime; import java.util.*; @@ -61,9 +53,6 @@ public class RunPlanDraftService implements IRunPlanDraftService { @Autowired private RunPlanLevelDAO runPlanLevelDAO; - @Autowired - private GroupSimulationManager groupSimulationManager; - @Autowired private GroupSimulationService groupSimulationService; @@ -82,7 +71,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { draftPlan.setCreatorId(userVO.getId()); draftPlan.setStatus(BusinessConsts.ReleaseReview.RELEASE_STATUS_01); runPlanDraftDAO.insert(draftPlan); - return ConvertUtil.long2Str(draftPlan.getId()); + return draftPlan.getId().toString(); } @Override @@ -118,7 +107,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { planDraft.setTrips(JsonUtils.writeValueAsString(runPlanVO.getTripList())); planDraft.setStatus(BusinessConsts.ReleaseReview.RELEASE_STATUS_01); runPlanDraftDAO.insert(planDraft); - return ConvertUtil.long2Str(planDraft.getId()); + return planDraft.getId().toString(); } @Override @@ -140,9 +129,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { @Override public void deleteDiagramDraftData(Long planId, UserVO userVO) { RunPlanDraft runPlanDraft = runPlanDraftDAO.selectByPrimaryKey(planId); - if (!Objects.equals(runPlanDraft.getCreatorId(), userVO.getId())) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } + BusinessExceptionAssertEnum.INVALID_OPERATION.assertTrue(Objects.equals(runPlanDraft.getCreatorId(), userVO.getId())); runPlanDraftDAO.deleteByPrimaryKey(planId); } @@ -150,12 +137,9 @@ public class RunPlanDraftService implements IRunPlanDraftService { @Override public void publish(Long planId, UserVO userVO) { RunPlanDraft runPlanDraft = runPlanDraftDAO.selectByPrimaryKey(planId); - if (Objects.isNull(runPlanDraft)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if (StringUtils.isBlank(runPlanDraft.getTrips())) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION, "运行图车次数据为空，请检查！"); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(runPlanDraft); + BusinessExceptionAssertEnum.DATA_ERROR.assertHasText(runPlanDraft.getTrips(), + "运行图车次数据为空，请检查！"); if (iSysUserService.isAdmin(userVO)) { RunPlanVO runPlanVO = new RunPlanVO(runPlanDraft); runPlanVO.setTripList(JsonUtils.read(runPlanDraft.getTrips(), JsonUtils.getCollectionType(List.class, RunPlanTripVO.class))); @@ -171,12 +155,9 @@ public class RunPlanDraftService implements IRunPlanDraftService { @Override public void directPublish(Long planId, String runPlanName, UserVO userVO) { RunPlanDraft runPlanDraft = runPlanDraftDAO.selectByPrimaryKey(planId); - if (Objects.isNull(runPlanDraft)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if (StringUtils.isBlank(runPlanDraft.getTrips())) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION, "运行图车次数据为空，请检查！"); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(runPlanDraft); + BusinessExceptionAssertEnum.DATA_ERROR.assertHasText(runPlanDraft.getTrips(), + "运行图车次数据为空，请检查！"); RunPlanVO runPlanVO = new RunPlanVO(runPlanDraft); if(StringUtils.hasText(runPlanName)) runPlanVO.setName(runPlanName); runPlanVO.setTripList(JsonUtils.read(runPlanDraft.getTrips(), JsonUtils.getCollectionType(List.class, RunPlanTripVO.class))); @@ -194,102 +175,68 @@ public class RunPlanDraftService implements IRunPlanDraftService { MapVO mapVO = this.iMapService.getMapDetail(mapId); List tripVOList; - if (mapVO.isDrawWay()) { - List stationList = this.prepareStationDataNew(mapVO); - if (CollectionUtils.isEmpty(stationList)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - // 查询目的地码-区段code关系 - Map sectionMap = mapVO.getGraphDataNew().getSectionList().stream() - .filter(mapSectionVO -> StringUtils.hasText(mapSectionVO.getDestinationCode())) - .collect(Collectors.toMap(MapSectionNewVO::getDestinationCode, Function.identity())); - // 导入数据校验并预处理 - IRunPlanStrategyNew runPlanStrategy; - //获取线路上行对应方向 - String upDirection = null; - RealLineExample example = new RealLineExample(); - example.createCriteria().andCodeEqualTo(mapVO.getLineCode()); - List realLineList = this.realLineDAO.selectByExampleWithBLOBs(example); - if (!CollectionUtils.isEmpty(realLineList)) { - String configData = realLineList.get(0).getConfigData(); + List stationList = this.prepareStationDataNew(mapVO); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertCollectionNotEmpty(stationList); + // 查询目的地码-区段code关系 + Map sectionMap = mapVO.getGraphDataNew().getSectionList().stream() + .filter(mapSectionVO -> StringUtils.hasText(mapSectionVO.getDestinationCode())) + .collect(Collectors.toMap(MapSectionNewVO::getDestinationCode, Function.identity())); + // 导入数据校验并预处理 + IRunPlanStrategyNew runPlanStrategy; + //获取线路上行对应方向 + String upDirection = null; + RealLineExample example = new RealLineExample(); + example.createCriteria().andCodeEqualTo(mapVO.getLineCode()); + List realLineList = this.realLineDAO.selectByExampleWithBLOBs(example); + if (!CollectionUtils.isEmpty(realLineList)) { + String configData = realLineList.get(0).getConfigData(); - RealLineConfigVO realLineConfigVO = RealLineConfigVO.parseJsonStr(configData); - if (realLineConfigVO.getUpRight()) { - upDirection = BusinessConsts.RealLine.Direction.RIGHT; - } else { - upDirection = BusinessConsts.RealLine.Direction.LEFT; - } + RealLineConfigVO realLineConfigVO = RealLineConfigVO.parseJsonStr(configData); + if (realLineConfigVO.getUpRight()) { + upDirection = BusinessConsts.RealLine.Direction.RIGHT; + } else { + upDirection = BusinessConsts.RealLine.Direction.LEFT; } - switch (mapVO.getLineCode()) { - case "01": - runPlanStrategy = new ChengDuLine1RunPlanNew(); - break; - case "02": - runPlanStrategy = new FuZhouLine1RunPlanNew(); - break; - case "03": - runPlanStrategy = new BeiJingLine1RunPlanNew(); - break; - case "04": - runPlanStrategy = new ChengDuLine3RunPlanNew(); - break; - case "06": - runPlanStrategy = new NingBoLine1RunPlanNew(); - break; - case "07": - runPlanStrategy = new HarBinLine1RunPlanNew(); - break; - case "08": - runPlanStrategy = new FoshanTramRunPlanNew(); - break; - case "09": - runPlanStrategy = new XianLine2RunPlanNew(); - break; - case "10": - runPlanStrategy = new XianLine1RunPlanNew(); - break; - case "11": - case "12": //宁波三测试图 - runPlanStrategy = new XianLine3RunPlanNew(); - break; - default: - runPlanStrategy = new DefaultRunPlanNew(); - break; - } - runPlanStrategy.importDataCheckAndPreHandle(runPlanImportList, stationList, upDirection); - // 生成到站计划数据 - tripVOList = runPlanStrategy.parseRunPlanImport(runPlanImportList, sectionMap, upDirection); - - } else { - List stationList = this.prepareStationData(mapVO); - if (CollectionUtils.isEmpty(stationList)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - // 查询目的地码-区段code关系 - Map sectionMap = mapVO.getGraphData().getSectionList().stream() - .filter(mapSectionVO -> StringUtils.hasText(mapSectionVO.getDestinationCode())) - .collect(Collectors.toMap(MapSectionVO::getDestinationCode, MapSectionVO::getCode)); - // 导入数据校验并预处理 - IRunPlanStrategy runPlanStrategy; - switch (mapVO.getLineCode()) { - case "02": - runPlanStrategy = new FuZhouLine1RunPlan(); - sectionMap.put("217", "Section_134_0.98324"); - break; - case "03": - runPlanStrategy = new BeiJingLine1RunPlan(); - break; - case "04": - runPlanStrategy = new ChengDuLine3RunPlan(); - break; - default: - runPlanStrategy = new DefaultRunPlan(); - break; - } - runPlanStrategy.importDataCheckAndPreHandle(runPlanImportList, stationList); - // 生成到站计划数据 - tripVOList = runPlanStrategy.parseRunPlanImport(runPlanImportList, sectionMap); } + switch (mapVO.getLineCode()) { + case "01": + runPlanStrategy = new ChengDuLine1RunPlanNew(); + break; + case "02": + runPlanStrategy = new FuZhouLine1RunPlanNew(); + break; + case "03": + runPlanStrategy = new BeiJingLine1RunPlanNew(); + break; + case "04": + runPlanStrategy = new ChengDuLine3RunPlanNew(); + break; + case "06": + runPlanStrategy = new NingBoLine1RunPlanNew(); + break; + case "07": + runPlanStrategy = new HarBinLine1RunPlanNew(); + break; + case "08": + runPlanStrategy = new FoshanTramRunPlanNew(); + break; + case "09": + runPlanStrategy = new XianLine2RunPlanNew(); + break; + case "10": + runPlanStrategy = new XianLine1RunPlanNew(); + break; + case "11": + case "12": //宁波三测试图 + runPlanStrategy = new XianLine3RunPlanNew(); + break; + default: + runPlanStrategy = new DefaultRunPlanNew(); + break; + } + runPlanStrategy.importDataCheckAndPreHandle(runPlanImportList, stationList, upDirection); + // 生成到站计划数据 + tripVOList = runPlanStrategy.parseRunPlanImport(runPlanImportList, sectionMap, upDirection); // 生成计划对象 RunPlanDraft plan = new RunPlanDraft(); plan.setMapId(mapId); @@ -315,9 +262,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { MpStationRunningExample stationRunningExample = new MpStationRunningExample(); stationRunningExample.createCriteria().andMapIdEqualTo(mapId); List stationRunningList = this.stationRunningDAO.selectByExample(stationRunningExample); - if (CollectionUtils.isEmpty(stationRunningList)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, "站间运行数据不存在！"); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertCollectionNotEmpty(stationRunningList, "站间运行数据不存在！"); List stationRunningVOList = new ArrayList<>(); stationRunningList.forEach(stationRunning -> { MapStationRunningVO stationRunningVO = new MapStationRunningVO(stationRunning); @@ -350,9 +295,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { MpStationRunningExample stationRunningExample = new MpStationRunningExample(); stationRunningExample.createCriteria().andMapIdEqualTo(mapId); List stationRunningList = this.stationRunningDAO.selectByExample(stationRunningExample); - if (CollectionUtils.isEmpty(stationRunningList)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, "站间运行数据不存在！"); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertCollectionNotEmpty(stationRunningList, "站间运行数据不存在！"); Map levelVOMap = runPlanLevelVOList.stream() .collect(Collectors.toMap(RunPlanLevelVO::getStationRunningId, Function.identity())); stationRunningList.forEach(stationRunning -> { @@ -360,7 +303,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { RunPlanLevelExample levelExample = new RunPlanLevelExample(); levelExample.createCriteria().andStationRunningIdEqualTo(stationRunning.getId()).andUserIdEqualTo(userVO.getId()); List levelList = this.runPlanLevelDAO.selectByExample(levelExample); - RunPlanLevelVO levelVO = levelVOMap.get(ConvertUtil.long2Str(stationRunning.getId())); + RunPlanLevelVO levelVO = levelVOMap.get(stationRunning.getId()); levelVO.setUserId(userVO.getId()); if (CollectionUtils.isEmpty(levelList)) { // 新增 RunPlanLevel runPlanLevel = levelVO.convert2DB(); @@ -437,7 +380,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { RunPlanTripVO trip = planVO.getTripList().stream() .filter(tripVO -> tripVO.getSDTNumberNew().equals(SDTNumber)) .findFirst() - .orElseThrow(() -> new DBException(ExceptionMapping.DATA_NOT_EXIST)); + .orElseThrow(() -> BusinessExceptionAssertEnum.DATA_NOT_EXIST.exception()); MapVO mapVO = this.iMapService.getMapDetail(planVO.getMapId()); return mapVO.findRoutingBySection(trip.getStartSectionCode(), trip.getEndSectionCode()); } @@ -571,17 +514,13 @@ public class RunPlanDraftService implements IRunPlanDraftService { @Override @Transactional public void copyRunPlanService(Long planId, String serviceNumber, RunPlanServiceConfigVO serviceConfig, UserVO userVO) { - if (!this.ifServerExists(planId, serviceNumber)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(this.ifServerExists(planId, serviceNumber)); // 数据校验 - if (serviceConfig.getTimes() < 1 || serviceConfig.getIntervals() < 30) { - throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); - } + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(serviceConfig.getTimes() > 0 && serviceConfig.getIntervals() >= 30); RunPlanVO planVO = getRunPlanById(planId); String max = planVO.getTripList().stream().map(RunPlanTripVO::getServiceNumber).max(Comparator.naturalOrder()).orElse(""); // 查询最大服务号 - int maxServiceNumber = ConvertUtil.str2Int(max, 0); + int maxServiceNumber = Integer.parseInt(max); List tripVOList = planVO.getTripList().stream() .filter(tripVO -> tripVO.getServiceNumber().equals(serviceNumber)) .sorted(Comparator.comparing(tripVO -> tripVO.getTimeList().get(0).getArrivalTime())) @@ -653,9 +592,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { @Transactional public void addRunPlanTrip(Long planId, String serviceNumber, RunPlanTripConfigVO tripConfig, UserVO userVO) { RunPlanVO planVO = getRunPlanById(planId); - if (!this.ifServerExists(planVO, serviceNumber)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(this.ifServerExists(planVO, serviceNumber)); this.addTrip(planVO, serviceNumber, tripConfig); } @@ -670,7 +607,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { } return false; }) - .findFirst().orElseThrow(() -> new DBException(ExceptionMapping.DATA_NOT_EXIST)); + .findFirst().orElseThrow(() -> BusinessExceptionAssertEnum.DATA_NOT_EXIST.exception()); runPlanVO.getTripList().remove(del); // 添加车次 // this.updateTrip(runPlanVO, del, tripConfig); @@ -802,7 +739,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { RunPlanVO runPlanVO = getRunPlanById(planId); RunPlanTripVO tripVO = runPlanVO.getTripList().stream() .filter(runPlanTripVO -> runPlanTripVO.getSDTNumberNew().equals(SDTNumber)) - .findFirst().orElseThrow(() -> new DBException(ExceptionMapping.DATA_NOT_EXIST)); + .findFirst().orElseThrow(() -> BusinessExceptionAssertEnum.DATA_NOT_EXIST.exception()); String serviceNumber = tripVO.getServiceNumber(); List serviceList = runPlanVO.getTripList().stream() .filter(runPlanTripVO -> runPlanTripVO.getServiceNumber().equals(serviceNumber)) @@ -1027,16 +964,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { RunPlanVO planVO = getRunPlanById(planId); // 查询运行图数据 MapVO mapVO = this.iMapService.getMapDetail(planVO.getMapId()); - if (mapVO.isDrawWay()) { - return groupSimulationService.runPlanTestSimulation(planVO.getMapId(), planVO, loginUserInfoVO); - } - SimulationConstructData constructData = new SimulationConstructData(loginUserInfoVO.getUserVO(), SimulationType.RunPlan, - null, new MapDataVO(mapVO), null, planVO, null); - String group = SimulationIdGenerator.generateGroup(loginUserInfoVO.getUserVO().getId()); - groupSimulationManager.prepareSimulation(group, constructData); - // 生成通用的测试用派班计划 - this.groupSimulationManager.generateCommonSchedulingPlan(group); - return group; + return groupSimulationService.runPlanTestSimulation(planVO.getMapId(), planVO, loginUserInfoVO); } @Override @@ -1082,9 +1010,7 @@ public class RunPlanDraftService implements IRunPlanDraftService { */ private RunPlanVO getRunPlanById(Long planId) { RunPlanDraft runPlanDraft = this.runPlanDraftDAO.selectByPrimaryKey(planId); - if (Objects.isNull(runPlanDraft)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(runPlanDraft); RunPlanVO runPlanVO = new RunPlanVO(runPlanDraft); if (StringUtils.hasText(runPlanDraft.getTrips())) { runPlanVO.setTripList(JsonUtils.read(runPlanDraft.getTrips(), JsonUtils.getCollectionType(List.class, RunPlanTripVO.class))); @@ -1097,19 +1023,13 @@ public class RunPlanDraftService implements IRunPlanDraftService { private List prepareStationData(MapVO mapVO) { // 获取站台轨 List standTrackList = mapVO.findStandTrackList(); - if (CollectionUtils.isEmpty(standTrackList)) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(standTrackList); // 获取车站 List stationList = mapVO.findSortedAllStationList(); - if (CollectionUtils.isEmpty(stationList)) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(stationList); // 获取站台 List standList = mapVO.findAllStandList(); - if (CollectionUtils.isEmpty(standList)) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(standList); Map standVOMap = standList.stream().collect( Collectors.toMap(MapStationStandVO::getCode, Function.identity())); // 处理车站站台轨数据 @@ -1133,14 +1053,10 @@ public class RunPlanDraftService implements IRunPlanDraftService { // } // 获取车站 List stationList = mapVO.findSortedAllStationListNew(); - if (CollectionUtils.isEmpty(stationList)) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(stationList); // 获取站台 List standList = mapVO.findAllStandListNew(); - if (CollectionUtils.isEmpty(standList)) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(standList); // Map standVOMap = standList.stream().collect( // Collectors.toMap(MapStationStandNewVO::getCode, Function.identity())); // // 处理车站站台轨数据 @@ -1165,8 +1081,6 @@ public class RunPlanDraftService implements IRunPlanDraftService { criteria.andMapIdEqualTo(mapId) .andNameEqualTo(name) .andCreatorIdEqualTo(userVO.getId()); - if (runPlanDraftDAO.countByExample(draftExample) > 0) { - throw new DBException(ExceptionMapping.NAME_REPEAT); - } + BusinessExceptionAssertEnum.DATA_UNIQUE_PROPERTY_REPEAT.assertTrue(runPlanDraftDAO.countByExample(draftExample) == 0); } } diff --git a/src/main/java/club/joylink/rtss/services/RunPlanTemplateService.java b/src/main/java/club/joylink/rtss/services/RunPlanTemplateService.java index a9335e414..2e648e88b 100644 --- a/src/main/java/club/joylink/rtss/services/RunPlanTemplateService.java +++ b/src/main/java/club/joylink/rtss/services/RunPlanTemplateService.java @@ -2,9 +2,6 @@ package club.joylink.rtss.services; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; import club.joylink.rtss.constants.MapStatus; import club.joylink.rtss.dao.RunPlanLoadDAO; import club.joylink.rtss.dao.RunPlanTemplateDAO; @@ -56,9 +53,6 @@ public class RunPlanTemplateService implements IRunPlanTemplateService { @Autowired private ILoadPlanService iLoadPlanService; - @Autowired - private ISchedulingPlanService iSchedulingPlanService; - /** * 运行图草稿发布 * @@ -111,10 +105,6 @@ public class RunPlanTemplateService implements IRunPlanTemplateService { @Override @Transactional public void deletePlan(Long planId, UserVO userVO) { - // 判断权限，只有超级管理员才可以删除 - if (!iSysUserService.isAdmin(userVO)) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } // RunPlanLoadExample runPlanLoadExample = new RunPlanLoadExample(); // runPlanLoadExample.createCriteria().andTemplatePlanIdEqualTo(planId); // List runPlanLoadList = runPlanLoadDAO.selectByExample(runPlanLoadExample); diff --git a/src/main/java/club/joylink/rtss/services/SchedulingPlanService.java b/src/main/java/club/joylink/rtss/services/SchedulingPlanService.java deleted file mode 100644 index 69101e897..000000000 --- a/src/main/java/club/joylink/rtss/services/SchedulingPlanService.java +++ /dev/null @@ -1,266 +0,0 @@ -package club.joylink.rtss.services; - -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; -import club.joylink.rtss.dao.SchedulingPlanDAO; -import club.joylink.rtss.entity.SchedulingPlan; -import club.joylink.rtss.entity.SchedulingPlanExample; -import club.joylink.rtss.simulation.GroupSimulationManager; -import club.joylink.rtss.simulation.Simulation; -import club.joylink.rtss.simulation.SimulationConstructData; -import club.joylink.rtss.simulation.constant.SimulationType; -import club.joylink.rtss.simulation.scheduling.SchedulingPlanBO; -import club.joylink.rtss.simulation.util.SimulationIdGenerator; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.map.MapDataVO; -import club.joylink.rtss.vo.client.map.MapVO; -import club.joylink.rtss.vo.client.runplan.RunPlanVO; -import club.joylink.rtss.vo.client.scheduling.SchedulingCheckResult; -import club.joylink.rtss.vo.client.scheduling.SchedulingPlanVO; -import club.joylink.rtss.vo.client.scheduling.SchedulingTrainEditVO; -import club.joylink.rtss.vo.client.scheduling.TrainBaseInfoVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; - -@Service -@Slf4j -public class SchedulingPlanService implements ISchedulingPlanService { - - @Autowired - private ISimulationService iSimulationService; - - @Autowired - private GroupSimulationManager groupSimulationManager; - - @Autowired - private IDailyRunPlanService iDailyRunPlanService; - - @Autowired - private SchedulingPlanDAO schedulingPlanDAO; - - @Autowired - private IMapService iMapService; - - @Override - public String schedulingPlanSimulation(Long mapId, String prdType, UserVO user) { - return this.iSimulationService.schedulingPlanSimulation(mapId, prdType, user); - } - - @Override - public SchedulingPlanVO findSchedulingPlan(String group, LocalDate day, UserVO user) { - SchedulingPlanVO planVO = this.groupSimulationManager.findSchedulingPlanVO(group); - if(Objects.nonNull(planVO) && planVO.getPlanDate().equals(day)) { - return planVO; - } else { - Simulation simulation = this.groupSimulationManager.getSchedulingSimulationByGroup(group); - Long mapId = simulation.getMapId(); - SchedulingPlan userPlan = this.findUserPlan(mapId, day, user.getId()); - if(Objects.nonNull(userPlan)) { - Long runPlanId = userPlan.getRunPlanId(); - RunPlanVO runPlanVO = this.iDailyRunPlanService.findRunPlanById(runPlanId); - if(Objects.isNull(runPlanVO)) { - log.error(String.format("id[%s]的每日运行图不存在", runPlanId)); - throw new BusinessException(ExceptionMapping.DATA_EXCEPTION, "派班计划的基础运行图不存在"); - } - this.groupSimulationManager.updateRunDiagram(group, runPlanVO); - this.groupSimulationManager.updateSchedulingPlan(group, new SchedulingPlanBO(userPlan)); - SchedulingPlanVO schedulingPlanVO = this.groupSimulationManager.findSchedulingPlanVO(group); - return schedulingPlanVO; - } - } - return null; - } - - @Override - public SchedulingPlan findUserPlan(Long mapId, LocalDate date, Long userId) { - Objects.requireNonNull(mapId); - Objects.requireNonNull(date); - Objects.requireNonNull(userId); - SchedulingPlanExample example = new SchedulingPlanExample(); - example.createCriteria() - .andMapIdEqualTo(mapId) - .andPlanDateEqualTo(date) - .andUserIdEqualTo(userId); - List schedulingPlanList = this.schedulingPlanDAO.selectByExampleWithBLOBs(example); - if(!CollectionUtils.isEmpty(schedulingPlanList)) { - return schedulingPlanList.get(0); - } - return null; - } - - @Override - public SchedulingPlan getUserPlan(Long mapId, LocalDate date, Long userId) { - SchedulingPlan userPlan = this.findUserPlan(mapId, date, userId); - if(Objects.isNull(userPlan)) { - log.error(String.format("地图id[%s],日期[%s],用户[%s]的派班计划不存在", mapId, date, userId)); - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, "派班计划不存在"); - } - return userPlan; - } - - @Override - public SchedulingPlan findCommonPlan(Long mapId) { - Objects.requireNonNull(mapId); - SchedulingPlanExample example = new SchedulingPlanExample(); - example.createCriteria() - .andMapIdEqualTo(mapId) - .andPlanDateIsNull() - .andRunPlanIdIsNull() - .andUserIdIsNull(); - List schedulingPlanList = this.schedulingPlanDAO.selectByExampleWithBLOBs(example); - if(!CollectionUtils.isEmpty(schedulingPlanList)) { - return schedulingPlanList.get(0); - } - return null; - } - - @Override - public SchedulingPlan getCommonPlan(Long mapId) { - SchedulingPlan commonPlan = this.findCommonPlan(mapId); - if(Objects.isNull(commonPlan)) { - log.error(String.format("地图id[%s]的派班计划不存在", mapId)); - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, "派班计划不存在"); - } - return commonPlan; - } - - @Override - public SchedulingPlanBO getSchedulingPlan(Long mapId, Long userId) { - SchedulingPlan plan = this.findUserPlan(mapId, LocalDate.now(), userId); - if(Objects.isNull(plan)) { - plan = this.findCommonPlan(mapId); - } - if(Objects.nonNull(plan)) { - return new SchedulingPlanBO(plan); - } - return null; - } - - @Override - public SchedulingPlanVO generateBaseSchedulingPlanOfDay(String group, LocalDate day, UserVO user) { - Simulation simulation = this.groupSimulationManager.getSchedulingSimulationByGroup(group); - Long mapId = simulation.getMapId(); - RunPlanVO userRunPlan = this.iDailyRunPlanService.findUserRunPlan(user.getId(), mapId, day); - if(Objects.isNull(userRunPlan)) { // 如果不存在，根据加载计划创建 - userRunPlan = this.iDailyRunPlanService.createUserRunPlanFromLoadPlan(user.getId(), mapId, day); - } - // 更新仿真运行图 - this.groupSimulationManager.updateRunDiagram(group, userRunPlan); - return this.groupSimulationManager.generateBaseSchedulingPlan(group); - } - - @Override - public List getAllTrains(String group) { - return this.groupSimulationManager.getAllTrains(group); - } - - @Override - public SchedulingCheckResult checkConflict(String group, List editVOList) { - this.groupSimulationManager.updateSchedulingTrainPlan(group, editVOList); - return this.groupSimulationManager.checkConflict(group); - } - - @Override - public void saveSchedulingPlan(String group, List editVOList) { - this.groupSimulationManager.updateSchedulingTrainPlan(group, editVOList); - SchedulingCheckResult result = this.checkConflict(group, editVOList); - if(result.isPass()) { - SchedulingPlanBO planBO = this.groupSimulationManager.getSchedulingPlanData(group); - SchedulingPlan plan = planBO.convert2DB(); - if(Objects.nonNull(plan.getId())) { - SchedulingPlan schedulingPlan = this.schedulingPlanDAO.selectByPrimaryKey(plan.getId()); - schedulingPlan.setPlansJson(plan.getPlansJson()); - this.schedulingPlanDAO.updateByPrimaryKeyWithBLOBs(schedulingPlan); - } else { - plan.setCreateTime(LocalDateTime.now()); - this.schedulingPlanDAO.insert(plan); - } - } else { - throw new BusinessException(ExceptionMapping.DATA_EXCEPTION, "派班数据冲突"); - } - } - - @Override - public SchedulingPlanVO deleteAndRebuildSchedulingPlan(String group, LocalDate day, UserVO user) { - Simulation simulation = this.groupSimulationManager.getSchedulingSimulationByGroup(group); - SchedulingPlan userPlan = this.findUserPlan(simulation.getMapId(), day, user.getId()); - if(Objects.nonNull(userPlan)) { - this.schedulingPlanDAO.deleteByPrimaryKey(userPlan.getId()); - } - return this.generateBaseSchedulingPlanOfDay(group, day, user); - } - - @Override - @Transactional - public void generateMapCommonSchedulingPlan(Long mapId, UserVO user) { - MapVO mapVO = this.iMapService.getMapDetail(mapId); - RunPlanVO commonRunPlan = this.iDailyRunPlanService.findCommonRunPlan(mapId, LocalDate.now()); - if(Objects.isNull(commonRunPlan)) { - log.warn(String.format("地图[%s]通用运行图不存在，无法生成通用派班计划", mapId)); - return; - } - RunPlanVO runPlan = this.iDailyRunPlanService.getRunPlan(mapId); - this.generateMapCommonSchedulingPlan(mapVO, runPlan, user); - } - - @Override - public void generateMapCommonSchedulingPlan(MapVO mapVO, RunPlanVO commonDailyRunPlan, UserVO user) { - Objects.requireNonNull(mapVO); - Objects.requireNonNull(commonDailyRunPlan); - SimulationConstructData simulationConstructData = new SimulationConstructData( - user, SimulationType.Simulation, mapVO.getId(), new MapDataVO(mapVO), - null, commonDailyRunPlan, null); - String group = SimulationIdGenerator.generateGroup(0L); - this.groupSimulationManager.prepareSimulation(group, simulationConstructData); - - SchedulingPlanBO schedulingPlanBO = this.groupSimulationManager.generateCommonSchedulingPlan(group); - // 删除旧的数据 - SchedulingPlanExample example = new SchedulingPlanExample(); - example.createCriteria() - .andMapIdEqualTo(mapVO.getId()) - .andPlanDateIsNull() - .andUserIdIsNull() - .andRunPlanIdIsNull(); - this.schedulingPlanDAO.deleteByExample(example); - // 保存新的数据 - SchedulingPlan plan = schedulingPlanBO.convert2DB(); - plan.setPlanDate(null); - plan.setRunPlanId(null); - plan.setUserId(null); - plan.setCreateTime(LocalDateTime.now()); - this.schedulingPlanDAO.insert(plan); - } - - @Override - @Transactional - public void generateCommonSchedulingPlan(UserVO user) { - List mapVOList = this.iMapService.queryOnlineMapInfos(); - if(!CollectionUtils.isEmpty(mapVOList)) { - for (MapVO map : mapVOList) { - this.generateMapCommonSchedulingPlan(map.getId(), user); - } - } - - } - - @Override - public void copyCommonSchedulingPlan(Long sourceMapId, Long targetMapId) { - SchedulingPlan commonPlan = this.findCommonPlan(sourceMapId); - if(Objects.nonNull(commonPlan)) { - SchedulingPlan newPlan = new SchedulingPlan(); - newPlan.setMapId(targetMapId); - newPlan.setPlansJson(commonPlan.getPlansJson()); - newPlan.setCreateTime(LocalDateTime.now()); - this.schedulingPlanDAO.insert(newPlan); - } - } -} diff --git a/src/main/java/club/joylink/rtss/services/SimulationRecordService.java b/src/main/java/club/joylink/rtss/services/SimulationRecordService.java deleted file mode 100644 index f7fbf69b2..000000000 --- a/src/main/java/club/joylink/rtss/services/SimulationRecordService.java +++ /dev/null @@ -1,321 +0,0 @@ -package club.joylink.rtss.services; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; -import club.joylink.rtss.constants.BusinessConsts; -import club.joylink.rtss.dao.*; -import club.joylink.rtss.dao.SimulationRunAsPlanMapper; -import club.joylink.rtss.data.SimulationRecordPlayer; -import club.joylink.rtss.entity.*; -import club.joylink.rtss.simulation.GroupSimulationManager; -import club.joylink.rtss.simulation.Simulation; -import club.joylink.rtss.simulation.UserPlayBackManager; -import club.joylink.rtss.simulation.record.SimulationFrameData; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.time.LocalDateTime; -import java.util.*; - -@Service -public class SimulationRecordService implements ISimulationRecordService { - - @Autowired - private SimulationRecordDAO simulationRecordDAO; - - @Autowired - private SimulationRunAsPlanMapper simulationRunAsPlanMapper; - - @Autowired - private SimulationConversationMapper simulationConversationMapper; - - @Autowired - private SimulationConversationMemberMapper simulationConversationMemberMapper; - - @Autowired - private SimulationConversationMessageMapper simulationConversationMessageMapper; - - @Autowired - private SimulationFrameMapper simulationFrameMapper; - - @Autowired - private GroupSimulationManager groupSimulationManager; - - @Autowired - private UserPlayBackManager userPlayBackManager; - - @Autowired - private ISysUserService iSysUserService; - - @Autowired - private ObjectMapper objectMapper; - - @Autowired - private IMapService iMapService; - - /** - * 保存仿真记录 - * - * @param group - * @return - */ - @Override - public Long saveRecord(String group) { - Simulation simulationData = groupSimulationManager.getSimulationByGroup(group); - SimulationRecord simulationRecord = new SimulationRecord(); - simulationRecord.setMapId(simulationData.getMapId()); - simulationRecord.setMapName(iMapService.getMapInfoById(simulationRecord.getMapId()).getName()); - simulationRecord.setCreatorId(simulationData.getUserVO().getId()); - simulationRecord.setCreateTime(LocalDateTime.now()); - simulationRecord.setStatus(BusinessConsts.STATUS_USE); - simulationRecordDAO.insert(simulationRecord); - return simulationRecord.getId(); - } - - /** - * 仿真结束更新记录 - * - * @param recordId - */ - @Override - public void updateRecord(Long recordId) { - SimulationRecord simulationRecord = simulationRecordDAO.selectByPrimaryKey(recordId); - simulationRecord.setDestroyTime(LocalDateTime.now()); - simulationRecordDAO.updateByPrimaryKey(simulationRecord); - } - - /** - * 保存按计划行车记录 - * @param recordId - * @param runPlanDailyId - * @param systemTime - */ - @Override - public void saveRunAsPlanRecord(Long recordId, Long runPlanDailyId, LocalDateTime systemTime) { - SimulationRunAsPlan simulationRunAsPlan = new SimulationRunAsPlan(); - simulationRunAsPlan.setRecordId(recordId); - simulationRunAsPlan.setStartTime(LocalDateTime.now()); - simulationRunAsPlan.setRunPlanDailyId(runPlanDailyId); - simulationRunAsPlan.setSystemTime(systemTime); - simulationRunAsPlanMapper.insert(simulationRunAsPlan); - } - - /** - * 退出按计划行车更新记录 - * - * @param recordId - */ - @Override - public void updateRunAsPlanRecord(Long recordId) { - SimulationRunAsPlanExample runAsPlanExample = new SimulationRunAsPlanExample(); - runAsPlanExample.createCriteria().andRecordIdEqualTo(recordId).andEndTimeIsNull(); - List simulationRunAsPlans = simulationRunAsPlanMapper.selectByExample(runAsPlanExample); - if (!CollectionUtils.isEmpty(simulationRunAsPlans)) { - SimulationRunAsPlan simulationRunAsPlan = simulationRunAsPlans.get(0); - simulationRunAsPlan.setEndTime(LocalDateTime.now()); - simulationRunAsPlanMapper.updateByPrimaryKey(simulationRunAsPlan); - } - } - - @Override - @Transactional - public void saveConversation(Long recordId, Map conversationMap) { - Map map = new HashMap<>(); - // 保存会话 - conversationMap.values().stream().sorted(Comparator.comparing(ConversationVO::isGroup)).forEach(conversationVO -> { - // 过滤没有消息的会话 - if(!CollectionUtils.isEmpty(conversationVO.getMessageList())) { - SimulationConversation conversation = new SimulationConversation(); - conversation.setCreatorId(conversationVO.getCreatorIdLong()); - conversation.setRecordId(recordId); - conversation.setIsGroup(conversationVO.isGroup()); - this.simulationConversationMapper.insertSelective(conversation); - // 保存会话成员 - if(!CollectionUtils.isEmpty(conversationVO.getMemberList())) { - conversationVO.getMemberList().forEach(simulationMemberVO -> { - SimulationConversationMember conversationMember = simulationMemberVO.convert2DB(); - conversationMember.setConversationId(conversation.getId()); - this.simulationConversationMemberMapper.insert(conversationMember); - map.put(simulationMemberVO, conversationMember.getId()); - }); - } - // 保存消息 - conversationVO.getMessageList().stream().sorted(Comparator.comparing(ConversationMessageVO::getChatTime)).forEach(messageVO -> { - SimulationConversationMessage conversationMessage = messageVO.convert2DB(); - conversationMessage.setConversationId(conversation.getId()); - if(Objects.isNull(map.get(messageVO.getMember()))) { - SimulationConversationMember conversationMember = messageVO.getMember().convert2DB(); - conversationMember.setConversationId(conversation.getId()); - this.simulationConversationMemberMapper.insert(conversationMember); - map.put(messageVO.getMember(), conversationMember.getId()); - } - if(Objects.nonNull(messageVO.getTargetMember())) { - if(Objects.isNull(map.get(messageVO.getTargetMember()))) { - SimulationConversationMember conversationMember = messageVO.getTargetMember().convert2DB(); - conversationMember.setConversationId(conversation.getId()); - this.simulationConversationMemberMapper.insert(conversationMember); - map.put(messageVO.getTargetMember(), conversationMember.getId()); - } - conversationMessage.setTargetMemberId(map.get(messageVO.getTargetMember())); - } - conversationMessage.setMemberId(map.get(messageVO.getMember())); - this.simulationConversationMessageMapper.insert(conversationMessage); - }); - } - }); - } - - @Override - public void saveFrame(Long recordId, List simulationFrameDataList) { - if(CollectionUtils.isEmpty(simulationFrameDataList)) { - return; - } - List frameList = new ArrayList<>(); - simulationFrameDataList.forEach(simulationFrameData -> { - SimulationFrame simulationFrame = new SimulationFrame(); - simulationFrame.setRecordId(recordId); - try { - simulationFrame.setData(objectMapper.writeValueAsString(simulationFrameData.getStatusList())); - }catch(JsonProcessingException e) { - e.printStackTrace(); - } - simulationFrame.setTime(simulationFrameData.getTime()); - frameList.add(simulationFrame); - }); - this.simulationFrameMapper.batchInsert(frameList); - } - - @Override - public PageVO queryPagedRecord(PageQueryVO queryVO) { - PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize()); - SimulationRecordExample recordExample = new SimulationRecordExample(); - recordExample.setOrderByClause(" create_time desc, destroy_time desc "); - recordExample.createCriteria().andDestroyTimeIsNotNull(); - Page page = (Page)this.simulationRecordDAO.selectByExample(recordExample); - List voList = SimulationRecordVO.convert2VOList(page.getResult()); - return PageVO.convert(page, voList); - } - - @Override - public void playBack(Long id, UserVO userVO) { - SimulationRecord simulationRecord = this.simulationRecordDAO.selectByPrimaryKey(id); - if(Objects.isNull(simulationRecord)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - // 查询按计划行车记录 - SimulationRunAsPlanExample runAsPlanExample = new SimulationRunAsPlanExample(); - runAsPlanExample.createCriteria().andRecordIdEqualTo(id); - List runAsPlanList = this.simulationRunAsPlanMapper.selectByExample(runAsPlanExample); - List messageVOList = new ArrayList<>(); - // 查询群聊会话 - SimulationConversationExample conversationExample = new SimulationConversationExample(); - conversationExample.createCriteria().andRecordIdEqualTo(id).andIsGroupEqualTo(true); - List conversationList = this.simulationConversationMapper.selectByExample(conversationExample); - if(!CollectionUtils.isEmpty(conversationList)) { - conversationList.forEach(conversation -> { - // 查询会话消息 - SimulationConversationMessageExample conversationMessageExample = new SimulationConversationMessageExample(); - conversationMessageExample.createCriteria().andConversationIdEqualTo(conversation.getId()); - List conversationMessageList = this.simulationConversationMessageMapper.selectByExample(conversationMessageExample); - if(!CollectionUtils.isEmpty(conversationMessageList)) { - conversationMessageList.forEach(conversationMessage -> { - ConversationMessageVO messageVO = new ConversationMessageVO(conversationMessage); - messageVO.setGroup(conversation.getIsGroup()); - SimulationConversationMember member = this.simulationConversationMemberMapper.selectByPrimaryKey(conversationMessage.getMemberId()); - messageVO.setMember(new SimulationMemberVO(member)); - if(Objects.nonNull(conversationMessage.getTargetMemberId())) { - SimulationConversationMember targetMember = this.simulationConversationMemberMapper.selectByPrimaryKey(conversationMessage.getTargetMemberId()); - messageVO.setTargetMember(new SimulationMemberVO(targetMember)); - } - messageVOList.add(messageVO); - }); - } - }); - } - // 查询帧 - SimulationFrameExample frameExample = new SimulationFrameExample(); - frameExample.createCriteria().andRecordIdEqualTo(id); - List frameList = this.simulationFrameMapper.selectByExampleWithBLOBs(frameExample); - // 添加播放器 - SimulationRecordPlayer player = new SimulationRecordPlayer(); - SimulationRecordPlayer.SimulationPlayBackData playBackData = player.new SimulationPlayBackData(simulationRecord, - messageVOList, frameList, runAsPlanList); - player.readingDisc(playBackData); - this.userPlayBackManager.addPlayer(userVO, player); - } - - @Override - public void setPlaySpeed(Long id, float playSpeed, UserVO userVO) { - if(playSpeed < 0.01 || playSpeed > 16) { - throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); - } - this.userPlayBackManager.getPlayerByUser(userVO).setPlaySpeed(playSpeed); - } - - @Override - public void pause(Long id, UserVO userVO) { - this.userPlayBackManager.getPlayerByUser(userVO).pause(); - } - - @Override - public void play(Long id, UserVO userVO) { - this.userPlayBackManager.getPlayerByUser(userVO).play(); - } - - @Override - public void setPlayTime(Long id, Long offsetSeconds, UserVO userVO) { - this.userPlayBackManager.getPlayerByUser(userVO).setOffset(offsetSeconds); - } - - @Override - public void over(Long id, UserVO userVO) { - this.userPlayBackManager.removePlayer(userVO); - } - - @Override - @Transactional - public void delete(Long id, UserVO userVO) { - SimulationRecord simulationRecord = this.simulationRecordDAO.selectByPrimaryKey(id); - if(Objects.isNull(simulationRecord)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if(!this.iSysUserService.isAdmin(userVO)) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } - // 删除数据帧 - SimulationFrameExample frameExample = new SimulationFrameExample(); - frameExample.createCriteria().andRecordIdEqualTo(id); - this.simulationFrameMapper.deleteByExample(frameExample); - // 查询会话 - SimulationConversationExample conversationExample = new SimulationConversationExample(); - conversationExample.createCriteria().andRecordIdEqualTo(id); - List conversationList = this.simulationConversationMapper.selectByExample(conversationExample); - conversationList.forEach(conversation -> { - // 删除会话消息 - SimulationConversationMessageExample conversationMessageExample = new SimulationConversationMessageExample(); - conversationMessageExample.createCriteria().andConversationIdEqualTo(conversation.getId()); - this.simulationConversationMessageMapper.deleteByExample(conversationMessageExample); - // 删除会话成员 - SimulationConversationMemberExample conversationMemberExample = new SimulationConversationMemberExample(); - conversationMemberExample.createCriteria().andConversationIdEqualTo(conversation.getId()); - this.simulationConversationMemberMapper.deleteByExample(conversationMemberExample); - }); - // 删除会话 - this.simulationConversationMapper.deleteByExample(conversationExample); - // 删除按计划行车记录 - SimulationRunAsPlanExample runAsPlanExample = new SimulationRunAsPlanExample(); - runAsPlanExample.createCriteria().andRecordIdEqualTo(id); - this.simulationRunAsPlanMapper.deleteByExample(runAsPlanExample); - // 删除记录 - this.simulationRecordDAO.deleteByPrimaryKey(id); - } -} diff --git a/src/main/java/club/joylink/rtss/services/TaskService.java b/src/main/java/club/joylink/rtss/services/TaskService.java deleted file mode 100644 index 7355f8483..000000000 --- a/src/main/java/club/joylink/rtss/services/TaskService.java +++ /dev/null @@ -1,97 +0,0 @@ -package club.joylink.rtss.services; - -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; -import club.joylink.rtss.constants.BusinessConsts; -import club.joylink.rtss.dao.MapInfoDAO; -import club.joylink.rtss.dao.TaskMapper; -import club.joylink.rtss.entity.MapInfo; -import club.joylink.rtss.entity.Task; -import club.joylink.rtss.entity.TaskExample; -import club.joylink.rtss.tasks.TaskExecute; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.TaskListVO; -import club.joylink.rtss.vo.client.TaskQueryVO; -import club.joylink.rtss.vo.client.TaskVO; -import org.springframework.util.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.ObjectUtils; - -import java.util.Date; -import java.util.List; -import java.util.Objects; - -@Service -public class TaskService implements ITaskService { - - @Autowired - private TaskMapper taskMapper; - - @Autowired - private MapInfoDAO mapInfoDAO; - - @Autowired - private TaskExecute taskExecute; - - @Override - public PageVO queryPagedTask(TaskQueryVO queryVO) { - MapInfo mapInfo = null; - if (!ObjectUtils.isEmpty(queryVO.getMapId())){ - mapInfo = mapInfoDAO.selectByPrimaryKey(queryVO.getMapId()); - } - PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize()); - TaskExample example = new TaskExample(); - TaskExample.Criteria criteria = example.createCriteria(); - if(StringUtils.hasText(queryVO.getStatus())) { - criteria.andStatusEqualTo(queryVO.getStatus()); - } - if (!ObjectUtils.isEmpty(mapInfo)){ - criteria.andParameterEqualTo(String.valueOf(mapInfo.getId())); - } - Page page = (Page)this.taskMapper.selectByExample(example); - return PageVO.convert(page, TaskListVO.convert2VOList(page.getResult())); - } - - @Override - public void createTask(TaskVO taskVO, UserVO userVO) { - TaskExample example = new TaskExample(); - example.createCriteria().andTypeEqualTo(taskVO.getType()).andParameterEqualTo(taskVO.getParameter()); - List tasks = this.taskMapper.selectByExample(example); - if(!CollectionUtils.isEmpty(tasks)) { - throw new BusinessException(ExceptionMapping.TASK_ALREADY_EXIST); - } - Task task = taskVO.convert2DB(); - task.setCreatorId(userVO.getId()); - task.setCreateTime(new Date()); - task.setStatus(BusinessConsts.Task.Status.Status04); - this.taskMapper.insert(task); - } - - @Override - public void execute(Long id) { - Task task = taskMapper.selectByPrimaryKey(id); - if(Objects.isNull(task)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - this.taskExecute.executeTask(task); - } - - @Override - public void cancel(Long id) { - Task task = taskMapper.selectByPrimaryKey(id); - if(Objects.isNull(task)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if(BusinessConsts.Task.Status.Status02.equals(task.getStatus())) { - throw new BusinessException(ExceptionMapping.TASK_RUNNING); - } - task.setStatus(BusinessConsts.Task.Status.Status05); - this.taskMapper.updateByPrimaryKey(task); - } -} diff --git a/src/main/java/club/joylink/rtss/services/UserExamService.java b/src/main/java/club/joylink/rtss/services/UserExamService.java index 6e0742373..a9b8e9db2 100644 --- a/src/main/java/club/joylink/rtss/services/UserExamService.java +++ b/src/main/java/club/joylink/rtss/services/UserExamService.java @@ -1,24 +1,22 @@ package club.joylink.rtss.services; -import club.joylink.rtss.services.training.ITrainingV1Service; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.dao.*; import club.joylink.rtss.entity.*; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.services.training.ITrainingV1Service; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.*; import club.joylink.rtss.vo.client.training.TrainingResultVO; import club.joylink.rtss.vo.client.userPermission.UserPermissionVO; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.time.Duration; import java.time.LocalDateTime; @@ -62,9 +60,7 @@ public class UserExamService implements IUserExamService { List userExamQuestionsVOs = new ArrayList<>(); // 查询考试定义信息 ExamDefinition examDef = this.examDefinitionDAO.selectByPrimaryKey(examId); - if (examDef == null) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(examDef); // 判断是否有权限 if (!examDef.getTrial()) { Calendar calendar = Calendar.getInstance(); @@ -72,16 +68,12 @@ public class UserExamService implements IUserExamService { calendar.add(Calendar.SECOND, examDef.getDuration()); LsLesson lesson = this.lessonDAO.selectByPrimaryKey(examDef.getLessonId()); List examPermission = iUserPermissionService.getExamUserPermission(userVO, lesson.getMapId(), lesson.getPrdType(), lesson.getId()); - if (CollectionUtils.isEmpty(examPermission)) { - throw new BusinessException(ExceptionMapping.PERMISSION_REMAINS_NOT_ENOUGH); - } + BusinessExceptionAssertEnum.SIMULATION_PERMISSION_NOT_AVAILABLE.assertCollectionNotEmpty(examPermission); } // 判断是否在考试时间之内 if (examDef.getStartTime() != null) { LocalDateTime now = LocalDateTime.now(); - if (now.isBefore(examDef.getStartTime()) || now.isAfter(examDef.getEndTime())) { - throw new BusinessException(ExceptionMapping.PERMISSION_DISTRIBUTE_EXPIRE); - } + BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(now.isAfter(examDef.getStartTime())&&now.isBefore(examDef.getEndTime())); } // 保存用户考试信息 UserExam userExam = new UserExam(); @@ -96,28 +88,22 @@ public class UserExamService implements IUserExamService { ExamDefinitionRulesExample ruleExample = new ExamDefinitionRulesExample(); ruleExample.createCriteria().andExamIdEqualTo(examId); List rules = this.examDefinitionRulesDAO.selectByExample(ruleExample); - if (rules == null || rules.isEmpty()) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(rules); for (ExamDefinitionRules rule : rules) { // 根据课程所属产品的编码和规则中实训类型查找实训 LsLesson lesson = this.lessonDAO.selectByPrimaryKey(examDef.getLessonId()); - if (lesson == null) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(lesson); TrainingExample te = new TrainingExample(); TrainingExample.Criteria criteria = te.createCriteria() .andMapIdEqualTo(lesson.getMapId()) .andPrdTypeEqualTo(lesson.getPrdType()) .andTypeEqualTo(rule.getTrainingType()); - if (!StringUtils.isBlank(rule.getOperateType())) { + if (StringUtils.hasText(rule.getOperateType())) { criteria.andOperateTypeEqualTo(rule.getOperateType()); } // 符合生成规则的实训 List trainings = this.trainingDAO.selectByExample(te); - if (CollectionUtils.isEmpty(trainings) || rule.getNum() > trainings.size()) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(trainings.size() > rule.getNum()); // 随机生成考试并保存 boolean flag = true; List questionsVOs = new ArrayList<>(); @@ -153,22 +139,14 @@ public class UserExamService implements IUserExamService { @Override public UserExamVO getExamInstance(long id, UserVO userVO) { UserExam userExam = this.userExamMapper.selectByPrimaryKey(id); - if (userExam == null) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } - if (!userExam.getUserId().equals(userVO.getId())) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } - if (!userExam.getResult().equals(BusinessConsts.Exam.Result.Result01)) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertNotNull(userExam); + BusinessExceptionAssertEnum.INVALID_OPERATION.assertTrue(userExam.getUserId().equals(userVO.getId())); + BusinessExceptionAssertEnum.INVALID_OPERATION.assertTrue(userExam.getResult().equals(BusinessConsts.Exam.Result.Result01)); // 查询用户考试题目 UserExamQuestionsExample example = new UserExamQuestionsExample(); example.createCriteria().andUserExamIdEqualTo(id); List questionList = this.userExamQuestionsMapper.selectByExample(example); - if (questionList == null || questionList.isEmpty()) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(questionList); // 生成返回对象 List questionVOList = new ArrayList<>(); for (UserExamQuestions question : questionList) { @@ -190,9 +168,7 @@ public class UserExamService implements IUserExamService { TrainingResultVO result; // 获取用户考试题目信息 UserExamQuestions question = this.userExamQuestionsMapper.selectByPrimaryKey(questionsVO.getId()); - if (question == null) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(question); // 更新用户考试题目信息 result = this.iTrainingService.judgeAndCalculate(question.getTrainingId(), questionsVO.getGroup(), BusinessConsts.Training.Mode.Mode05, questionsVO.getUsedTime(), question.getPoint(), true); @@ -207,20 +183,14 @@ public class UserExamService implements IUserExamService { public UserExamVO submit(long id, UserVO userVO) { // 获取用户考试信息 UserExam userExam = this.userExamMapper.selectByPrimaryKey(id); - if (userExam == null) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(userExam); ExamDefinition examDefinition = this.examDefinitionDAO.selectByPrimaryKey(userExam.getExamId()); - if (examDefinition == null) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(examDefinition); // 获取用户考试题目信息 UserExamQuestionsExample questionsExample = new UserExamQuestionsExample(); questionsExample.createCriteria().andUserExamIdEqualTo(userExam.getId()); List questionList = this.userExamQuestionsMapper.selectByExample(questionsExample); - if (questionList == null) { - throw new DBException(ExceptionMapping.DATA_EXCEPTION); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(questionList); // 判断是否已经计算 if (userExam.getResult().equals(BusinessConsts.Exam.Result.Result01)) { // 总分 @@ -255,12 +225,8 @@ public class UserExamService implements IUserExamService { public void abandon(long id, UserVO user) { // 获取用户考试信息 UserExam userExam = this.userExamMapper.selectByPrimaryKey(id); - if (userExam == null) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if (!userExam.getUserId().equals(user.getId())) { - throw new DBException(ExceptionMapping.ILLEGAL_OPERATION); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(userExam); + BusinessExceptionAssertEnum.INVALID_OPERATION.assertTrue(userExam.getUserId().equals(user.getId())); // 结果 userExam.setResult(BusinessConsts.Exam.Result.Result04); // 时间 @@ -335,12 +301,7 @@ public class UserExamService implements IUserExamService { @Override public void updateUserExam(Long id, UserExamVO userExamVO, UserVO userVO) { UserExam userExam = this.userExamMapper.selectByPrimaryKey(id); - if (null == userExam) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if (!iSysUserService.isAdmin(userVO)) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(userExam); userExam.setResult(userExamVO.getResult()); userExam.setScore(userExamVO.getScore()); if (null == userExam.getUsedTime()) { @@ -352,12 +313,6 @@ public class UserExamService implements IUserExamService { @Override @Transactional public void deleteUserExam(Long id, UserVO userVO) { - if (null == this.userExamMapper.selectByPrimaryKey(id)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST); - } - if (!iSysUserService.isAdmin(userVO)) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION); - } UserExamQuestionsExample questionsExample = new UserExamQuestionsExample(); questionsExample.createCriteria().andUserExamIdEqualTo(id); this.userExamQuestionsMapper.deleteByExample(questionsExample); diff --git a/src/main/java/club/joylink/rtss/services/UserPermissionService.java b/src/main/java/club/joylink/rtss/services/UserPermissionService.java index 2083b152f..8a5738581 100644 --- a/src/main/java/club/joylink/rtss/services/UserPermissionService.java +++ b/src/main/java/club/joylink/rtss/services/UserPermissionService.java @@ -1,10 +1,5 @@ package club.joylink.rtss.services; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.DBException; -import com.joylink.base.exception.constant.ExceptionMapping; import club.joylink.rtss.constants.MapPrdTypeEnum; import club.joylink.rtss.constants.PermissionTypeEnum; import club.joylink.rtss.constants.StatusEnum; @@ -16,6 +11,7 @@ import club.joylink.rtss.dao.UserPermissionProcessingDAO; import club.joylink.rtss.entity.PermissionDistribute; import club.joylink.rtss.entity.UserPermission; import club.joylink.rtss.entity.UserPermissionExample; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.permission.DistributeSelectVO; @@ -24,6 +20,8 @@ import club.joylink.rtss.vo.client.permission.PermissionVO; import club.joylink.rtss.vo.client.permissionDistribute.DistributeVO; import club.joylink.rtss.vo.client.userPermission.UserPermissionVO; import club.joylink.rtss.vo.user.PermissionGenerateConfigVO; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -98,9 +96,8 @@ public class UserPermissionService implements IUserPermissionService { private UserPermission getEntityById(Long id) { UserPermission userPermission = userPermissionDAO.selectByPrimaryKey(id); - if (userPermission == null) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, String.format("id为[%s]的用户权限不存在", id)); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(userPermission, + String.format("id为[%s]的用户权限不存在", id)); return userPermission; } @@ -199,9 +196,8 @@ public class UserPermissionService implements IUserPermissionService { @Override public void setPermissionOwner(Long id, UserVO owner, UserVO user) { UserPermission userPermission = getEntityById(id); - if (!iSysUserService.isExist(owner.getId())) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, String.format("id为[%s]的用户不存在", owner.getId())); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(iSysUserService.isExist(owner.getId()), + String.format("id为[%s]的用户不存在", owner.getId())); userPermission.setOwnerId(owner.getId()); userPermissionDAO.updateByPrimaryKeySelective(userPermission); } @@ -348,10 +344,8 @@ public class UserPermissionService implements IUserPermissionService { @Override public List getByDistributeId(Long distributeId) { List userPermissionList = this.findEntityByDistributeId(distributeId); - if (CollectionUtils.isEmpty(userPermissionList)) { - throw new DBException(ExceptionMapping.DATA_NOT_EXIST, - String.format("distributeId为[%s]的用户权限不存在", distributeId)); - } + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertCollectionNotEmpty(userPermissionList, + String.format("distributeId为[%s]的用户权限不存在", distributeId)); List voList = userPermissionList.stream().map(userPermission -> new UserPermissionVO(userPermission)).collect(Collectors.toList()); return voList; } @@ -463,9 +457,7 @@ public class UserPermissionService implements IUserPermissionService { @Override public void restorePermissionToDistribute(Long userPermissionId) { UserPermissionVO upVO = getById(userPermissionId); - if (!StatusEnum.Valid.getCode().equals(upVO.getStatus())) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION, "用户权限已经失效"); - } + BusinessExceptionAssertEnum.INVALID_OPERATION.assertTrue(StatusEnum.Valid.getCode().equals(upVO.getStatus())); upVO.setStatus(StatusEnum.Invalid.getCode()); updateById(upVO); iPermissionDistributeService.recoveryAfterRestoreUserPermission(upVO.getDistributeId(), upVO.getAmount()); diff --git a/src/main/java/club/joylink/rtss/services/AuthenticateService.java b/src/main/java/club/joylink/rtss/services/auth/AuthenticateService.java similarity index 92% rename from src/main/java/club/joylink/rtss/services/AuthenticateService.java rename to src/main/java/club/joylink/rtss/services/auth/AuthenticateService.java index e2a491684..55a8644e1 100644 --- a/src/main/java/club/joylink/rtss/services/AuthenticateService.java +++ b/src/main/java/club/joylink/rtss/services/auth/AuthenticateService.java @@ -1,10 +1,5 @@ -package club.joylink.rtss.services; +package club.joylink.rtss.services.auth; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.SysBizException; -import com.joylink.base.exception.constant.ExceptionMapping; -import club.joylink.rtss.simulation.cbtc.ProjectJointSimulationService; -import club.joylink.rtss.simulation.cbtc.Simulation; import club.joylink.rtss.configuration.configProp.OtherConfig; import club.joylink.rtss.configuration.configProp.WeChatConfig; import club.joylink.rtss.constants.Client; @@ -12,10 +7,14 @@ import club.joylink.rtss.constants.Project; import club.joylink.rtss.constants.SystemEnv; import club.joylink.rtss.dao.SysUserLoginDAO; import club.joylink.rtss.entity.SysUserLogin; -import club.joylink.rtss.event.ProjectDeviceLogoutEvent; -import club.joylink.rtss.event.UserLogoutEvent; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.services.ISysUserService; +import club.joylink.rtss.services.IWxApiService; +import club.joylink.rtss.services.LoginSessionManager; import club.joylink.rtss.services.project.DeviceService; import club.joylink.rtss.services.simulation.ProjectSimulationService; +import club.joylink.rtss.simulation.cbtc.ProjectJointSimulationService; +import club.joylink.rtss.simulation.cbtc.Simulation; import club.joylink.rtss.util.RandomGenerator; import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserVO; @@ -106,9 +105,7 @@ public class AuthenticateService implements IAuthenticateService { public UserVO scanWmLoginQrCode(String code, String state) { LoginScanParam param = LoginScanParam.parse(state); LoginStatusVO loginStatusVo = getLoginStatus(param.getSessionId()); - if(Objects.isNull(loginStatusVo) || !loginStatusVo.isWaiting()) { - throw new BusinessException(ExceptionMapping.CLIENT_LOGIN_INVALID); - } + BusinessExceptionAssertEnum.LOGIN_EXPIRED.assertTrue(null!=loginStatusVo&&loginStatusVo.isWaiting()); UserVO userVO = getOrCreateUserByWmcode(code); loginStatusVo.setStatus(LoginStatusVO.ScanLoginStatus.SCAN); return userVO; @@ -269,8 +266,7 @@ public class AuthenticateService implements IAuthenticateService { break; } default: - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION, - String.format("不支持的设备客户端登录")); + throw BusinessExceptionAssertEnum.INVALID_OPERATION.exception("不支持的设备客户端登录"); } } @@ -287,10 +283,7 @@ public class AuthenticateService implements IAuthenticateService { } } } - if (login) { - throw new BusinessException(ExceptionMapping.ILLEGAL_OPERATION, - String.format("已登录")); - } + BusinessExceptionAssertEnum.INVALID_OPERATION.assertNotTrue(login,"已登录"); } private void logoutSameClient(LoginUserInfoVO loginUserInfo) { @@ -314,9 +307,7 @@ public class AuthenticateService implements IAuthenticateService { public String loginWithPwd(LoginUserVO loginUser) { UserVO user = this.iSysUserService .findUserByAccountAndPassword(loginUser.getAccount(), loginUser.getPassword()); - if(Objects.isNull(user)) { - throw new BusinessException(ExceptionMapping.DATA_NOT_EXIST, "账号或密码不正确！"); - } + BusinessExceptionAssertEnum.LOGIN_INFO_ERROR.assertNotNull(user, "账号或密码不正确！"); Client client = Client.getByIdAndSecret(loginUser.getClientId(), loginUser.getSecret()); Project project = loginUser.getProject(); if (Objects.isNull(project)) { @@ -465,9 +456,7 @@ public class AuthenticateService implements IAuthenticateService { */ private LoginStatusVO getLoginStatus(String sessionId) { LoginStatusVO loginStatusVo = this.loginSessionManager.queryLoginStatusBySessionId(sessionId); - if(Objects.isNull(loginStatusVo)) { - throw new SysBizException(ExceptionMapping.CLIENT_LOGIN_INVALID); - } + BusinessExceptionAssertEnum.LOGIN_INFO_ERROR.assertNotNull(loginStatusVo); return loginStatusVo; } @@ -492,17 +481,10 @@ public class AuthenticateService implements IAuthenticateService { public static LoginScanParam parse(String state) { log.info("扫码login参数：" + state); - if(StringUtils.isEmpty(state)) { - throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); - } else { - String[] split = state.split(Splitter); - if(split.length != 2) { - log.error(String.format("扫码登陆参数[%s]", state)); - throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); - } else { - return new LoginScanParam(split[0], split[1]); - } - } + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertHasText(state); + String[] split = state.split(Splitter); + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertEquals(split.length, 2); + return new LoginScanParam(split[0], split[1]); } public String toParam() { diff --git a/src/main/java/club/joylink/rtss/services/IAuthenticateService.java b/src/main/java/club/joylink/rtss/services/auth/IAuthenticateService.java similarity index 97% rename from src/main/java/club/joylink/rtss/services/IAuthenticateService.java rename to src/main/java/club/joylink/rtss/services/auth/IAuthenticateService.java index 87238d260..95419aecf 100644 --- a/src/main/java/club/joylink/rtss/services/IAuthenticateService.java +++ b/src/main/java/club/joylink/rtss/services/auth/IAuthenticateService.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.services; +package club.joylink.rtss.services.auth; import club.joylink.rtss.constants.Project; import club.joylink.rtss.vo.LoginUserInfoVO; diff --git a/src/main/java/club/joylink/rtss/services/auth/ProjectDeviceLogoutEvent.java b/src/main/java/club/joylink/rtss/services/auth/ProjectDeviceLogoutEvent.java new file mode 100644 index 000000000..1f7cf0b65 --- /dev/null +++ b/src/main/java/club/joylink/rtss/services/auth/ProjectDeviceLogoutEvent.java @@ -0,0 +1,16 @@ +package club.joylink.rtss.services.auth; + +import club.joylink.rtss.vo.client.project.ProjectDeviceVO; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +@Getter +public class ProjectDeviceLogoutEvent extends ApplicationEvent { + + private ProjectDeviceVO projectDeviceVO; + + public ProjectDeviceLogoutEvent(Object source, ProjectDeviceVO projectDeviceVO) { + super(source); + this.projectDeviceVO = projectDeviceVO; + } +} diff --git a/src/main/java/club/joylink/rtss/services/auth/UserLogoutEvent.java b/src/main/java/club/joylink/rtss/services/auth/UserLogoutEvent.java new file mode 100644 index 000000000..30df6e18d --- /dev/null +++ b/src/main/java/club/joylink/rtss/services/auth/UserLogoutEvent.java @@ -0,0 +1,16 @@ +package club.joylink.rtss.services.auth; + +import club.joylink.rtss.vo.LoginUserInfoVO; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +@Getter +public class UserLogoutEvent extends ApplicationEvent { + + private LoginUserInfoVO loginUserInfoVO; + + public UserLogoutEvent(Object source, LoginUserInfoVO loginUserInfoVO) { + super(source); + this.loginUserInfoVO = loginUserInfoVO; + } +} diff --git a/src/main/java/club/joylink/rtss/services/student/ClassStudentUserServiceImpl.java b/src/main/java/club/joylink/rtss/services/student/ClassStudentUserServiceImpl.java index b297725ae..09094c05e 100644 --- a/src/main/java/club/joylink/rtss/services/student/ClassStudentUserServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/student/ClassStudentUserServiceImpl.java @@ -1,11 +1,10 @@ package club.joylink.rtss.services.student; -import com.joylink.base.exception.BusinessException; -import com.joylink.base.exception.constant.ExceptionMapping; import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.constants.Client; import club.joylink.rtss.dao.*; import club.joylink.rtss.entity.*; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.services.ILessonService; import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.LessonVO; @@ -100,9 +99,8 @@ public class ClassStudentUserServiceImpl implements IClassStudentUserService { oldSysUsers.add(users.get(0)); StudentRelIdClassExample relIdClassExample = new StudentRelIdClassExample(); relIdClassExample.createCriteria().andStudentUserIdEqualTo(users.get(0).getId()).andClassIdNotEqualTo(studentClass.getId()); - if( this.studentRelIdClassDAO.countByExample(relIdClassExample)>0){ - throw new BusinessException(ExceptionMapping.DATA_EXISTS,"其他班级已存在相同学号的学生！"); - } + BusinessExceptionAssertEnum.DATA_ALREADY_EXIST.assertTrue(this.studentRelIdClassDAO.countByExample(relIdClassExample) <= 0, + "其他班级已存在相同学号的学生！"); // relIdClassExample.clear(); // relIdClassExample.createCriteria().andStudentUserIdEqualTo(users.get(0).getId()); // this.studentRelIdClassDAO.deleteByExample(relIdClassExample); diff --git a/src/main/java/club/joylink/rtss/services/user/IUserSimulationStatService.java b/src/main/java/club/joylink/rtss/services/user/IUserSimulationStatService.java new file mode 100644 index 000000000..67ff9d399 --- /dev/null +++ b/src/main/java/club/joylink/rtss/services/user/IUserSimulationStatService.java @@ -0,0 +1,91 @@ +package club.joylink.rtss.services.user; + +import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.client.*; + +import java.util.List; + +public interface IUserSimulationStatService { + + /** + * 添加用户仿真数据 + * @param statsVO + * @param userVO + */ + void addUserSimulationStats(UserSimulationStatsVO statsVO, UserVO userVO); + + /** + * 添加用户仿真数据 + * @param userId + * @param mapId + * @param prdType + * @param duration + * @param role + */ + void addUserSimulationStats(Long userId, Long mapId, String prdType, Integer duration, String role); + + /** + * 分页查询用户仿真数据 + * @param queryVO + * @return + */ + PageVO queryPagedStats(UserSimulationStatsQueryVO queryVO); + + /** + * 更新用户仿真数据 + * @param statsId + * @param statsVO + * @param userVO + */ + void updateUserSimulationStats(Long statsId, UserSimulationStatsVO statsVO, UserVO userVO); + + /** + * 删除用户仿真数据 + * @param statsId + * @param userVO + */ + void deleteUserSimulationStats(Long statsId, UserVO userVO); + + /** + * 查询参与仿真的地图列表 + * + * @param userVO + * @return + */ + List querySimulationMapList(UserVO userVO); + + /** + * 查询参与仿真的产品列表 + * + * @param mapId + * @param userVO + * @return + */ + List querySimulationPrdList(Long mapId, UserVO userVO); + + /** + * 查询仿真统计排名 + * + * @param mapId + * @param prdType + * @param userVO + * @return + */ + List simulationRank(Long mapId, String prdType, UserVO userVO); + + /** + * 个人仿真数据统计 + * + * @param mapId + * @param userVO + * @return + */ + List simulationPersonalStats(Long mapId, UserVO userVO); + + /** + * 根据地图统计各系统总时长 + * @return + * @param filter + */ + List totalDuration(boolean filter, List userIds); +} diff --git a/src/main/java/club/joylink/rtss/services/user/UserSimulationStatStatService.java b/src/main/java/club/joylink/rtss/services/user/UserSimulationStatStatService.java new file mode 100644 index 000000000..6f97b77ba --- /dev/null +++ b/src/main/java/club/joylink/rtss/services/user/UserSimulationStatStatService.java @@ -0,0 +1,127 @@ +package club.joylink.rtss.services.user; + +import club.joylink.rtss.constants.MapPrdTypeEnum; +import club.joylink.rtss.dao.UserSimulationStatsDAO; +import club.joylink.rtss.entity.UserSimulationStats; +import club.joylink.rtss.entity.UserSimulationStatsExample; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.services.IMapService; +import club.joylink.rtss.services.UserUsageStatsService; +import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.client.*; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +@Service +public class UserSimulationStatStatService implements IUserSimulationStatService { + + @Autowired + private UserSimulationStatsDAO userSimulationStatsDAO; + + @Autowired + private IMapService iMapService; + + @Override + public void addUserSimulationStats(UserSimulationStatsVO statsVO, UserVO userVO) { + UserSimulationStats userSimulationStats = statsVO.convert2DB(); + userSimulationStats.setFake(true); + this.userSimulationStatsDAO.insertSelective(userSimulationStats); + } + + @Override + public void addUserSimulationStats(Long userId, Long mapId, String prdType, Integer duration, String role) { + UserSimulationStats userSimulationStats = new UserSimulationStats(); + userSimulationStats.setUserId(userId); + userSimulationStats.setMapId(mapId); + userSimulationStats.setPrdType(prdType); + userSimulationStats.setDuration(duration); + userSimulationStats.setFake(false); + userSimulationStats.setRole(role); + this.userSimulationStatsDAO.insertSelective(userSimulationStats); + } + + @Override + public PageVO queryPagedStats(UserSimulationStatsQueryVO queryVO) { + List typeList = new ArrayList<>(); + for (MapPrdTypeEnum value : MapPrdTypeEnum.values()) { + if (Pattern.matches(String.format(".*%s.*", queryVO.getTrainingName()), value.getMsg())) { + typeList.add(value.getCode()); + } + } + PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize()); + Page page = (Page)this.userSimulationStatsDAO.queryPagedStats(queryVO, typeList); + for (UserSimulationStatsListVO vo : page.getResult()) { + vo.setMapPrdName(MapPrdTypeEnum.getMapPrdTypeEnumByCode(vo.getPrdType()).getMsg()); + } + return PageVO.convert(page); + } + + @Override + public void updateUserSimulationStats(Long statsId, UserSimulationStatsVO statsVO, UserVO userVO) { + UserSimulationStats userSimulationStats = this.userSimulationStatsDAO.selectByPrimaryKey(statsId); + BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(userSimulationStats); + userSimulationStats.setDuration(statsVO.getDuration()); + this.userSimulationStatsDAO.updateByPrimaryKeySelective(userSimulationStats); + } + + @Override + public void deleteUserSimulationStats(Long statsId, UserVO userVO) { + this.userSimulationStatsDAO.deleteByPrimaryKey(statsId); + } + + @Override + public List querySimulationMapList(UserVO userVO) { + return this.userSimulationStatsDAO.querySimulationMapList(userVO.getId()); + } + + @Override + public List querySimulationPrdList(Long mapId, UserVO userVO) { + return this.userSimulationStatsDAO.querySimulationPrdList(mapId, userVO.getId()); + } + + @Override + public List simulationRank(Long mapId, String prdType, UserVO userVO) { + List rankList = this.userSimulationStatsDAO.simulationRank(mapId, prdType); + UserUsageStatsService.addMyRank(rankList, userVO); + return rankList; + } + + @Override + public List simulationPersonalStats(Long mapId, UserVO userVO) { + return this.userSimulationStatsDAO.simulationPersonalStats(mapId, userVO.getId()); + } + + @Override + public List totalDuration(boolean filter, List userIds) { + List usageTotalStatsVOList = new ArrayList<>(); + // 仿真 + UserSimulationStatsExample simulationStatsExample = new UserSimulationStatsExample(); + UserSimulationStatsExample.Criteria criteria = simulationStatsExample.createCriteria(); + criteria.andFakeEqualTo(false); + if (filter) { + criteria.andUserIdNotIn(userIds); + } + List simulationStatsList = userSimulationStatsDAO.selectByExample(simulationStatsExample); + simulationStatsList.stream().collect(Collectors.groupingBy(UserSimulationStats::getMapId)) + .forEach((mapId, list) -> { + long userCount = list.stream().map(UserSimulationStats::getUserId).distinct().count(); + long timeCount = list.stream().mapToLong(UserSimulationStats::getDuration).sum(); + UsageTotalStatsVO usageTotalStatsVO = new UsageTotalStatsVO(); + usageTotalStatsVO.setSimulationUserCount(userCount); + usageTotalStatsVO.setSimulationTime(timeCount); + usageTotalStatsVO.setMapId(mapId); + usageTotalStatsVO.setMapName(iMapService.getMapDetail(mapId).getName()); + usageTotalStatsVOList.add(usageTotalStatsVO); + }); + // 实训 + return usageTotalStatsVOList; + } +} diff --git a/src/main/java/club/joylink/rtss/vo/client/DragSortReqVO.java b/src/main/java/club/joylink/rtss/vo/client/DragSortReqVO.java index 50715417c..972aa78b4 100644 --- a/src/main/java/club/joylink/rtss/vo/client/DragSortReqVO.java +++ b/src/main/java/club/joylink/rtss/vo/client/DragSortReqVO.java @@ -1,5 +1,7 @@ package club.joylink.rtss.vo.client; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -21,20 +23,23 @@ public class DragSortReqVO { * 拖拽对象课程ID */ @ApiModelProperty(value="拖拽对象课程id") - private String lessonId; + @JsonSerialize(using = ToStringSerializer.class) + private Long lessonId; /** * 拖拽对象章节ID */ @ApiModelProperty(value="拖拽对象章节id") - private String chapterId; + @JsonSerialize(using = ToStringSerializer.class) + private Long chapterId; /** * 拖拽对象id */ @ApiModelProperty(value="拖拽对象id") @NotBlank(message="拖拽对象id 不能为空") - private String sourceId; + @JsonSerialize(using = ToStringSerializer.class) + private Long sourceId; /** * 拖拽对象类型 @@ -48,7 +53,8 @@ public class DragSortReqVO { */ @ApiModelProperty(value="放置位置对象id") @NotBlank(message="放置位置对象id 不能为空") - private String targetId; + @JsonSerialize(using = ToStringSerializer.class) + private Long targetId; /** * 放置位置对象类型 diff --git a/src/main/java/club/joylink/rtss/vo/client/TreeNode.java b/src/main/java/club/joylink/rtss/vo/client/TreeNode.java index 08e760b8b..0bd43c184 100644 --- a/src/main/java/club/joylink/rtss/vo/client/TreeNode.java +++ b/src/main/java/club/joylink/rtss/vo/client/TreeNode.java @@ -9,12 +9,14 @@ import club.joylink.rtss.vo.client.training.TrainingNewVO; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +@Slf4j @Getter @Setter @ToString @@ -334,6 +336,104 @@ public class TreeNode { return tree; } + /** + * 构建课程树 + * + * @param lessonVos + * @param chapterVos + * @return + */ + public static List buildLessonTreeList(List lessonVos, List chapterVos) { + List tree = new ArrayList<>(); + List chapterTreeList = constructTree(chapterVos); + // 构造树节点 + lessonVos.forEach(lesson -> { + for (LessonChapterVO lessonChapterVO : chapterTreeList) { + if (lesson.getId().equals(lessonChapterVO.getLessonId())) { + lesson.addChapter(lessonChapterVO); + } + } + tree.add(buildTree(lesson)); + }); + sortTree(tree); + return tree; + } + + /** + * 将章节列表构建成章节列表树 + * + * @param chapterVoList + * @return + */ + public static List constructTree(List chapterVoList) { + List tree = new ArrayList<>(); + if (!CollectionUtils.isEmpty(chapterVoList)) { + chapterVoList.forEach(chapterVo -> { + if (chapterVo.getParentId() == 0) { + tree.add(chapterVo); + } else { + Optional first = chapterVoList.stream() + .filter(chapterVO -> chapterVO.getId().equals(chapterVo.getParentId())).findFirst(); + if (first.isPresent()) { + first.get().addChild(chapterVo); + } else { + log.warn(String.format("获取父级章节为null，父id为‘%s’", chapterVo.getParentId())); + } + } + }); + } + return tree; + } + + /** + * 构造课程节点 + * @param lesson + * @return + */ + private static TreeNode buildTree(LessonVO lesson) { + TreeNode node = TreeNode.buildLessonNode(lesson); + if(!CollectionUtils.isEmpty(lesson.getChapters())) { + lesson.getChapters().forEach(chapter -> { + node.addChild(buildTree(chapter)); + }); + } + return node; + } + + /** + * 构造章节节点 + * @param chapter + * @return + */ + private static TreeNode buildTree(LessonChapterVO chapter) { + TreeNode node = TreeNode.buildChapterNode(chapter); + if(!CollectionUtils.isEmpty(chapter.getTrainingVos())) { + chapter.getTrainingVos().forEach(training -> node.addChild(TreeNode.buildTrainingNode(training))); + } + if(!CollectionUtils.isEmpty(chapter.getChildren())) { + chapter.getChildren().forEach(child -> node.addChild(buildTree(child))); + } + return node; + } + + /** + * 树排序 + * @param list + */ + public static void sortTree(List list) { + if(!CollectionUtils.isEmpty(list)) { + list.sort((o1, o2) -> { + if (null == o1.getOrder() || null == o2.getOrder()) { + return 0; + } + return o1.getOrder().compareTo(o2.getOrder()); + }); + list.forEach(tree -> { + sortTree(tree.getChildren()); + }); + } + } + /** * 循环构造章节及章节子节点 * diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanGenerator.java b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanGenerator.java new file mode 100644 index 000000000..681614f7b --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanGenerator.java @@ -0,0 +1,51 @@ +package club.joylink.rtss.vo.runplan.newdraw; + +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.vo.client.map.MapVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripVO; +import club.joylink.rtss.vo.runplan.newdraw.mainstack.DrawFuzhouRunPlan; +import club.joylink.rtss.vo.runplan.newdraw.mainstack.DrawHarbinRunPlan; +import club.joylink.rtss.vo.runplan.newdraw.mainstack.DrawRunPlan; + +import java.time.LocalTime; +import java.util.List; + +/** + * 通用运行图生成 + */ +public class RunPlanGenerator { + + private static final int OFFSET_TIME_HOURS = 2; //时间偏移早两小时 + public static List generatorTrips(RunPlanInput runPlanInput, MapVO mapVO) { + + //校验发车停运时间 + BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(runPlanInput.getOverTime().isAfter(runPlanInput.getBeginTime())); + //校验车站 + + LocalTime beginTimeOffset = runPlanInput.getBeginTime().minusHours(OFFSET_TIME_HOURS); + //向前推两小时，如果到前一天，则时间不合理 + BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(runPlanInput.getBeginTime().isAfter(beginTimeOffset), + "发车时间过早，建议晚于上午两点"); + runPlanInput.setBeginTime(beginTimeOffset); + runPlanInput.setOverTime(runPlanInput.getOverTime().minusHours(OFFSET_TIME_HOURS)); + + return drawRunPlanOf(runPlanInput.getRunLevel(),mapVO).generatorTrips(runPlanInput, mapVO); + + } + + private static DrawRunPlan drawRunPlanOf(int runLevel, MapVO mapVO) { + DrawRunPlan drawRunPlan; + switch (mapVO.getLineCode()) { + case "07": + drawRunPlan = new DrawHarbinRunPlan(runLevel, mapVO); + break; + case "02": + drawRunPlan = new DrawFuzhouRunPlan(runLevel, mapVO); + break; + default: + throw BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.exception(); + } + return drawRunPlan; + } + +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanInput.java b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanInput.java new file mode 100644 index 000000000..f2f5a1270 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/RunPlanInput.java @@ -0,0 +1,81 @@ +package club.joylink.rtss.vo.runplan.newdraw; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Positive; +import java.time.LocalTime; + +@ApiModel(value = "运行图绘制输入参数") +@Getter +@Setter +public class RunPlanInput { + +// // 出库站 +// private String inboundStationCode; +// // 入库站 +// private String outboundStationCode; + + /**往返车站-左向起始站*/ + @ApiModelProperty(value = "左向起始站") + private String startStationCode; + /**往返车站-右向起始站*/ + @ApiModelProperty(value = "右向起始站") + private String endStationCode; + /**折返时间*/ + @ApiModelProperty(value = "折返时间") + private int reentryTime; +// /**停站时间*/ +// @ApiModelProperty(value = "停站时间") +// private int parkedTime; + /**运行等级默认-站间运行时间*/ + private int runLevel=3; + /**开始时间*/ + @ApiModelProperty(value = "开始时间") + @NotNull(message = "开始时间不能为空") + private LocalTime beginTime; + /**结束时间*/ + @ApiModelProperty(value = "结束时间") + @NotNull(message = "结束时间不能为空") + private LocalTime overTime; + /**间隔发车时间*/ + @ApiModelProperty(value = "间隔时间") + @Positive + private int departureTimeInterval; + /**左右行,不设置为相向同时发车*/ + @ApiModelProperty(value = "向左/向右") + private Boolean right; +// /**初始服务号*/ +// @ApiModelProperty(value = "表号") +// @NotBlank +// @Length(min = 1, max = 3) +// private String initialServiceNumber; + +// private DepartureParam leftDepartureParam; +// private DepartureParam rightDepartureParam; +// // // 服务号数量 +//// private int serviceCount; +// +//// //同时发车 +//// private boolean simultaneousDepart; +// @Setter +// @Getter +// public class DepartureParam{ +//// /**左右行*/ +//// @ApiModelProperty(value = "向左/向右") +//// private boolean right; +// /**开始时间*/ +// @ApiModelProperty(value = "开始时间") +// @NotNull(message = "开始时间不能为空") +// private LocalTime beginTime; +// /**初始服务号*/ +// @ApiModelProperty(value = "表号") +// @NotBlank +// @Length(min = 1, max = 3) +// private String initialServiceNumber; +//} +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawFuzhouRunPlan.java b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawFuzhouRunPlan.java new file mode 100644 index 000000000..c3d9ea2f9 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawFuzhouRunPlan.java @@ -0,0 +1,73 @@ +package club.joylink.rtss.vo.runplan.newdraw.mainstack; + +import club.joylink.rtss.vo.client.map.MapVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripVO; + +import java.util.List; +import java.util.stream.Collectors; + +public class DrawFuzhouRunPlan extends DrawRunPlan { + + public DrawFuzhouRunPlan(int runLevel, MapVO mapVO) { + super(runLevel,mapVO); + } + + @Override + public List filterMainStackStations(List ascStationList) { + return ascStationList.stream().filter((s)->{ + if(s.getName().equals("停车场")){ + return false; + } + if(s.getName().equals("车辆段")){ + return false; + } + return true; + + }).collect(Collectors.toList()); + } + + @Override + public List filterMainStackStands(List standList) { + +// return standList.stream().filter((s) -> { +// +// if (s.getName().equals("psd1504")) { //太平桥 +// return false; +// } +// return true; +// }).collect(Collectors.toList()); + return standList; + } + + @Override + void setTripStartSectionCode(RunPlanTripVO runPlanTripVO, boolean isRight, boolean isFirstTrip) { + if (isFirstTrip) { + runPlanTripVO.setStartSectionCode(isRight ? "T4" : "T305"); //TA0102:TA2125 + runPlanTripVO.setIsOutbound(true); + } else { + runPlanTripVO.setStartSectionCode(isRight ? "T10" : "T305"); //TA0108:TA2125 + } + } + + @Override + void setTripEndSectionInfo(RunPlanTripVO runPlanTripVO, boolean isRight, boolean isLastTrip) { + if (isLastTrip) { + runPlanTripVO.setEndSectionCode(isRight ? "T299" : "T3");//TA2126:TA0101 + runPlanTripVO.setDestinationCode(isRight ? "218" : "011");//TA2126:TA0101 + } else { + runPlanTripVO.setEndSectionCode(isRight ? "T305" : "T10");//TA2125:TA0108 + runPlanTripVO.setDestinationCode(isRight ? "219" : "012");//TA2125:TA0108 + } + } + + @Override + void setTripTimeSectionCode(MapStationNewVO stoppingStation, RunPlanTripTimeVO runPlanTripTime, boolean isFirstTrip, boolean isLastTrip) { +// if (Objects.equals("哈东站", stoppingStation.getName())) { +// runPlanTripTime.setSectionCode("T451");//G1805 +// } + } + +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawHarbinRunPlan.java b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawHarbinRunPlan.java new file mode 100644 index 000000000..b6808a3c4 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawHarbinRunPlan.java @@ -0,0 +1,73 @@ +package club.joylink.rtss.vo.runplan.newdraw.mainstack; + +import club.joylink.rtss.vo.client.map.MapVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripVO; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class DrawHarbinRunPlan extends DrawRunPlan { + + public DrawHarbinRunPlan(int runLevel, MapVO mapVO) { + super(runLevel,mapVO); + } + + @Override + public List filterMainStackStations(List ascStationList) { + return ascStationList.stream().filter((s)->{ + if(s.getName().equals("太平桥车辆段")){ + return false; + } + if(s.getName().equals("哈南停车场")){ + return false; + } + return true; + + }).collect(Collectors.toList()); + } + + @Override + public List filterMainStackStands(List standList) { + + return standList.stream().filter((s) -> { + + if (s.getName().equals("psd1504")) { //太平桥 + return false; + } + return true; + }).collect(Collectors.toList()); + } + + @Override + void setTripStartSectionCode(RunPlanTripVO runPlanTripVO, boolean isRight, boolean isFirstTrip) { + if (isFirstTrip) { + runPlanTripVO.setStartSectionCode(isRight ? "T11" : "T451"); //G2115:G1805 + runPlanTripVO.setIsOutbound(true); + } else { + runPlanTripVO.setStartSectionCode(isRight ? "T16" : "T451"); //G2116:G1805 + } + } + + @Override + void setTripEndSectionInfo(RunPlanTripVO runPlanTripVO, boolean isRight, boolean isLastTrip) { + if (isLastTrip) { + runPlanTripVO.setEndSectionCode(isRight ? "T451" : "T11");//G1805:G2115 + runPlanTripVO.setDestinationCode(isRight ? "181" : "213");//G1805:G2115 + } else { + runPlanTripVO.setEndSectionCode(isRight ? "T451" : "T16");//G1805:G2116 + runPlanTripVO.setDestinationCode(isRight ? "181" : "214");//G1805:G2116 + } + } + + @Override + void setTripTimeSectionCode(MapStationNewVO stoppingStation, RunPlanTripTimeVO runPlanTripTime, boolean isFirstTrip, boolean isLastTrip) { + if (Objects.equals("哈东站", stoppingStation.getName())) { + runPlanTripTime.setSectionCode("T451");//G1805 + } + } + +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawRunPlan.java b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawRunPlan.java new file mode 100644 index 000000000..4c08eb83e --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newdraw/mainstack/DrawRunPlan.java @@ -0,0 +1,330 @@ +package club.joylink.rtss.vo.runplan.newdraw.mainstack; + +import club.joylink.rtss.constants.BusinessConsts; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.vo.client.map.MapVO; +import club.joylink.rtss.vo.client.map.RealLineConfigVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO; +import club.joylink.rtss.vo.client.map.newmap.SectionParkingTimeVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripVO; +import club.joylink.rtss.vo.runplan.newdraw.RunPlanInput; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalTime; +import java.util.*; +import java.util.stream.Collectors; + +public abstract class DrawRunPlan { + + protected final Map parkTime; + protected final Map runLevelTime; + + protected DrawRunPlan(int runLevel, MapVO mapVO) { + + //停站时间map：key-区段code/value-停站时间s + parkTime = mapVO.getLogicDataNew().getParkingTimeList().stream().flatMap(parkingTimeVO -> parkingTimeVO.getParkingTimeVOList().stream()).collect(Collectors.toMap(SectionParkingTimeVO::getSectionCode, SectionParkingTimeVO::getParkingTime)); + //站间运行时间：key-起始区段-终点区段/value-时间 + runLevelTime = mapVO.getLogicDataNew().getRunLevelList().stream().collect(Collectors.toMap(runLevelVO -> String.format("%s-%s", runLevelVO.getStartSectionCode(), runLevelVO.getEndSectionCode()), runLevelVO -> runLevelVO.getLevelTime(runLevel))); + } + + public final List generatorTrips(RunPlanInput runPlanInput, MapVO mapVO) { + + //根据公里标升序的往返之间车站列表 + List runStationList = getMapStationNews(runPlanInput, mapVO); + + List tripList = new ArrayList<>(100); + //是否同时相向发车 + boolean opposite = Objects.isNull(runPlanInput.getRight()); + if (opposite) { + //相向发车 + int initialServiceNum = 1; + /*分别先发一辆车，计算控制左右发车服务号*/ + //上个服务号发车时刻 + //首班发车时间,首班车往返回来时间 来限定发车服务数量 + TempResult tempResultLeft = new TempResult(runPlanInput.getBeginTime(), null); + serviceNumberDepart(runPlanInput, runStationList, initialServiceNum++, tripList, tempResultLeft, false, mapVO.getConfigVO()); + + //上个服务号发车时刻 + //首班发车时间,首班车往返回来时间 来限定发车服务数量 + TempResult tempResultRight = new TempResult(runPlanInput.getBeginTime().minusSeconds(runPlanInput.getDepartureTimeInterval()), null); + serviceNumberDepart(runPlanInput, runStationList, initialServiceNum++, tripList, tempResultRight, true, mapVO.getConfigVO()); + + LocalTime firstRoundTripTimeLeft = tempResultLeft.getFirstRoundTripTime(); + LocalTime firstRoundTripTimeRight = tempResultRight.getFirstRoundTripTime(); + tempResultRight.setFirstRoundTripTime(firstRoundTripTimeLeft); + tempResultLeft.setFirstRoundTripTime(firstRoundTripTimeRight); + //暂时先定义发完左行，再发右行.. + do { + serviceNumberDepart(runPlanInput, runStationList, initialServiceNum++, tripList, tempResultLeft, false, mapVO.getConfigVO()); + } while (tempResultLeft.getPreServiceDepartTime().minusSeconds(runPlanInput.getReentryTime()).plusSeconds(runPlanInput.getDepartureTimeInterval() * 2).compareTo(tempResultLeft.getFirstRoundTripTime()) <= 0); + //发完左行，再发右行 + do { + serviceNumberDepart(runPlanInput, runStationList, initialServiceNum++, tripList, tempResultRight, true, mapVO.getConfigVO()); + } while (tempResultRight.getPreServiceDepartTime().minusSeconds(runPlanInput.getReentryTime()).plusSeconds(runPlanInput.getDepartureTimeInterval() * 2).compareTo(tempResultRight.getFirstRoundTripTime()) <= 0); + + + } else { + //单向发车 + allServiceNumberDepart(runPlanInput, runStationList, tripList, mapVO.getConfigVO()); + + } + return tripList; + } + + /** + * 单向发车 + */ + private void allServiceNumberDepart(RunPlanInput runPlanInput, List runStationList, List tripList, RealLineConfigVO lineConfigVO) { + + + //设置初始服务号 + int initialServiceNum = 1; + //上个服务号发车时刻 + //首班发车时间,首班车往返回来时间 来限定发车服务数量 + TempResult tempResult = new TempResult(runPlanInput.getBeginTime(), null); + do { + serviceNumberDepart(runPlanInput, runStationList, initialServiceNum++, tripList, tempResult, runPlanInput.getRight(), lineConfigVO); + } while (tempResult.getPreServiceDepartTime().minusSeconds(runPlanInput.getReentryTime()).plusSeconds(runPlanInput.getDepartureTimeInterval() * 2).compareTo(tempResult.getFirstRoundTripTime()) <= 0); + + } + + /** + * 根据公里标升序的车站列表 + */ + private List getMapStationNews(RunPlanInput runPlanInput, MapVO mapVO) { + //根据公里标升序的车站列表 + //TODO ?? 存在车库或车辆段公里标大于的相邻车站与出库后的第一个目标车站不一致 的问题 + List ascStationList = mapVO.findSortedAllStationListNew(); + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(ascStationList); + // 获取站台 + List standList = mapVO.findAllStandListNew(); + BusinessExceptionAssertEnum.DATA_ERROR.assertCollectionNotEmpty(standList); + + /*获取运行往返正线上的车站列表*/ + List mainStackStations = filterMainStackStations(ascStationList); + for (MapStationNewVO station : mainStackStations) { + for (MapStationStandNewVO stand : filterMainStackStands(standList)) { + if (station.getCode().equals(stand.getStationCode())) { + station.addStand(stand); + } + } + } + //先不考虑特殊发车 + String startStationCode = runPlanInput.getStartStationCode();//起始车站code + String endStationCode = runPlanInput.getEndStationCode();//终点车站code + int startIndex = -1; + int endIndex = -1; + for (int i = 0, len = mainStackStations.size(); i < len; i++) { + if (startIndex != -1 && endIndex != -1) { + break; + } + if (startIndex == -1 && mainStackStations.get(i).getCode().equals(startStationCode)) { + startIndex = i; + } + if (endIndex == -1 && mainStackStations.get(i).getCode().equals(endStationCode)) { + endIndex = i; + } + } + if (startIndex > endIndex) { + return mainStackStations.subList(endIndex, startIndex + 1); + } + return mainStackStations.subList(startIndex, endIndex + 1); + } + + @Getter + @Setter + @AllArgsConstructor + private class TempResult { + private LocalTime preServiceDepartTime; + private LocalTime firstRoundTripTime; + } + + /** + * 服务号发车 + * + * @param runPlanInput + * @param runStationList + * @param initialServiceNum + * @param tripList + * @param tempResult + * @param isRight + */ + private void serviceNumberDepart(RunPlanInput runPlanInput, List runStationList, int initialServiceNum, List tripList, TempResult tempResult, boolean isRight, RealLineConfigVO lineConfigVO) { + String serviceNumber = String.format("%03d", initialServiceNum); + int stationNum =runStationList.size(); + + //服务首班车次 + boolean isFirstTrip = true; + //服务首班车次第一个计划到站 + boolean isFirstTripFirstStation = true; + + //服务末班车次 + boolean isLastTrip = false; + //首班右行 +// boolean isRight = Objects.nonNull(runPlanInput.getRightDepartureParam()); + //初始化车次号,右行偶数，左行奇数 + int initTripNumber = isRight ? 0 : 1; + LocalTime lastTripEndTime = null;//一个车次终点时间 + List tempTripList = new ArrayList<>(); + //根据运行时间判断结束末班车次 + do { + //本车次首发车时间 +// LocalTime departTime = startTime; + RunPlanTripVO runPlanTripVO = new RunPlanTripVO(); + runPlanTripVO.setServiceNumber(serviceNumber); + runPlanTripVO.setRight(isRight); + setDirectionCode(lineConfigVO.getUpRight(), runPlanTripVO); + runPlanTripVO.setIsReentry(true); + //车次号 + String tripNumber = String.format("%03d", initTripNumber++); + runPlanTripVO.setTripNumber(tripNumber); + setTripStartSectionCode(runPlanTripVO, isRight, isFirstTrip); + //首班右行方向 + LinkedList tripTimeList = new LinkedList<>();//车次时刻表 + if (isRight) { + for (int r = 1; r <= stationNum; r++) { + MapStationNewVO stoppingStation = runStationList.get(r - 1); + RunPlanTripTimeVO runPlanTripTimeVO = new RunPlanTripTimeVO(); + runPlanTripTimeVO.setStationCode(stoppingStation.getCode()); + //TODO 需特别处理 + MapStationStandNewVO stand = stoppingStation.getStandList().stream().filter(s -> s.isRight()).findFirst().get(); + runPlanTripTimeVO.setSectionCode(stand.getStandTrackCode()); + setTripTimeSectionCode(stoppingStation,runPlanTripTimeVO, isFirstTrip, isLastTrip); + //TODO 折返时间和站间运行时间恒定值 后续根据运行等级进行处理时间 + LocalTime arrivalTime = isFirstTripFirstStation ? initialServiceNum == 1 ? tempResult.getPreServiceDepartTime() : tempResult.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()) : r == 1 ? lastTripEndTime.plusSeconds(runPlanInput.getReentryTime()) : tripTimeList.getLast().getDepartureTime().plusSeconds(runLevelTime.getOrDefault(tripTimeList.getLast().getSectionCode()+"-"+runPlanTripTimeVO.getSectionCode(),120)); + runPlanTripTimeVO.setArrivalTime(arrivalTime); + LocalTime departureTime = arrivalTime.plusSeconds(parkTime.getOrDefault(runPlanTripTimeVO.getSectionCode(),30)); + runPlanTripTimeVO.setDepartureTime(departureTime); + tripTimeList.add(runPlanTripTimeVO); + + if (isFirstTripFirstStation) { +// setTripStartSectionCode(runPlanTripVO, true); +// runPlanTripVO.setIsOutbound(true); + isFirstTripFirstStation = false; + } + if (r == stationNum) lastTripEndTime = departureTime; + } + } else { + for (int l = stationNum; l > 0; l--) { + MapStationNewVO stoppingStation = runStationList.get(l - 1); + RunPlanTripTimeVO runPlanTripTimeVO = new RunPlanTripTimeVO(); + runPlanTripTimeVO.setStationCode(stoppingStation.getCode()); + //TODO 需特别处理 + MapStationStandNewVO stand = stoppingStation.getStandList().stream().filter(s -> !s.isRight()).findFirst().get(); + runPlanTripTimeVO.setSectionCode(stand.getStandTrackCode()); + //TODO 折返时间和站间运行时间恒定值 后续根据运行等级进行处理时间 + LocalTime arrivalTime = isFirstTripFirstStation ? initialServiceNum == 1 ? tempResult.getPreServiceDepartTime() : tempResult.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()) : l == stationNum ? lastTripEndTime.plusSeconds(runPlanInput.getReentryTime()) : tripTimeList.getLast().getDepartureTime().plusSeconds(runLevelTime.getOrDefault(tripTimeList.getLast().getSectionCode()+"-"+runPlanTripTimeVO.getSectionCode(),120)); + runPlanTripTimeVO.setArrivalTime(arrivalTime); + LocalTime departureTime = arrivalTime.plusSeconds(parkTime.getOrDefault(runPlanTripTimeVO.getSectionCode(),30)); + runPlanTripTimeVO.setDepartureTime(departureTime); + tripTimeList.add(runPlanTripTimeVO); + + if (isFirstTripFirstStation) { +// setTripStartSectionCode(runPlanTripVO, false); +// runPlanTripVO.setIsOutbound(true); + isFirstTripFirstStation = false; + } + if (l == 1) lastTripEndTime = departureTime; + } + } + runPlanTripVO.setTimeList(tripTimeList); +// //TODO 起始/结束区段未设置，需分别具体设置 + setTripEndSectionInfo(runPlanTripVO, isRight,false); + setTripRunTime(runPlanTripVO, tripTimeList); + + tempTripList.add(runPlanTripVO); + if (tempTripList.size() > 50) { // 最快半小时跑一趟的一天车次数，如果大于这个，可能死循环，此时停止发车 + + break; + } + //or 向前推后两小时后，最多跑到凌晨，跑过有可能运行时间过大需特殊处理偏移时间或死循环，停止发车。 +// if(lastTripEndTime.isBefore(LocalTime.of(2,0,0))){ +// break; +// } + isRight = !isRight; + if (isFirstTrip) { + isFirstTrip=false; + } + + } while (lastTripEndTime.isBefore(runPlanInput.getOverTime())); + //设置服务号末班车次入库 + RunPlanTripVO lastrunPlanTrip = tempTripList.get(tempTripList.size() - 1); + lastrunPlanTrip.setIsInbound(true); + lastrunPlanTrip.setIsReentry(false); + setTripEndSectionInfo(lastrunPlanTrip, lastrunPlanTrip.getRight(),true); + LinkedList tripTimeList = (LinkedList) lastrunPlanTrip.getTimeList(); + setTripEndTime(lastrunPlanTrip, tripTimeList); + tripList.addAll(tempTripList); + if (Objects.isNull(tempResult.getFirstRoundTripTime())) { + tempResult.setFirstRoundTripTime(Objects.isNull(runPlanInput.getRight()) ? ((RunPlanTripTimeVO) (((LinkedList) (tempTripList.get(0).getTimeList())).getLast())).getDepartureTime() : ((RunPlanTripTimeVO) (((LinkedList) (tempTripList.get(1).getTimeList())).getLast())).getDepartureTime()); + } + tempResult.setPreServiceDepartTime(((RunPlanTripTimeVO) (((LinkedList) (tempTripList.get(0).getTimeList())).getFirst())).getArrivalTime()); + } + + private void setTripEndTime(RunPlanTripVO lastrunPlanTrip, LinkedList tripTimeList) { + if (Objects.equals(lastrunPlanTrip.getEndSectionCode(), tripTimeList.getLast().getSectionCode())) { + lastrunPlanTrip.setEndTime(tripTimeList.getLast().getDepartureTime()); + } else { + lastrunPlanTrip.setEndTime(tripTimeList.getLast().getDepartureTime().plusSeconds(40)); + } + } + + private void setTripRunTime(RunPlanTripVO runPlanTripVO, LinkedList tripTimeList) { + setTripStartTime(runPlanTripVO, tripTimeList); + //车次 结束区段和最后一个到站区段相同，那么车次结束时间就是最后一个车站到站时间 + setTripEndTime(runPlanTripVO, tripTimeList); + } + + private void setTripStartTime(RunPlanTripVO runPlanTripVO, LinkedList tripTimeList) { + if (Objects.equals(runPlanTripVO.getStartSectionCode(), tripTimeList.getFirst().getSectionCode())) { + runPlanTripVO.setStartTime(tripTimeList.getFirst().getArrivalTime()); + } else { + runPlanTripVO.setStartTime(tripTimeList.getFirst().getArrivalTime().minusSeconds(40)); + } + } + + private void setDirectionCode(Boolean upRight, RunPlanTripVO runPlanTripVO) { + if (runPlanTripVO.getRight()) { + + if (upRight) { + runPlanTripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type02); + } else { + runPlanTripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type01); + } + } else { + if (upRight) { + runPlanTripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type01); + } else { + runPlanTripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type02); + } + } + + } + + /** + * 正线站 + */ + abstract List filterMainStackStations(List ascStationList); + + /** + * 正线站台 + */ + abstract List filterMainStackStands(List standList); + + /** + * 服务号 车次起始区段及出入库 + */ + abstract void setTripStartSectionCode(RunPlanTripVO runPlanTripVO, boolean isRight, boolean isFirstTrip); + + /** + * 服务号 车次结束区段和目的地 + */ + abstract void setTripEndSectionInfo(RunPlanTripVO runPlanTripVO, boolean isRight, boolean isLastTrip); + + /**车站停靠站台轨*/ + abstract void setTripTimeSectionCode(MapStationNewVO stoppingStation,RunPlanTripTimeVO runPlanTripTime, boolean isFirstTrip, boolean isLastTrip); +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/BeiJingLine1RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/BeiJingLine1RunPlanNew.java new file mode 100644 index 000000000..bdeedc760 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/BeiJingLine1RunPlanNew.java @@ -0,0 +1,263 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +public class BeiJingLine1RunPlanNew implements IRunPlanStrategyNew { + /** + * 导入数据检查和预处理 + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + // 获取存在 只有服务号的数据的服务号 + List emptyDirection = new ArrayList<>(10); + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + if(StringUtils.isBlank(runPlanImport.getDirectionCode())) { + emptyDirection.add(runPlanImport.getServiceNumber()); + } + handleStationAndTime(stationMap, runPlanImport.getArrivalList()); + }); + // 筛选存在 只有服务号的数据 + Map> onlyServNumMap = runPlanImportList.stream().filter(runPlanImport -> + emptyDirection.contains(runPlanImport.getServiceNumber())) + .collect(Collectors.groupingBy(RunPlanImport::getServiceNumber)); + // 为存在只有服务号的数据设置方向 + onlyServNumMap.forEach((serviceNumber, importList) -> { + importList.sort(Comparator.comparing(o -> o.getArrivalList().get(0).getArriveTime())); + for(int i = 0; i < importList.size(); i++) { + RunPlanImport runPlanImport = importList.get(i); + //只有服务号的车次设置方向 + if(StringUtils.isBlank(runPlanImport.getDirectionCode()) && importList.size() > 1) { + boolean right; + if(importList.size() == i + 1) { + // 最后一条数据为前一条数据的反方向 + right = importList.get(i - 1).isRight(); + }else { + // 第一条数据为后面一条数据的反方向 + right = importList.get(i + 1).isRight(); + } + runPlanImport.setRight(!right); + runPlanImport.setCode(runPlanImport.getCode() + runPlanImport.getDirectionCode()); + } + } + }); + } + + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if(StringUtils.isNotBlank(code)) { + String serviceNumber = StringUtils.EMPTY; + String direction = StringUtils.EMPTY; + String tripNumber = StringUtils.EMPTY; + if(code.length() == 6) { + serviceNumber = code.substring(0, 2); + direction = code.substring(2, 3); + tripNumber = code.substring(2, 6); + }else if(code.length() == 4) { + direction = code.substring(0, 1); + tripNumber = code; + }else if(code.length() == 2) { + serviceNumber = code; + }else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); + } + runPlanImport.setServiceNumber(serviceNumber); + runPlanImport.setDirectionCode(direction); + runPlanImport.setTripNumber(tripNumber); + setRunPlanDirec(runPlanImport, upDirection); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); + } + } + + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName , String finalStationName) { + // 在洞口 站前折返 + if (startStationName.equals("洞口") || endStationName.equals("洞口")) { + // 出库 + if (runPlanImport.isRight()) { // 古段/苹果园 -> 洞口 + if (StringUtils.isBlank(runPlanImport.getTripNumber())) { + tripVO.setDestinationCode("CJ"); // 洞口 15G +// tripVO.setStartSectionCode("Section_19_0.16177"); // 古段 ZHG1(SG&F3) +// tripVO.setEndSectionCode("Section_58_0.75357"); // 洞口 15G + } else { + tripVO.setDestinationCode("CK"); // 洞口 18G(F6) +// tripVO.setStartSectionCode("Section_16_0.60782"); // 苹果园站 8G +// tripVO.setEndSectionCode("Section_82_0.04794"); // 洞口 18G(F6) + } + } else { // 入库 + if (StringUtils.isBlank(runPlanImport.getTripNumber())) { // 洞口 -> 古段 + tripVO.setDestinationCode("CE"); // 古段 ZHG1(SG&F3) +// tripVO.setStartSectionCode("Section_82_0.04794"); // 洞口 18G(F6) +// tripVO.setEndSectionCode("Section_19_0.16177"); // 古段 ZHG1(SG&F3) + } else { // 洞口 -> 苹果园 + tripVO.setDestinationCode("CA"); // 苹果园站 8G +// tripVO.setStartSectionCode("Section_58_0.75357"); // 洞口 15G +// tripVO.setEndSectionCode("Section_16_0.60782"); // 苹果园站 8G + } + } + } else { // 站后折返 + if (runPlanImport.isRight()) { // 上行在四惠东站折返 +// if("四惠东".equals(endStationName) && "四惠段一".equals(startStationName)){ +// tripVO.setDestinationCode("UE"); // 四惠东站 7G +// }else if("四惠东".equals(endStationName) ){ +// tripVO.setDestinationCode("UJ"); // 四惠东站 9G(XC1&F3) +// if(Arrays.asList("261131","211346","251403","471404","431405","501406","541407","231408","561409","011410","071411","611412").contains(runPlanImport.getCode())){ +// tripVO.setDestinationCode("UC"); // 四惠东站 8G(XC2&F4) +// } +// } + if("四惠东".equals(endStationName) ){ + tripVO.setDestinationCode("UJ"); // 四惠东站 9G(XC1&F3) + } +// if("232155".equals(runPlanImport.getCode()) || "432369".equals(runPlanImport.getCode())) { // 在五三站发车 +// tripVO.setStartSectionCode("Section_7_0.96090"); // 五三站 2G(F2&SC) +// }else { // 在苹果园站发车 +// tripVO.setStartSectionCode("Section_16_0.60782"); // 苹果园站 8G +// } +// tripVO.setEndSectionCode("Section_838_0.75322"); // 四惠东站 9G(XC1&F3) + } else { // 下行折返 +// tripVO.setStartSectionCode("Section_838_0.75322"); // 四惠东站 9G(XC1&F3) + if ("231124".equals(runPlanImport.getCode()) || "431347".equals(runPlanImport.getCode())) { // 在五三站折返 + tripVO.setDestinationCode("AA"); // 五三站 2G(F2&SC) +// tripVO.setEndSectionCode("Section_7_0.96090"); // 五三站 2G(F2&SC) + } else { // 在苹果园站折返 + tripVO.setDestinationCode("CA"); // 苹果园站 8G +// tripVO.setEndSectionCode("Section_16_0.60782"); // 苹果园站 8G + } + } + } + if (Arrays.asList("022118", "451128", "052106", "492100", "171106", "522103", "552109", + "221121", "582115", "261131", "631103", "681115", "691118", "071140", "082112", + "132121", "671112", "411109").contains(runPlanImport.getCode())) { + tripVO.setIsInbound(true); + isLast = true; + } + if (Arrays.asList("021293", "452287", "051281", "491275", "172269", "521278", "551284", + "222284", "581290", "261272", "632266", "682278", "692281", "072290", "081287", + "131296", "672275", "412272").contains(runPlanImport.getCode())) { + tripVO.setIsOutbound(true); + isFirst = true; + } +// if(isLast) { + switch (endStationName) { + case "古段" : + tripVO.setDestinationCode("CE"); // ZHG1(SG&F3) + tripVO.setEndSectionCode("T132"); // 古段 ZHG1(SG&F3) + tripVO.setIsInbound(true); + tripVO.setIsReentry(false); + break; + case "四惠段一" : + tripVO.setDestinationCode("UB"); // 1_1WG_SDP(S2) + tripVO.setEndSectionCode("T605"); // 四惠段一 75DG_SDP(S1) + tripVO.setIsInbound(true); + tripVO.setIsReentry(false); + break; + case "四惠段二": + tripVO.setDestinationCode("TF"); // 四惠段二 ZHG2(X2&XC1) + tripVO.setEndSectionCode("T652"); // 四惠段二 ZHG2(X2&XC1) + tripVO.setIsInbound(true); + tripVO.setIsReentry(false); + break; + case "公主坟": + tripVO.setDestinationCode("JB"); // 公主坟 13G(F1) + tripVO.setEndSectionCode("T289"); // 公主坟 13G(F1) + break; + case "复兴门": + tripVO.setDestinationCode("KF"); // 复兴门 23G(F5&XJ_NLSL&XC) + tripVO.setEndSectionCode("T515"); // 复兴门 23G(F5&XJ_NLSL&XC) + break; + } +// } + switch(startStationName) { + case "古段": + tripVO.setStartSectionCode("T132"); // 古段 ZHG1(SG&F3) + tripVO.setIsOutbound(true); + break; + case "四惠段一": + tripVO.setStartSectionCode("T612"); // 四惠段一 1_1WG_SDP(S2) + tripVO.setIsOutbound(true); + break; + case "四惠段二": + tripVO.setStartSectionCode("T634"); // 四惠段二 ZHG1(X1&XC1) + tripVO.setIsOutbound(true); + break; + case "公主坟": + tripVO.setStartSectionCode("T291"); // 公主坟 18G(F2) + break; + case "复兴门": + tripVO.setStartSectionCode("T515"); // 复兴门 23G(F5&XJ_NLSL&XC) + break; + } +// switch(endStationName) { +// case "古段": +// tripVO.setDestinationCode("CE"); // 古段 ZHG1(SG&F3) +// tripVO.setEndSectionCode("Section_19_0.16177"); // 古段 ZHG1(SG&F3) +// break; +// case "四惠段一": +// tripVO.setDestinationCode("UB"); // 四惠段一 75DG_SDP(S1) +// tripVO.setEndSectionCode("Section_82_0.01650"); // 四惠段一 75DG_SDP(S1) +// break; +// case "四惠段二": +// tripVO.setDestinationCode("TF"); // 四惠段二 ZHG2(X2&XC1) +// tripVO.setEndSectionCode("Section_69_0.47824"); // 四惠段二 ZHG2(X2&XC1) +// break; +// } + } + + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + if (StringUtils.isBlank(runPlanImport.getTripNumber()) && stationVO.getRunPlanName().equals("洞口")) { + if (runPlanImport.isRight()) { // 古段 -> 洞口 + timeVO.setSectionCode("T141"); //15G + } else { // 洞口 -> 古段 + timeVO.setSectionCode("T102"); //18G(F6) + } + return; + } + if (stationVO.getRunPlanName().equals("古段")) { + timeVO.setSectionCode("T132"); //ZHG1(SG&F3) + return; + } + + if("洞口".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T102":"T141");//15G:18G(F6) + return; + } + if("四惠段二".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T652":"T634");//ZHG2(X2&XC1):ZHG1(X1&XC1) + return; + } + if("四惠段一".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T612":"T605");//1_1WG_SDP(S2):75DG_SDP(S1) + return; + } + + if("四惠东".equals(stationVO.getRunPlanName()) && "四惠东".equals(startStationName) && "四惠段一".equals(endStationName)){ + timeVO.setSectionCode("T580"); //7G + return; + } + + if("四惠东".equals(stationVO.getRunPlanName()) && "四惠东".equals(endStationName) && "四惠段一".equals(startStationName)){ + timeVO.setSectionCode("T576"); //8G(XC2&F4) + return; + } + + } +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine1RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine1RunPlanNew.java new file mode 100644 index 000000000..b8bf1879d --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine1RunPlanNew.java @@ -0,0 +1,262 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static com.joylink.ms.constants.BusinessConsts.RunPlan.DirectionType; + +@Slf4j +public class ChengDuLine1RunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport,upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + + }); + } + + /** + * 处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code) && (code.length() == 7)) { + runPlanImport.setServiceNumber(code.substring(0, 3)); + //成都一 中间两位为交路编号，暂取出来 + runPlanImport.setDestinationCode(code.substring(3,5)); + runPlanImport.setTripNumber(code.substring(5, 7)); + runPlanImport.setDirectionCode(Integer.parseInt(runPlanImport.getTripNumber()) % 2 == 0 ? DirectionType.Type02 : DirectionType.Type01); + setRunPlanDirec(runPlanImport, upDirection); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + } + + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { + if (isFirst) { + switch (startStationName) { + case "韦家碾": + tripVO.setStartSectionCode("Section_158_0.23801"); //T2006 + break; + case "科学城": + tripVO.setStartSectionCode("Section_653_0.67717");//T5413 + break; + } + switch (endStationName) { + case "韦家碾": + tripVO.setEndSectionCode("Section_160_0.28263");//T2001 + break; + case "广都": + tripVO.setEndSectionCode("Section_491_0.29548"); //T4201 + break; + case "四河": + tripVO.setEndSectionCode("Section_463_0.38957");//T4011 + break; + case "科学城": + tripVO.setEndSectionCode("Section_655_0.16092");//T5402 + break; + case "升仙湖": + tripVO.setEndSectionCode("Section_207_0.09436");//T2108 + break; + } + } else if (isLast) { + switch (startStationName) { + case "四河": + tripVO.setStartSectionCode("Section_465_0.40160"); //T4120 + break; + case "韦家碾": + tripVO.setStartSectionCode("Section_160_0.28263");//T2001 + break; + case "科学城": + tripVO.setStartSectionCode("Section_655_0.16092"); //T5402 + break; + case "升仙湖": + tripVO.setStartSectionCode("Section_218_0.83128"); //T2113 + break; + case "广都": + tripVO.setStartSectionCode("Section_488_0.19422"); //T4212 + break; + } + switch (endStationName) { + case "韦家碾": + tripVO.setEndSectionCode("Section_158_0.23801"); //T2006 + break; + case "科学城": + tripVO.setEndSectionCode("Section_653_0.67717");//T5413 + break; + } + + } else { + switch (startStationName) { + case "韦家碾": + tripVO.setStartSectionCode("Section_160_0.28263");//T2001 + break; + case "广都": + tripVO.setStartSectionCode("Section_491_0.29548"); //T4201 + break; + case "科学城": + tripVO.setStartSectionCode("Section_655_0.16092"); //T5402 + break; + case "四河": + tripVO.setStartSectionCode("Section_463_0.38957");//T4011 + break; + case "升仙湖": + tripVO.setStartSectionCode("Section_207_0.09436"); //T2108 + break; + } + switch (endStationName) { + case "韦家碾": + tripVO.setEndSectionCode("Section_160_0.28263");//T2001 + break; + case "科学城": + tripVO.setEndSectionCode("Section_655_0.16092"); //T5402 + break; + case "四河": + tripVO.setEndSectionCode("Section_465_0.40160"); //T4120 + break; + case "升仙湖": + tripVO.setEndSectionCode("Section_218_0.83128"); //T2113 + break; + case "广都": + tripVO.setEndSectionCode("Section_488_0.19422"); //T4212 + break; + } + } + + if (startStationName.equals("五根松")) { + tripVO.setStartSectionCode("Section_525_0.58212"); //T4302 + } + if (endStationName.equals("五根松")) { + tripVO.setEndSectionCode("Section_525_0.58212"); //T4302 + } + if (startStationName.equals("停车场-出")) { + tripVO.setStartSectionCode("Section_498_0.75988");//T4202 + } + if (endStationName.equals("停车场-出")) { + tripVO.setEndSectionCode("Section_498_0.75988");//T4202 + } + if (startStationName.equals("停车场-入")) { + tripVO.setStartSectionCode("Section_504_0.35184");//T4211 + } + if (endStationName.equals("停车场-入")) { + tripVO.setEndSectionCode("Section_504_0.35184");//T4211 + } + if (startStationName.equals("转换轨-入")) { + tripVO.setStartSectionCode("Section_186_0.21668");//2118 + } + if (endStationName.equals("转换轨-入")) { + tripVO.setEndSectionCode("Section_186_0.21668");//T2118 + } + if (endStationName.equals("转换轨-出")) { + tripVO.setEndSectionCode("Section_191_0.29702");//T2101 + } + if (startStationName.equals("转换轨-出")) { + tripVO.setStartSectionCode("Section_191_0.29702");//T2101 + } + + //特别车次 + if("1220105".equals(runPlanImport.getCode())){ + tripVO.setIsBackUp(true); + tripVO.setEndSectionCode("Section_653_0.67717");//T5413 + } + if("1228806".equals(runPlanImport.getCode())){ + tripVO.setStartSectionCode("Section_653_0.67717");//T5413 + } + } + + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + if ("停车场-出".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode("Section_498_0.75988");//T4202 + return; + } + if ("停车场-入".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode("Section_504_0.35184");//T4211 + return; + } + if ("转换轨-入".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode("Section_186_0.21668");//T2118 + return; + } + if ("转换轨-出".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode("Section_191_0.29702");//T2101 + return; + } + //四河考虑向右行驶场景 + if ("四河".equals(stationVO.getRunPlanName()) && runPlanImport.isRight()) { + if("科学城".equals(endStationName)){ + timeVO.setSectionCode("Section_456_0.52395");//T4113 + }else if("五根松".equals(endStationName) || "停车场-入".equals(endStationName)){ + timeVO.setSectionCode("Section_478_0.28426");//T4115 + }else if("停车场-出".equals(endStationName)){ + timeVO.setSectionCode("Section_468_0.96448");//T4112 + } + return; + } + //四河向左行驶场景 + if ("四河".equals(stationVO.getRunPlanName()) && !runPlanImport.isRight() ) { +// if(("韦家碾".equals(endStationName) && !"五根松".equals(startStationName)) ||("四河".equals(endStationName) && "科学城".equals(startStationName)) ){ + if("科学城".equals(startStationName)){ + timeVO.setSectionCode("Section_453_0.94176"); //T4114 + }else if("五根松".equals(startStationName) || "停车场-出".equals(startStationName)){ + timeVO.setSectionCode("Section_468_0.96448"); //T4112 + }else if("停车场-入".equals(startStationName)){ + timeVO.setSectionCode("Section_478_0.28426"); //T4115 + } + +// else{ +// timeVO.setSectionCode("Section_468_0.96448"); //T4112 +// } + return; + } + + //广都向左行驶场景 + if("广都".equals(stationVO.getRunPlanName()) && !runPlanImport.isRight()){ + if("停车场-入".equals(startStationName)){ + timeVO.setSectionCode("Section_491_0.29548"); //T4201 + } + return; + } + if("广都".equals(stationVO.getRunPlanName()) && runPlanImport.isRight()){ + if("停车场-出".equals(endStationName)){ + timeVO.setSectionCode("Section_488_0.19422"); //T4212 + } + return; + } + if(runPlanImport.getCode().equals("1236201") && "升仙湖".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode("Section_207_0.09436");//T2108 + return; + } + if(Arrays.asList("1766308","1846308","1856308","1056320","1266318","1786310","1636312","1666312","1126320","1346318","1756310").contains(runPlanImport.getCode()) && "升仙湖".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode("Section_218_0.83128"); //T2113 + return; + } + } +} + diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine3RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine3RunPlanNew.java new file mode 100644 index 000000000..00eca528a --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/ChengDuLine3RunPlanNew.java @@ -0,0 +1,169 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +public class ChengDuLine3RunPlanNew implements IRunPlanStrategyNew { + /** + * 导入数据检查和预处理 + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + Map stationMap = stationList.stream() + .collect(Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + if(Arrays.asList("85331301","85124302","85246602").contains(runPlanImport.getCode())) { + runPlanImport.setBackup(true); + } + }); + } + + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if(StringUtils.isNotBlank(code)) { + String serviceNumber; + String directionCode; + String tripNumber; + String destinationCode; + if(code.length() == 8) { + serviceNumber = code.substring(0, 3); + destinationCode = code.substring(3, 6); + tripNumber = code.substring(6, 8); + directionCode = Integer.parseInt(tripNumber) % 2 == 0 ? "2" : "1"; + }else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); + } + runPlanImport.setServiceNumber(serviceNumber); + runPlanImport.setDirectionCode(directionCode); + setRunPlanDirec(runPlanImport, upDirection); + runPlanImport.setTripNumber(tripNumber); + runPlanImport.setDestinationCode(destinationCode); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); + } + } + + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName , String finalStationName) { + if(isFirst) { + switch (startStationName) { + case "板桥停车场" : + tripVO.setStartSectionCode("T12"); // T1004 + return; + case "转换轨1" : + tripVO.setStartSectionCode("T421"); // T3704 + return; + case "转换轨2" : + tripVO.setStartSectionCode("T378"); // T3628 + return; + case "成都医学院站" : + tripVO.setStartSectionCode("T549"); // T4618 + return; + } + } + +// //龙桥路折返 +// if("龙桥路站".equals(startStationName) || "龙桥路站".equals(endStationName)){ +// tripVO.setStartSectionCode("T00"); // T1612 +// return; +// } +// if("龙桥路站".equals(endStationName) ){ +// tripVO.setStartSectionCode("T00"); // T1612 +// } + + } + + @Override + public void handleTripTime(RunPlanTripTimeVO tripTimeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + + if("转换轨2".equals(stationVO.getRunPlanName())){ + tripTimeVO.setSectionCode("T378");//T3628 + return; + } + if("转换轨1".equals(stationVO.getRunPlanName())){ + tripTimeVO.setSectionCode("T421");//T3704 + return; + } + if("板桥停车场".equals(stationVO.getRunPlanName())){ + tripTimeVO.setSectionCode(runPlanImport.isRight()?"T12":"T3");//T1004:T1019 + return; + } + + //带小站台先特别设置 + if("双流西站".equals(stationVO.getRunPlanName())){ + tripTimeVO.setSectionCode(runPlanImport.isRight()?"T35":"T30");//T35->T1012;T30->T1011 + return; + } + if ("迎春桥站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T81" : "T71");//T81->T1418;T71->T1405 + return; + } + if ("龙桥路站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T120" : "T112");//T120->T1614;T112->T1613 + return; + } + if ("武青南路站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T143" : "T133");//T143->T1806;T133->T1815 + return; + } + if ("太平园站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T166" : "T163");//T166->T2112;T163->T2111 + return; + } + if ("衣冠庙站".equals(stationVO.getRunPlanName())) { + if("85124302".equals(runPlanImport.getCode())){ + tripTimeVO.setSectionCode("T214");//T214->T2414 + }else{ + + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T203" : "T195");//T203->T2416;T195->T2423 + } + + return; + } + if ("市二医院站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T253" : "T247");//T253->T3112;T247->T3129 + return; + } + if ("前锋路站".equals(stationVO.getRunPlanName())) { + if("85331301".equals(runPlanImport.getCode())){ + tripTimeVO.setSectionCode("T280");//T280->T3126 + }else { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T265" : "T262");//T265->T3124;T262->T3117 + } + return; + } + if ("李家沱站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T323" : "T273");//T323->T3132;T273->T3109 + return; + } + if ("昭觉寺南路站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T336" : "T342");//T336->T3606;T342->T3615 + return; + } + if ("军区总医院站".equals(stationVO.getRunPlanName())) { + tripTimeVO.setSectionCode(runPlanImport.isRight() ? "T384" : "T393");//T384->T3716;T393->T3705 + return; + } + + } +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/DefaultRunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/DefaultRunPlanNew.java new file mode 100644 index 000000000..1c61b0aa7 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/DefaultRunPlanNew.java @@ -0,0 +1,38 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; + +import java.util.List; + +@Slf4j +public class DefaultRunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + + } + + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + + } + + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName , String finalStationName) { + + } + + @Override + public void handleTripTime(RunPlanTripTimeVO tripTimeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + + } +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FoshanTramRunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FoshanTramRunPlanNew.java new file mode 100644 index 000000000..75425a779 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FoshanTramRunPlanNew.java @@ -0,0 +1,128 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static com.joylink.ms.constants.BusinessConsts.RunPlan.DirectionType; + +@Slf4j +public class FoshanTramRunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + //获取：车站运行图实际名称——>车站信息 + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + //处理导入运行图数据信息 + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + + }); + } + + /** + * 根据导入code处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code) && (code.length() == 5)) { + runPlanImport.setServiceNumber(code.substring(0, 3)); + runPlanImport.setTripNumber(code.substring(3, 5)); + runPlanImport.setDirectionCode(Integer.parseInt(runPlanImport.getTripNumber()) % 2 == 0 ? DirectionType.Type02 : DirectionType.Type01); + //目的地号目前没有先设置为XXX + setRunPlanDirec(runPlanImport, upDirection); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + } + + /** + * 处理单个车次 + */ + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { + + switch (startStationName) { + case "环岛车辆段": + tripVO.setStartSectionCode("T192");//ZHG2 + tripVO.setDestinationCode("BA"); + break; + case "三山新城北": + tripVO.setStartSectionCode("T142"); //G3010 + tripVO.setDestinationCode("BC"); + break; + case "林岳北": + tripVO.setStartSectionCode("T211"); //G3203 + tripVO.setDestinationCode("BF"); + break; + case "雷岗": + tripVO.setStartSectionCode("T39"); //G2103 + tripVO.setDestinationCode("AB"); + break; + } + switch (endStationName) { + case "环岛车辆段": + tripVO.setEndSectionCode("T187");//ZHG1 + tripVO.setDestinationCode("BB"); + break; + case "三山新城北": + tripVO.setEndSectionCode("T142"); //G3010 + tripVO.setDestinationCode("BC"); + break; + case "林岳北": + tripVO.setEndSectionCode("T211"); //G3203 + tripVO.setDestinationCode("BF"); + break; + case "雷岗": + tripVO.setEndSectionCode("T39"); //G2103 + tripVO.setDestinationCode("AB"); + break; + } + } + + /** + * 处理一个车次的时刻信息 + */ + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + if ("环岛车辆段".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T192" : "T187");//ZHG2/ZHG1 + return; + } + if ("林岳北".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode("T211");//G3203 + return; + } + if ("雷岗".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode("T39");//G2103 + return; + } + + if ("三山新城北".equals(stationVO.getRunPlanName()) && "三山新城北".equals(endStationName)) { + timeVO.setSectionCode("T142");//G3010 + return; + } + } +} + diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FuZhouLine1RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FuZhouLine1RunPlanNew.java new file mode 100644 index 000000000..06a561cde --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/FuZhouLine1RunPlanNew.java @@ -0,0 +1,308 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +public class FuZhouLine1RunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { +// List backupServerNoList = new ArrayList<>(); + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); +// runPlanImportList.removeIf(runPlanImport -> runPlanImport.getCode().startsWith("81")); //旧版 + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + // 判断是否备用计划 +// RunPlanArrivalTime last = arrivalList.get(arrivalList.size() - 1); +// if(!last.isFlag() && last.getArriveTime().equals(last.getDepartureTime())) { +// backupServerNoList.add(runPlanImport.getServiceNumber()); +// } + if (runPlanImport.getServiceNumber().startsWith("81") + || runPlanImport.getServiceNumber().startsWith("82") + || runPlanImport.getServiceNumber().startsWith("91") + || runPlanImport.getServiceNumber().startsWith("92")) { + runPlanImport.setBackup(true); + } else { + runPlanImport.setBackup(false); + } + }); +// // 备用计划标识 +// if(!CollectionUtils.isEmpty(backupServerNoList)) { +// runPlanImportList.forEach(runPlanImport -> { +// if(backupServerNoList.contains(runPlanImport.getServiceNumber())) { +// runPlanImport.setBackup(true); +// } +// }); +// } + } + + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code) && code.length() == 6) { + runPlanImport.setServiceNumber(code.substring(0, 2)); + String directionCode = code.substring(2, 3); + runPlanImport.setDirectionCode(directionCode); + setRunPlanDirec(runPlanImport, upDirection); + runPlanImport.setTripNumber(code.substring(2, 6)); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL); + } + } + + + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { + if (runPlanImport.isBackup()) { // 备用车 + if (startStationName.equals("南门兜") || endStationName.equals("南门兜")) { + if (runPlanImport.isRight()) { + tripVO.setDestinationCode("091"); // TA0915 + } else { + tripVO.setDestinationCode("011"); // TA0101 + } + } else if (startStationName.equals("火车南站") || endStationName.equals("火车南站")) { + if (runPlanImport.isRight()) { + tripVO.setDestinationCode("219"); // TA2125 + tripVO.setEndSectionCode("T305"); // TA2125 + tripVO.setStartSectionCode("T846"); //TA2114 + } else { + tripVO.setDestinationCode("211"); // TA2113 + tripVO.setStartSectionCode("T305"); //TA2125 + tripVO.setEndSectionCode("T845"); //TA2113 + } + } else if (startStationName.equals("象峰") || endStationName.equals("象峰")) { + if (runPlanImport.isRight()) { + tripVO.setDestinationCode("012"); // TA0108 + tripVO.setEndSectionCode("T10"); // TA0108 + tripVO.setStartSectionCode("T4"); //TA0102 + } else { + tripVO.setDestinationCode("010"); // TA0102 + tripVO.setEndSectionCode("T4"); //TA0102 + tripVO.setStartSectionCode("T10"); // TA0108 + } + } + } else { + + switch (endStationName) { + case "火车南站": + tripVO.setDestinationCode("218"); //TA2126 + break; + case "南门兜": + tripVO.setDestinationCode("093");//TA0909 + break; + case "象峰": + tripVO.setDestinationCode("013");//TA0107 + break; + case "三叉街": + tripVO.setDestinationCode(runPlanImport.isRight() ? "134" : "130");//TA1318:TA1304 + break; + case "三江口": + tripVO.setDestinationCode("253");//TA2507 + break; + } + + + switch (startStationName) { + case "火车南站": + tripVO.setStartSectionCode("T299"); //TA2126 + break; + case "南门兜": + tripVO.setStartSectionCode("T134");//TA0909 + break; + case "象峰": + tripVO.setStartSectionCode("T9");//TA0107 + break; + case "三叉街": + tripVO.setStartSectionCode(runPlanImport.isRight() ? "T171" : "T189");//TA1304:TA1318 + break; + case "三江口": + tripVO.setStartSectionCode("T962");//TA2507 + break; + } + + if (isLast) { + switch (endStationName) { + case "新店": + tripVO.setDestinationCode("011"); // TA0101 + break; + case "清凉山": + tripVO.setDestinationCode("211"); // TA2113 + break; + } + } + if (isFirst) { + switch (startStationName) { + case "新店": + tripVO.setStartSectionCode("T3"); // TA0101 + break; + case "清凉山": + tripVO.setStartSectionCode("T846"); // TA2114 + break; + } + } + } + + + //旧备份 +// if(runPlanImport.isBackup()) { // 备用车 +// if(startStationName.equals("南门兜") || endStationName.equals("南门兜")) { +// if(runPlanImport.isRight()) { +// tripVO.setDestinationCode("095"); // TA0915 +//// tripVO.setStartSectionCode("Section_20_0.03642"); // TA0102 +//// tripVO.setEndSectionCode("Section_81_0.49806"); // TA0915 +// }else { +// tripVO.setDestinationCode("011"); // TA0101 +//// tripVO.setStartSectionCode("Section_81_0.49806"); // TA0915 +//// tripVO.setEndSectionCode("Section_2_0.08596"); // TA0101 +// } +// } else if (startStationName.equals("福州火车南") || endStationName.equals("福州火车南")) { +// if (runPlanImport.isRight()) { +//// tripVO.setDestinationCode("215"); // TA2103 TA2107 +//// tripVO.setStartSectionCode("Section_87_0.94704"); // TA2114 +// tripVO.setEndSectionCode("T286"); // TA2107 +// } else { +// tripVO.setDestinationCode("211"); // TA2113 +// tripVO.setStartSectionCode("T286"); // TA2107 +//// tripVO.setEndSectionCode("Section_83_0.54306"); // TA2113 +// } +// } +// }else { +// +// +// switch (endStationName) { +// case "福州火车南": +// tripVO.setDestinationCode("218"); //TA2126 +// break; +// case "南门兜": +// tripVO.setDestinationCode("093");//TA0909 +// break; +// case "象峰": +// tripVO.setDestinationCode("013");//TA0107 +// break; +// +// } +// +// +// switch (startStationName) { +// case "福州火车南": +// tripVO.setStartSectionCode("T299"); //TA2126 +// break; +// case "南门兜": +// tripVO.setStartSectionCode("T134");//TA0909 +// break; +// case "象峰": +// tripVO.setStartSectionCode("T9");//TA0107 +// break; +// } +//// if(runPlanImport.getDirectionCode().equals("1")) { // 下行 +////// tripVO.setDestinationCode("013"); // TA0107 +////// tripVO.setStartSectionCode("Section_140_0.48703"); // TA2125 +////// tripVO.setEndSectionCode("Section_11_0.73616"); // TA0107 +//// switch (runPlanImport.getDownTrack()){ +//// case "TA0107": +//// tripVO.setDestinationCode("013"); +//// break; +//// case "TA0108": +//// tripVO.setDestinationCode("012"); +//// break; +//// } +//// }else if(runPlanImport.getDirectionCode().equals("2")) { // 上行 +////// tripVO.setDestinationCode("219"); // TA2125 +////// tripVO.setStartSectionCode("Section_11_0.73616"); // TA0107 +////// tripVO.setEndSectionCode("Section_140_0.48703"); // TA2125 +//// switch (runPlanImport.getUpTrack()){ +//// case "TA2125": +//// tripVO.setDestinationCode("219"); +//// break; +//// case "TA2126": +//// tripVO.setDestinationCode("218"); +//// break; +//// } +// +// } +// if(isLast) { +// switch (endStationName) { +// case "新店转换轨" : +// tripVO.setDestinationCode("011"); // TA0101 +// break; +// case "清凉山转换轨" : +// tripVO.setDestinationCode("211"); // TA2113 +// break; +// } +// } +// if(isFirst) { +// switch (startStationName) { +// case "新店转换轨" : +// tripVO.setStartSectionCode("T4"); // TA0102 +// break; +// case "清凉山转换轨" : +// tripVO.setStartSectionCode("T846"); // TA2114 +// break; +// } +// } + } + + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + + if (stationVO.getRunPlanName().equals("新店")) { // 车辆段 + timeVO.setSectionCode(runPlanImport.isBackup() ? "T4" : "T3"); // TA0102:TA0101 + return; + } + + if (stationVO.getRunPlanName().equals("清凉山")) { // 停车场 + timeVO.setSectionCode(runPlanImport.isRight() ? "T846" : "T845"); // TA2114:TA2113 + return; + } + + if (!runPlanImport.isBackup() && stationVO.getRunPlanName().equals("南门兜") && endStationName.equals("南门兜")) { + timeVO.setSectionCode("T134"); // TA0909 + return; + } + + if (!runPlanImport.isBackup() && stationVO.getRunPlanName().equals("三叉街") && endStationName.equals("三叉街")) { + timeVO.setSectionCode("T171"); // TA1304 + return; + } + + if (!runPlanImport.isBackup() && stationVO.getRunPlanName().equals("火车南站") && endStationName.equals("火车南站")) { + timeVO.setSectionCode("T283"); // TA2104 + return; + } + +// 旧 +// if(runPlanImport.getCode().equals("812001") && stationVO.getRunPlanName().equals("福州火车南")) { // 福州火车站 备用车 +// timeVO.setSectionCode("T282"); // TA2103 +// } +// +// if(stationVO.getRunPlanName().equals("新店转换轨")) { // 车辆段 +// timeVO.setSectionCode(runPlanImport.isRight()?"T4":"T3"); // TA0102:TA0101 +// } +// +// if(stationVO.getRunPlanName().equals("清凉山转换轨")) { // 停车场 +// timeVO.setSectionCode(runPlanImport.isRight()?"T846":"T845"); // TA2114:TA2113 +// } + } +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/HarBinLine1RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/HarBinLine1RunPlanNew.java new file mode 100644 index 000000000..d6bd087ab --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/HarBinLine1RunPlanNew.java @@ -0,0 +1,252 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static com.joylink.ms.constants.BusinessConsts.RunPlan.DirectionType; + +@Slf4j +public class HarBinLine1RunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + //获取：车站运行图实际名称——>车站信息 + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + //处理导入运行图数据信息 + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport,upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + + }); + } + + /** + * 根据导入code处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code) && (code.length() == 8)) { + runPlanImport.setDestinationCode(code.substring(0,3)); + runPlanImport.setServiceNumber(code.substring(3, 6)); + runPlanImport.setTripNumber(code.substring(6, 8)); + runPlanImport.setDirectionCode(Integer.parseInt(runPlanImport.getTripNumber()) % 2 == 0 ? DirectionType.Type02 : DirectionType.Type01); + setRunPlanDirec(runPlanImport, upDirection); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + } + + /**处理单个车次*/ + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { +// if (isFirst) { +// switch (startStationName) { +// case "韦家碾": +// tripVO.setStartSectionCode("Section_158_0.23801"); //T2006 +// break; +// case "科学城": +// tripVO.setStartSectionCode("Section_653_0.67717");//T5413 +// break; +// } +// switch (endStationName) { +// case "韦家碾": +// tripVO.setEndSectionCode("Section_171_0.65228");//T2004 +// break; +// case "广都": +// tripVO.setEndSectionCode("Section_491_0.29548"); //T4201 +// break; +// case "四河": +// tripVO.setEndSectionCode("Section_478_0.28426");//T4115 +// break; +// case "科学城": +// tripVO.setEndSectionCode("Section_653_0.67717");//T5413 +// break; +// case "升仙湖": +// tripVO.setEndSectionCode("Section_207_0.09436");//T2108 +// break; +// } +// } else if (isLast) { +// switch (startStationName) { +// case "四河": +// tripVO.setStartSectionCode("Section_468_0.96448"); //T4112 +// break; +// case "韦家碾": +// tripVO.setStartSectionCode("Section_160_0.28263");//T2001 +// break; +// case "科学城": +// tripVO.setStartSectionCode("Section_655_0.16092"); //T5402 +// break; +// case "升仙湖": +// tripVO.setStartSectionCode("Section_218_0.83128"); //T2113 +// break; +// case "广都": +// tripVO.setStartSectionCode("Section_488_0.19422"); //T4212 +// break; +// } +// switch (endStationName) { +// case "韦家碾": +// tripVO.setEndSectionCode("Section_158_0.23801"); //T2006 +// break; +// case "科学城": +// tripVO.setEndSectionCode("Section_653_0.67717");//T5413 +// break; +// } +// +// } else { +// switch (startStationName) { +// case "韦家碾": +// tripVO.setStartSectionCode("Section_160_0.28263");//T2001 +// break; +// case "广都": +// tripVO.setStartSectionCode("Section_491_0.29548"); //T4201 +// break; +// case "科学城": +// tripVO.setStartSectionCode("Section_655_0.16092"); //T5402 +// break; +// case "四河": +// tripVO.setStartSectionCode("Section_456_0.52395"); //T4113 +// break; +// case "升仙湖": +// tripVO.setStartSectionCode("Section_207_0.09436"); //T2108 +// break; +// } +// switch (endStationName) { +// case "韦家碾": +// tripVO.setEndSectionCode("Section_171_0.65228");//T2004 +// break; +// case "科学城": +// tripVO.setEndSectionCode("Section_640_0.82304"); //T5411 +// break; +// case "四河": +// tripVO.setEndSectionCode("Section_453_0.94176"); //T4114 +// break; +// case "升仙湖": +// tripVO.setEndSectionCode("Section_218_0.83128"); //T2113 +// break; +// } +// } +// +// if (startStationName.equals("五根松")) { +// tripVO.setStartSectionCode("Section_517_0.75143"); //T4304 +// } +// if (endStationName.equals("五根松")) { +// tripVO.setEndSectionCode("Section_522_0.47810"); //T4303 +// } +// if (startStationName.equals("停车场-出")) { +// tripVO.setStartSectionCode("Section_498_0.75988");//T4202 +// } +// if (endStationName.equals("停车场-出")) { +// tripVO.setEndSectionCode("Section_498_0.75988");//T4202 +// } +// if (startStationName.equals("停车场-入")) { +// tripVO.setStartSectionCode("Section_504_0.35184");//T4211 +// } +// if (endStationName.equals("停车场-入")) { +// tripVO.setEndSectionCode("Section_504_0.35184");//T4211 +// } +// if (startStationName.equals("转换轨-入")) { +// tripVO.setStartSectionCode("Section_186_0.21668");//2118 +// } +// if (endStationName.equals("转换轨-入")) { +// tripVO.setEndSectionCode("Section_186_0.21668");//T2118 +// } +// if (endStationName.equals("转换轨-出")) { +// tripVO.setEndSectionCode("Section_191_0.29702");//T2101 +// } +// if (startStationName.equals("转换轨-出")) { +// tripVO.setStartSectionCode("Section_191_0.29702");//T2101 +// } + } + + /**处理一个车次的时刻信息*/ + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { +// if ("停车场-出".equals(stationVO.getRunPlanName())) { +// timeVO.setSectionCode("Section_498_0.75988");//T4202 +// return; +// } +// if ("停车场-入".equals(stationVO.getRunPlanName())) { +// timeVO.setSectionCode("Section_504_0.35184");//T4211 +// return; +// } +// if ("转换轨-入".equals(stationVO.getRunPlanName())) { +// timeVO.setSectionCode("Section_186_0.21668");//T2118 +// return; +// } +// if ("转换轨-出".equals(stationVO.getRunPlanName())) { +// timeVO.setSectionCode("Section_191_0.29702");//T2101 +// return; +// } +// //四河考虑向右行驶场景 +// if ("四河".equals(stationVO.getRunPlanName()) && runPlanImport.isRight()) { +// if("科学城".equals(endStationName)){ +// timeVO.setSectionCode("Section_456_0.52395");//T4113 +// }else if("五根松".equals(endStationName) || "停车场-入".equals(endStationName)){ +// timeVO.setSectionCode("Section_478_0.28426");//T4115 +// }else if("停车场-出".equals(endStationName)){ +// timeVO.setSectionCode("Section_468_0.96448");//T4112 +// } +// return; +// } +// //四河向左行驶场景 +// if ("四河".equals(stationVO.getRunPlanName()) && !runPlanImport.isRight() ) { +//// if(("韦家碾".equals(endStationName) && !"五根松".equals(startStationName)) ||("四河".equals(endStationName) && "科学城".equals(startStationName)) ){ +// if("科学城".equals(startStationName)){ +// timeVO.setSectionCode("Section_453_0.94176"); //T4114 +// }else if("五根松".equals(startStationName) || "停车场-出".equals(startStationName)){ +// timeVO.setSectionCode("Section_468_0.96448"); //T4112 +// }else if("停车场-入".equals(startStationName)){ +// timeVO.setSectionCode("Section_478_0.28426"); //T4115 +// } +// +//// else{ +//// timeVO.setSectionCode("Section_468_0.96448"); //T4112 +//// } +// return; +// } +// +// //广都向左行驶场景 +// if("广都".equals(stationVO.getRunPlanName()) && !runPlanImport.isRight()){ +// if("停车场-入".equals(startStationName)){ +// timeVO.setSectionCode("Section_491_0.29548"); //T4201 +// } +// return; +// } +// if("广都".equals(stationVO.getRunPlanName()) && runPlanImport.isRight()){ +// if("停车场-出".equals(endStationName)){ +// timeVO.setSectionCode("Section_488_0.19422"); //T4212 +// } +// return; +// } +// if(runPlanImport.getCode().equals("1236201") && "升仙湖".equals(stationVO.getRunPlanName())){ +// timeVO.setSectionCode("Section_207_0.09436");//T2108 +// return; +// } +// if(Arrays.asList("1766308","1846308","1856308","1056320","1266318","1786310","1636312","1666312","1126320","1346318","1756310").contains(runPlanImport.getCode()) && "升仙湖".equals(stationVO.getRunPlanName())){ +// timeVO.setSectionCode("Section_218_0.83128"); //T2113 +// return; +// } + } +} + diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/IRunPlanStrategyNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/IRunPlanStrategyNew.java new file mode 100644 index 000000000..48217f371 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/IRunPlanStrategyNew.java @@ -0,0 +1,226 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import club.joylink.rtss.constants.BusinessConsts; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.vo.client.map.newmap.MapSectionNewVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO; +import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO; +import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime; +import club.joylink.rtss.vo.client.runplan.RunPlanImport; +import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripVO; +import org.springframework.util.StringUtils; + +import java.util.*; +import java.util.stream.Collectors; + +public interface IRunPlanStrategyNew { + + /** + * 运行图保存时间偏移量（2小时） + */ + int OFFSET_TIME_HOURS = 2; + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection); + + /** + * 分析并转换code + * + * @param runPlanImport + */ + void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection); + + default void setRunPlanDirec(RunPlanImport runPlanImport, String upDirection) { + if(runPlanImport.isUp()){ + if (BusinessConsts.RealLine.Direction.RIGHT.equals(upDirection)) { + runPlanImport.setRight(true); + } else { + runPlanImport.setRight(false); + } + }else{ + if (BusinessConsts.RealLine.Direction.RIGHT.equals(upDirection)) { + runPlanImport.setRight(false); + } else { + runPlanImport.setRight(true); + } + } + } + + /** + * 处理车次数据 + * + * @param runPlanImport + * @param tripVO + * @param startStationName + * @param endStationName + * @param isFirst + * @param isLast + */ + void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName); + + /** + * 处理车次时刻数据 + * + * @param tripTimeVO + * @param runPlanImport + * @param stationVO + */ + void handleTripTime(RunPlanTripTimeVO tripTimeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName); + + /** + * 导入数据处理 + * + * @param runPlanImportList + * @param sectionMap + */ + default List parseRunPlanImport(List runPlanImportList, Map sectionMap, String upDirection) { + List tripList = new ArrayList<>(); + // 导入数据根据服务号分组 + Map> serviceNumberMap = runPlanImportList.stream() + .collect(Collectors.groupingBy(RunPlanImport::getServiceNumber, LinkedHashMap::new, Collectors.toList())); + serviceNumberMap.forEach((serviceNumber, importList) -> { + // 排序 + importList.sort(Comparator.comparing(runPlanImport -> runPlanImport.getArrivalList().get(0).getArriveTime())); + List tempTripList = new ArrayList<>(20); + + // 一个服务号的启程车站和终点车站,判断特殊出入库和折返的 + String firstStationName = null; + String finalStationName = null; + for (int i = 0; i < importList.size(); i++) { + RunPlanImport runPlanImport = importList.get(i); + List arrivalList = runPlanImport.getArrivalList(); + // 构建车次信息 + RunPlanTripVO tripVO = new RunPlanTripVO(runPlanImport); + tripVO.setIsBackUp(runPlanImport.isBackup()); + if (i == 0) { // 出库 + tripVO.setIsOutbound(true); + firstStationName = arrivalList.get(0).getStationName(); + } else { + MapSectionNewVO section = sectionMap.get(tempTripList.get(i - 1).getDestinationCode()); + if (Objects.nonNull(section)) { + tripVO.setStartSectionCode(section.getCode()); + if (section.isTransferTrack()) { + tripVO.setIsOutbound(true); + } + } + tripVO.setIsOutbound(false); + } + if (i == importList.size() - 1) { // 入库 + tripVO.setIsInbound(true); + tripVO.setIsReentry(false); + finalStationName = arrivalList.get(arrivalList.size()-1).getStationName(); + } else { + tripVO.setIsInbound(false); + tripVO.setIsReentry(true); + } + String startStationName = arrivalList.get(0).getStationNewVO().getRunPlanName(); + String endStationName = arrivalList.get(arrivalList.size() - 1).getStationNewVO().getRunPlanName(); + handleTrip(runPlanImport, tripVO, startStationName, endStationName, i == 0, i == importList.size() - 1,firstStationName,finalStationName); + for (RunPlanArrivalTime arrivalTime : arrivalList) { + // 构建到站信息 + RunPlanTripTimeVO timeVO = new RunPlanTripTimeVO(arrivalTime); + tripVO.addTime(timeVO); + MapStationNewVO stationVO = arrivalTime.getStationNewVO(); + for (MapStationStandNewVO standVO : stationVO.getStandList()) { + //先排除小站台，特别停车情况单线设置 + if (!standVO.isSmall() && isSameDirection(runPlanImport, standVO)) { //没有特殊站概念，先去掉判断 BusinessConsts.RunPlan.StationType.Type03.equals(standVO.getDirection() + timeVO.setSectionCode(standVO.getStandTrackCode()); + break; + } + } + handleTripTime(timeVO, runPlanImport, arrivalTime.getStationNewVO(),startStationName,endStationName); + BusinessExceptionAssertEnum.DATA_ERROR.assertHasText(timeVO.getSectionCode(), + String.format("车站'%s'没有'%s'站台轨", stationVO.getName(), runPlanImport.isRight() ? "右行" : "左行")); + } + //运行数据没有确切目的地的情况 + if(StringUtils.hasText(tripVO.getDestinationCode())){ + MapSectionNewVO section = sectionMap.get(tripVO.getDestinationCode()); + if(Objects.nonNull(section)){ + tripVO.setEndSectionCode(section.getCode()); + if (section.isTransferTrack()) { + tripVO.setIsInbound(true); + tripVO.setIsReentry(false); + } + } + } + + //检查发车和终点区段是否设置 + BusinessExceptionAssertEnum.DATA_ERROR.assertNotNull(tripVO.getStartSectionCode(), + String.format("服务号'%s' 车次号'%s'没有出发轨", tripVO.getServiceNumber(),tripVO.getTripNumber())); + BusinessExceptionAssertEnum.DATA_ERROR.assertNotNull(tripVO.getEndSectionCode(), + String.format("服务号'%s' 车次号'%s'没有终点轨", tripVO.getServiceNumber(),tripVO.getTripNumber())); + //车次 起始区段和第一个到站区段相同，那么车次开始时间就是第一个车站到站时间 + if(Objects.equals(tripVO.getStartSectionCode(),tripVO.getTimeList().get(0).getSectionCode())){ + tripVO.setStartTime(tripVO.getTimeList().get(0).getArrivalTime()); + }else { + tripVO.setStartTime(tripVO.getTimeList().get(0).getArrivalTime().minusSeconds(40)); + } + //车次 结束区段和最后一个到站区段相同，那么车次结束时间就是最后一个车站到站时间 + if(Objects.equals(tripVO.getEndSectionCode(), tripVO.getTimeList().get(tripVO.getTimeList().size() - 1).getSectionCode())){ + tripVO.setEndTime(tripVO.getTimeList().get(tripVO.getTimeList().size() - 1).getDepartureTime()); + }else{ + tripVO.setEndTime(tripVO.getTimeList().get(tripVO.getTimeList().size() - 1).getDepartureTime().plusSeconds(40)); + } + + tempTripList.add(tripVO); + } + tripList.addAll(tempTripList); + }); + return tripList; + } + + /** + * 处理站台 stationName -> stationVO + * 处理时间 到发时间处理，偏移 + * 服务号按到站时间排序 + * + * @param stationMap + * @param arrivalList + */ + default void handleStationAndTime(Map stationMap, List arrivalList) { + arrivalList.forEach(runPlanArrivalTime -> { + // 站名查找车站对象 + String stationName = runPlanArrivalTime.getStationName().replaceAll("\r\n", ""); + MapStationNewVO mapStationVO = stationMap.get(stationName); + BusinessExceptionAssertEnum.DATA_ERROR.assertNotNull(mapStationVO, + String.format("真实运行图车站名称'%s'没有找到对应车站数据", stationName)); + runPlanArrivalTime.setStationNewVO(mapStationVO); + // 到发时间处理 + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertNotTrue(Objects.isNull(runPlanArrivalTime.getArriveTime()) && Objects.isNull(runPlanArrivalTime.getDepartureTime()), + String.format("数据异常：‘%s’到发时间都为空", stationName)); + if (Objects.nonNull(runPlanArrivalTime.getArriveTime())) { + runPlanArrivalTime.setArriveTime(runPlanArrivalTime.getArriveTime().minusHours(OFFSET_TIME_HOURS)); + } + if (Objects.nonNull(runPlanArrivalTime.getDepartureTime())) { + runPlanArrivalTime.setDepartureTime(runPlanArrivalTime.getDepartureTime().minusHours(OFFSET_TIME_HOURS)); + } + if (Objects.isNull(runPlanArrivalTime.getArriveTime())) { + runPlanArrivalTime.setArriveTime(runPlanArrivalTime.getDepartureTime()); + } else if (Objects.isNull(runPlanArrivalTime.getDepartureTime())) { + runPlanArrivalTime.setDepartureTime(runPlanArrivalTime.getArriveTime()); + } + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(runPlanArrivalTime.getArriveTime().isBefore(runPlanArrivalTime.getDepartureTime()), + String.format("数据异常：‘%s’到发时间异常", stationName)); + }); + // 按到达时间增序排序 + arrivalList.sort(Comparator.comparing(RunPlanArrivalTime::getArriveTime)); + } + + /** + * 判断车次和站台是否同方向 + * + * @param runPlanImport + * @param standVO + * @return + */ + default boolean isSameDirection(RunPlanImport runPlanImport, MapStationStandNewVO standVO) { + + return (runPlanImport.isRight() == standVO.isRight()); + } +} diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/NingBoLine1RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/NingBoLine1RunPlanNew.java new file mode 100644 index 000000000..230aeee8c --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/NingBoLine1RunPlanNew.java @@ -0,0 +1,209 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import static com.joylink.ms.constants.BusinessConsts.RunPlan.DirectionType; + +@Slf4j +public class NingBoLine1RunPlanNew implements IRunPlanStrategyNew { + + /**单次出库 进 折返线*/ + private static final List OUT2REENTRY_TRIP_CODES = Collections.unmodifiableList(Arrays.asList("0101", "0202", "13002")); + /**单次从折返线 入库*/ + private static final List REENTRY2IN_TRIP_CODES = Collections.unmodifiableList(Arrays.asList("12901")); + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + if(OUT2REENTRY_TRIP_CODES.contains(runPlanImport.getCode())){ + runPlanImport.setBackup(true); + } + }); + } + + /** + * 处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + //宁波一导入自带 目的地码 + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code) && (code.length() == 5 || code.length() == 4)) { + if (code.length() == 5) { + runPlanImport.setServiceNumber(code.substring(0, 3)); + runPlanImport.setTripNumber(code.substring(3, 5)); + runPlanImport.setDirectionCode(Integer.parseInt(runPlanImport.getTripNumber()) % 2 == 0 ? DirectionType.Type02 : DirectionType.Type01); + } else { + runPlanImport.setServiceNumber(code.substring(0, 2)); + runPlanImport.setTripNumber(code.substring(2, 4)); + runPlanImport.setDirectionCode(Integer.parseInt(runPlanImport.getTripNumber()) % 2 == 0 ? DirectionType.Type02 : DirectionType.Type01); + } + setRunPlanDirec(runPlanImport, upDirection); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + } + + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName , String finalStationName) { + + //同一服务号只有一车次 +// if (isFirst && isLast) { +// if(OUT2REENTRY_TRIP_CODES.contains(runPlanImport.getCode())){ +// tripVO.setIsInbound(false); +// tripVO.setIsReentry(true); +// tripVO.setIsBackUp(true); +// } +// if(REENTRY2IN_TRIP_CODES.contains(runPlanImport.getCode())){ +// tripVO.setIsOutbound(false); +// tripVO.setIsInbound(true); +// } +// }else{ +// //起点不是车库的话从其他服务号折返的；终点不是车库的话备用折返， +// } + + /*出入库折返设置*/ + + /*起终点 区段设置*/ + if (isFirst) { + switch (startStationName) { + case "天童庄车辆基地": + if (runPlanImport.isRight()) { + tripVO.setStartSectionCode("T331"); + } else { + tripVO.setStartSectionCode("T323"); + } + break; + case "朱塘村停车场": + tripVO.setStartSectionCode("T489"); + break; + case "石路头停车场": + tripVO.setStartSectionCode("T3"); + break; + } + } + if (isLast) { + switch (endStationName) { + case "天童庄车辆基地": + if (runPlanImport.isRight()) { + tripVO.setEndSectionCode("T331"); + } else { + tripVO.setEndSectionCode("T323"); + } + break; + case "朱塘村停车场": + tripVO.setEndSectionCode("T489"); + break; + case "石路头停车场": + tripVO.setEndSectionCode("T3"); + break; + } + } + + //仅一个车次 + if(isLast && isFirst){ + if( "霞浦站".equals(startStationName)){ + + if(runPlanImport.getCode().equals("12901")){ + tripVO.setStartSectionCode("T479"); + } + } + if( "霞浦站".equals(endStationName)){ + + if(runPlanImport.getCode().equals("13002")){ + tripVO.setEndSectionCode("T486"); + } + if(runPlanImport.getCode().equals("0202")){ + tripVO.setEndSectionCode("T479"); + } + } +// if( "高桥西站".equals(startStationName)) { +// tripVO.setStartSectionCode("T33"); +// } + if( "高桥西站".equals(endStationName)) { + tripVO.setEndSectionCode("T18"); + } + }else{ + + if( "霞浦站".equals(startStationName)){ + tripVO.setStartSectionCode("T486"); + } + if( "霞浦站".equals(endStationName)){ + tripVO.setEndSectionCode("T486"); + } + if( "高桥西站".equals(startStationName)) { + tripVO.setStartSectionCode("T6"); + } + if( "高桥西站".equals(endStationName)) { + tripVO.setEndSectionCode("T6"); + } + } + } + + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + //特殊站 特别设置站台轨 + if("天童庄车辆基地".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T331":"T323"); + return; + } + if("朱塘村停车场".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode("T489"); + return; + } + if("石路头停车场".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode("T3"); + return; + } + //有小站台，根据走向特别设置一下站台轨，线路同样情况时再抽出处理逻辑 + if("高桥西站".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T33":"T27"); + return; + } + if("梁祝站".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T64":"T57"); + return; + } + + if("望春桥站".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T97":"T90"); + return; + } + if("鼓楼站".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T175":"T158"); + return; + } + if("世纪大道站".equals(stationVO.getRunPlanName())){ + timeVO.setSectionCode(runPlanImport.isRight()?"T285":"T276"); + return; + } + + } +} + diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine1RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine1RunPlanNew.java new file mode 100644 index 000000000..40b3b4198 --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine1RunPlanNew.java @@ -0,0 +1,155 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO; +import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime; +import club.joylink.rtss.vo.client.runplan.RunPlanImport; +import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +public class XianLine1RunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + //获取：车站运行图实际名称——>车站信息 + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + //处理导入运行图数据信息 + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + + }); + } + + /** + * 根据导入code处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertHasText(code); + if (code.length() == 5) { + runPlanImport.setServiceNumber(String.format("0%s", code.substring(0, 1))); + runPlanImport.setTripNumber(code.substring(1, 5)); + runPlanImport.setDirectionCode(code.substring(1, 2)); + } else if (code.length() == 6) { + runPlanImport.setServiceNumber(code.substring(0, 2)); + runPlanImport.setTripNumber(code.substring(2, 6)); + runPlanImport.setDirectionCode(code.substring(2, 3)); + + } else { + throw BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.exception("Code is invalid."); + } + //目的地号目前没有先设置为XXX + runPlanImport.setDestinationCode("XXX"); + setRunPlanDirec(runPlanImport, upDirection); + } + + /** + * 处理单个车次 + */ + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { + + switch (startStationName) { + case "西咸车辆段": + tripVO.setStartSectionCode("T834");//G1111 +// tripVO.setDestinationCode("09"); + break; + case "沣河森林公园站": + tripVO.setStartSectionCode("T3"); //G0709 +// tripVO.setDestinationCode("27"); + break; + case "纺织城站": + tripVO.setStartSectionCode("T771"); //DG2908 +// tripVO.setDestinationCode("BF"); + break; + case "灞河停车场": + tripVO.setStartSectionCode("T786"); //G2918 +// tripVO.setDestinationCode("195"); + break; + case "后卫寨站": + tripVO.setStartSectionCode("T177"); //G1106 +// tripVO.setDestinationCode("14"); + break; + } + switch (endStationName) { + case "西咸车辆段": + tripVO.setEndSectionCode("T833");//G1116 + tripVO.setDestinationCode("10"); + break; + case "沣河森林公园站": + tripVO.setEndSectionCode("T3"); //G0709 + tripVO.setDestinationCode("27"); + break; + case "纺织城站": + tripVO.setEndSectionCode("T771"); //DG2908 +// tripVO.setDestinationCode("BF"); + break; + case "灞河停车场": + tripVO.setEndSectionCode("T798"); //G2919 + tripVO.setDestinationCode("194"); + break; + case "后卫寨站": + tripVO.setEndSectionCode("T178"); //G1105 + tripVO.setDestinationCode("13"); + break; + } + + if(isFirst){ + if(endStationName.equals("后卫寨站")){ + tripVO.setEndSectionCode("T177");//G1106 + tripVO.setDestinationCode("14"); + } + } + if(isLast){ + if(startStationName.equals("后卫寨站")){ + tripVO.setStartSectionCode("T178");//G1105 +// tripVO.setDestinationCode("AB"); + } + } + } + + /** + * 处理一个车次的时刻信息 + */ + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + if ("西咸车辆段".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T834" : "T833");//G1111/G1116 + return; + } + if ("灞河停车场".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T798" : "T786");//G2919/G2918 + return; + } + if("后卫寨站".equals(stationVO.getRunPlanName())){ + if (runPlanImport.isRight()) { + if ("西咸车辆段".equals(startStationName) && "后卫寨站".equals(endStationName)) { + timeVO.setSectionCode("T177");//G1106 + } + } else { + if ("后卫寨站".equals(startStationName) && "西咸车辆段".equals(endStationName)) { + timeVO.setSectionCode("T178");//G1105 + } + } + } + } +} + diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine2RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine2RunPlanNew.java new file mode 100644 index 000000000..514d5efce --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine2RunPlanNew.java @@ -0,0 +1,121 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.constants.BusinessConsts; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +public class XianLine2RunPlanNew implements IRunPlanStrategyNew { + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + //获取：车站运行图实际名称——>车站信息 + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + //处理导入运行图数据信息 + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + + }); + } + + /** + * 根据导入code处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code) && ((code.length() == 4)||code.length() == 5)) { + runPlanImport.setServiceNumber(code.substring(0, 3)); + String importTripNumber = code.substring(3); + runPlanImport.setDirectionCode(Integer.parseInt(importTripNumber) % 2 == 0 ? BusinessConsts.RunPlan.DirectionType.Type02 : BusinessConsts.RunPlan.DirectionType.Type01); + runPlanImport.setDestinationCode(String.format("%02d", Integer.parseInt(runPlanImport.getDestinationCode()))); + runPlanImport.setTripNumber(String.format("%02d", Integer.parseInt(importTripNumber))); + //目的地号目前没有先设置为XXX +// runPlanImport.setDestinationCode("XXX"); + setRunPlanDirec(runPlanImport, upDirection); + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + } + + /** + * 处理单个车次 + */ + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { + + switch (startStationName) { + case "渭河车辆段": + tripVO.setStartSectionCode("T6");//T0102 +// tripVO.setDestinationCode("BA"); + break; + case "北客站": + tripVO.setStartSectionCode("T10"); //T0110 +// tripVO.setDestinationCode("BC"); + break; + case "韦曲南站": + tripVO.setStartSectionCode("T355"); //T2109 +// tripVO.setDestinationCode("BF"); + break; + case "潏河停车场": + tripVO.setStartSectionCode("T367"); //T2101 +// tripVO.setDestinationCode("AB"); + break; + } + switch (endStationName) { + case "渭河车辆段": + tripVO.setEndSectionCode("T1");//T0119 +// tripVO.setDestinationCode("BB"); + break; + case "北客站": + tripVO.setEndSectionCode("T10"); //T0110 +// tripVO.setDestinationCode("BC"); + break; + case "韦曲南站": + tripVO.setEndSectionCode("T355"); //T2109 +// tripVO.setDestinationCode("BF"); + break; + case "潏河停车场": + tripVO.setEndSectionCode("T368"); //T2114 +// tripVO.setDestinationCode("AB"); + break; + } + } + + /** + * 处理一个车次的时刻信息 + */ + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + if ("渭河车辆段".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T6" : "T1");//T0102/T0119 + return; + } + if ("潏河停车场".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T368" : "T367");//T2114/T2101 + return; + } + } +} + diff --git a/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine3RunPlanNew.java b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine3RunPlanNew.java new file mode 100644 index 000000000..7c007e72c --- /dev/null +++ b/src/main/java/club/joylink/rtss/vo/runplan/newrunplan/XianLine3RunPlanNew.java @@ -0,0 +1,186 @@ +package club.joylink.rtss.vo.runplan.newrunplan; + +import com.joylink.base.exception.BusinessException; +import com.joylink.base.exception.constant.ExceptionMapping; +import com.joylink.ms.vo.client.map.newmap.MapStationNewVO; +import com.joylink.ms.vo.client.runplan.RunPlanArrivalTime; +import com.joylink.ms.vo.client.runplan.RunPlanImport; +import com.joylink.ms.vo.client.runplan.RunPlanTripTimeVO; +import com.joylink.ms.vo.client.runplan.RunPlanTripVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +public class XianLine3RunPlanNew implements IRunPlanStrategyNew { +// +// /**鱼化寨ZF20折返*/ +// private static final List YUHUAZHAI_ZF20 = Collections.unmodifiableList(Arrays.asList("011001", "012016", "021160", "022169", "031124", "032129", "041127", "041161", "042133", "042170", "051162", "052172", "071163", "072173", "081175", "082188", "101177", "102191", "111170", "112183", "141178", "142192", "151173", "152186", "211176", "212189", "231165", "232176", "251172", "252185", "281123", "282128", "291168", "292180", "301129", "302136", "301164", "302175", "311158", "312166", "311125", "312130", "321171", "322184", "341174", "342187", "351154", "352161", "351126", "352132", "371128", "372134", "371156", "372164", "381159", "382167", "381130", "382137", "401167", "402179", "411166", "412177", "421155", "422162", "431169", "432182", "451157", "452165")); +// /**香湖湾ZF13折返*/ +// private static final List XIANGHUWAN_ZF13 = Collections.unmodifiableList(Arrays.asList("102004","101019")); +// /**保税区ZF11折返*/ +// private static final List BAOSHUIQU_ZF11 = Collections.unmodifiableList(Arrays.asList("032001","031024","062002","061026","122005","121029","182008","181034","242011","241040","232111","231136","292113","291139","322115","321142","072109","071134")); + + /*周末运行图导入*/ + /**鱼化寨ZF20折返*/ + private static final List YUHUAZHAI_ZF20 = Collections.unmodifiableList(Arrays.asList("011001", "012015", "031002", "032017")); + + /**香湖湾ZF13折返*/ + private static final List XIANGHUWAN_ZF13 = Collections.unmodifiableList(Arrays.asList("102004","101018")); + + /**保税区ZF11折返*/ + private static final List BAOSHUIQU_ZF11 = Collections.unmodifiableList(Arrays.asList("022001","021019","062002","061023")); + + /** + * 导入数据检查和预处理 + * + * @param runPlanImportList + * @param stationList + */ + @Override + public void importDataCheckAndPreHandle(List runPlanImportList, List stationList, String upDirection) { + //获取：车站运行图实际名称——>车站信息 + Map stationMap = stationList.stream().collect( + Collectors.toMap(MapStationNewVO::getRunPlanName, Function.identity())); + //处理导入运行图数据信息 + runPlanImportList.forEach(runPlanImport -> { + this.analyzeAndConvertCode(runPlanImport, upDirection); + List arrivalList = runPlanImport.getArrivalList(); + handleStationAndTime(stationMap, arrivalList); + + }); + } + + /** + * 根据导入code处理转换车次信息 + */ + @Override + public void analyzeAndConvertCode(RunPlanImport runPlanImport, String upDirection) { + String code = runPlanImport.getCode(); + if (StringUtils.isNotBlank(code)) { + if (code.length() == 5) { + runPlanImport.setServiceNumber(String.format("0%s", code.substring(0, 1))); + runPlanImport.setTripNumber(code.substring(1)); + runPlanImport.setDirectionCode(code.substring(1, 2)); + } else if (code.length() == 6) { + runPlanImport.setServiceNumber(code.substring(0, 2)); + runPlanImport.setTripNumber(code.substring(2)); + runPlanImport.setDirectionCode(code.substring(2, 3)); + + } else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + //目的地号目前没有先设置为XXX + runPlanImport.setDestinationCode("XXX"); + setRunPlanDirec(runPlanImport, upDirection); + //设置为真实运行图格式 + runPlanImport.setCode(runPlanImport.getServiceNumber()+runPlanImport.getTripNumber()); + }else { + throw new BusinessException(ExceptionMapping.ARGUMENT_ILLEGAL, "Code is invalid."); + } + } + + /** + * 处理单个车次 + */ + @Override + public void handleTrip(RunPlanImport runPlanImport, RunPlanTripVO tripVO, String startStationName, String endStationName, boolean isFirst, boolean isLast, String firstStationName, String finalStationName) { + + switch (startStationName) { + case "鱼化寨停车场": + tripVO.setStartSectionCode("T7");//G0113 +// tripVO.setDestinationCode("015"); + break; + case "港务区车辆段": + tripVO.setStartSectionCode("T275"); //G2620 +// tripVO.setDestinationCode("266"); + break; + case "鱼化寨": + if (YUHUAZHAI_ZF20.contains(runPlanImport.getCode())) { + tripVO.setStartSectionCode("T5"); //G0120 +// tripVO.setDestinationCode("014"); + } else { + tripVO.setStartSectionCode("T10"); //G0119 +// tripVO.setDestinationCode("017"); + } + break; + case "香湖湾": + if (XIANGHUWAN_ZF13.contains(runPlanImport.getCode())) { + tripVO.setStartSectionCode("T209"); //G2113 +// tripVO.setDestinationCode("213"); + } else { + tripVO.setStartSectionCode("T208"); //G2114 +// tripVO.setDestinationCode("212"); + } + break; + case "保税区": + if (BAOSHUIQU_ZF11.contains(runPlanImport.getCode())) { + tripVO.setStartSectionCode("T271"); //G2611 +// tripVO.setDestinationCode("263"); + } else { + tripVO.setStartSectionCode("T270"); //G2610 +// tripVO.setDestinationCode("262"); + } + break; + } + switch (endStationName) { + case "鱼化寨停车场": + tripVO.setEndSectionCode("T2");//G0114 + tripVO.setDestinationCode("012"); + break; + case "港务区车辆段": + tripVO.setEndSectionCode("T281"); //G2621 + tripVO.setDestinationCode("267"); + break; + case "鱼化寨": + if (YUHUAZHAI_ZF20.contains(runPlanImport.getCode())) { + tripVO.setEndSectionCode("T5"); //G0120 + tripVO.setDestinationCode("014"); + } else { + tripVO.setEndSectionCode("T10"); //G0119 + tripVO.setDestinationCode("017"); + } + break; + case "香湖湾": + if (XIANGHUWAN_ZF13.contains(runPlanImport.getCode())) { + tripVO.setEndSectionCode("T209"); //G2113 + tripVO.setDestinationCode("213"); + } else { + tripVO.setEndSectionCode("T208"); //G2114 + tripVO.setDestinationCode("212"); + } + break; + case "保税区": + if (BAOSHUIQU_ZF11.contains(runPlanImport.getCode())) { + tripVO.setEndSectionCode("T271"); //G2611 + tripVO.setDestinationCode("263"); + } else { + tripVO.setEndSectionCode("T270"); //G2610 + tripVO.setDestinationCode("262"); + } + break; + } + } + + /** + * 处理一个车次的时刻信息 + */ + @Override + public void handleTripTime(RunPlanTripTimeVO timeVO, RunPlanImport runPlanImport, MapStationNewVO stationVO, String startStationName, String endStationName) { + if ("鱼化寨停车场".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T7" : "T2");//G0113/G0114 + return; + } + if ("港务区车辆段".equals(stationVO.getRunPlanName())) { + timeVO.setSectionCode(runPlanImport.isRight() ? "T281" : "T275");//G2621/G2620 + return; + } + } +} + diff --git a/src/main/resources/mybatis/mapper/SimulationConversationMapper.xml b/src/main/resources/mybatis/mapper/SimulationConversationMapper.xml deleted file mode 100644 index 5def1a2e2..000000000 --- a/src/main/resources/mybatis/mapper/SimulationConversationMapper.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, record_id, name, creator_id, is_group - - - - - delete from simulation_conversation - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_conversation - - - - - - - SELECT LAST_INSERT_ID() - - insert into simulation_conversation (record_id, name, creator_id, - is_group) - values (#{recordId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT}, - #{isGroup,jdbcType=BIT}) - - - - SELECT LAST_INSERT_ID() - - insert into simulation_conversation - - - record_id, - - - name, - - - creator_id, - - - is_group, - - - - - #{recordId,jdbcType=BIGINT}, - - - #{name,jdbcType=VARCHAR}, - - - #{creatorId,jdbcType=BIGINT}, - - - #{isGroup,jdbcType=BIT}, - - - - - - update simulation_conversation - - - id = #{record.id,jdbcType=BIGINT}, - - - record_id = #{record.recordId,jdbcType=BIGINT}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - creator_id = #{record.creatorId,jdbcType=BIGINT}, - - - is_group = #{record.isGroup,jdbcType=BIT}, - - - - - - - - update simulation_conversation - set id = #{record.id,jdbcType=BIGINT}, - record_id = #{record.recordId,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - creator_id = #{record.creatorId,jdbcType=BIGINT}, - is_group = #{record.isGroup,jdbcType=BIT} - - - - - - update simulation_conversation - - - record_id = #{recordId,jdbcType=BIGINT}, - - - name = #{name,jdbcType=VARCHAR}, - - - creator_id = #{creatorId,jdbcType=BIGINT}, - - - is_group = #{isGroup,jdbcType=BIT}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_conversation - set record_id = #{recordId,jdbcType=BIGINT}, - name = #{name,jdbcType=VARCHAR}, - creator_id = #{creatorId,jdbcType=BIGINT}, - is_group = #{isGroup,jdbcType=BIT} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationConversationMemberMapper.xml b/src/main/resources/mybatis/mapper/SimulationConversationMemberMapper.xml deleted file mode 100644 index 20d410dc8..000000000 --- a/src/main/resources/mybatis/mapper/SimulationConversationMemberMapper.xml +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, conversation_id, role, user_id, name, nick_name, device_type, device_code, avatar_url - - - - - delete from simulation_conversation_member - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_conversation_member - - - - - - - SELECT LAST_INSERT_ID() - - insert into simulation_conversation_member (conversation_id, role, user_id, - name, nick_name, device_type, - device_code, avatar_url) - values (#{conversationId,jdbcType=BIGINT}, #{role,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, - #{name,jdbcType=VARCHAR}, #{nickName,jdbcType=VARCHAR}, #{deviceType,jdbcType=VARCHAR}, - #{deviceCode,jdbcType=VARCHAR}, #{avatarUrl,jdbcType=VARCHAR}) - - - - SELECT LAST_INSERT_ID() - - insert into simulation_conversation_member - - - conversation_id, - - - role, - - - user_id, - - - name, - - - nick_name, - - - device_type, - - - device_code, - - - avatar_url, - - - - - #{conversationId,jdbcType=BIGINT}, - - - #{role,jdbcType=VARCHAR}, - - - #{userId,jdbcType=BIGINT}, - - - #{name,jdbcType=VARCHAR}, - - - #{nickName,jdbcType=VARCHAR}, - - - #{deviceType,jdbcType=VARCHAR}, - - - #{deviceCode,jdbcType=VARCHAR}, - - - #{avatarUrl,jdbcType=VARCHAR}, - - - - - - update simulation_conversation_member - - - id = #{record.id,jdbcType=BIGINT}, - - - conversation_id = #{record.conversationId,jdbcType=BIGINT}, - - - role = #{record.role,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=BIGINT}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - nick_name = #{record.nickName,jdbcType=VARCHAR}, - - - device_type = #{record.deviceType,jdbcType=VARCHAR}, - - - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - - - avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, - - - - - - - - update simulation_conversation_member - set id = #{record.id,jdbcType=BIGINT}, - conversation_id = #{record.conversationId,jdbcType=BIGINT}, - role = #{record.role,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - nick_name = #{record.nickName,jdbcType=VARCHAR}, - device_type = #{record.deviceType,jdbcType=VARCHAR}, - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - avatar_url = #{record.avatarUrl,jdbcType=VARCHAR} - - - - - - update simulation_conversation_member - - - conversation_id = #{conversationId,jdbcType=BIGINT}, - - - role = #{role,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=BIGINT}, - - - name = #{name,jdbcType=VARCHAR}, - - - nick_name = #{nickName,jdbcType=VARCHAR}, - - - device_type = #{deviceType,jdbcType=VARCHAR}, - - - device_code = #{deviceCode,jdbcType=VARCHAR}, - - - avatar_url = #{avatarUrl,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_conversation_member - set conversation_id = #{conversationId,jdbcType=BIGINT}, - role = #{role,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=BIGINT}, - name = #{name,jdbcType=VARCHAR}, - nick_name = #{nickName,jdbcType=VARCHAR}, - device_type = #{deviceType,jdbcType=VARCHAR}, - device_code = #{deviceCode,jdbcType=VARCHAR}, - avatar_url = #{avatarUrl,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationConversationMessageMapper.xml b/src/main/resources/mybatis/mapper/SimulationConversationMessageMapper.xml deleted file mode 100644 index 4afb561eb..000000000 --- a/src/main/resources/mybatis/mapper/SimulationConversationMessageMapper.xml +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, conversation_id, member_id, target_member_id, create_time, type, content, file_url - - - - - delete from simulation_conversation_message - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_conversation_message - - - - - - - SELECT LAST_INSERT_ID() - - insert into simulation_conversation_message (conversation_id, member_id, target_member_id, - create_time, type, content, - file_url) - values (#{conversationId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{targetMemberId,jdbcType=BIGINT}, - #{createTime,jdbcType=TIMESTAMP}, #{type,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, - #{fileUrl,jdbcType=VARCHAR}) - - - - SELECT LAST_INSERT_ID() - - insert into simulation_conversation_message - - - conversation_id, - - - member_id, - - - target_member_id, - - - create_time, - - - type, - - - content, - - - file_url, - - - - - #{conversationId,jdbcType=BIGINT}, - - - #{memberId,jdbcType=BIGINT}, - - - #{targetMemberId,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{type,jdbcType=VARCHAR}, - - - #{content,jdbcType=VARCHAR}, - - - #{fileUrl,jdbcType=VARCHAR}, - - - - - - update simulation_conversation_message - - - id = #{record.id,jdbcType=BIGINT}, - - - conversation_id = #{record.conversationId,jdbcType=BIGINT}, - - - member_id = #{record.memberId,jdbcType=BIGINT}, - - - target_member_id = #{record.targetMemberId,jdbcType=BIGINT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - type = #{record.type,jdbcType=VARCHAR}, - - - content = #{record.content,jdbcType=VARCHAR}, - - - file_url = #{record.fileUrl,jdbcType=VARCHAR}, - - - - - - - - update simulation_conversation_message - set id = #{record.id,jdbcType=BIGINT}, - conversation_id = #{record.conversationId,jdbcType=BIGINT}, - member_id = #{record.memberId,jdbcType=BIGINT}, - target_member_id = #{record.targetMemberId,jdbcType=BIGINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - type = #{record.type,jdbcType=VARCHAR}, - content = #{record.content,jdbcType=VARCHAR}, - file_url = #{record.fileUrl,jdbcType=VARCHAR} - - - - - - update simulation_conversation_message - - - conversation_id = #{conversationId,jdbcType=BIGINT}, - - - member_id = #{memberId,jdbcType=BIGINT}, - - - target_member_id = #{targetMemberId,jdbcType=BIGINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - type = #{type,jdbcType=VARCHAR}, - - - content = #{content,jdbcType=VARCHAR}, - - - file_url = #{fileUrl,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_conversation_message - set conversation_id = #{conversationId,jdbcType=BIGINT}, - member_id = #{memberId,jdbcType=BIGINT}, - target_member_id = #{targetMemberId,jdbcType=BIGINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - type = #{type,jdbcType=VARCHAR}, - content = #{content,jdbcType=VARCHAR}, - file_url = #{fileUrl,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationFrameMapper.xml b/src/main/resources/mybatis/mapper/SimulationFrameMapper.xml deleted file mode 100644 index 11240488b..000000000 --- a/src/main/resources/mybatis/mapper/SimulationFrameMapper.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, record_id, time - - - data - - - - - - delete from simulation_frame - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_frame - - - - - - - SELECT LAST_INSERT_ID() - - insert into simulation_frame (record_id, time, data - ) - values (#{recordId,jdbcType=BIGINT}, #{time,jdbcType=TIMESTAMP}, #{data,jdbcType=LONGVARCHAR} - ) - - - - SELECT LAST_INSERT_ID() - - insert into simulation_frame - - - record_id, - - - time, - - - data, - - - - - #{recordId,jdbcType=BIGINT}, - - - #{time,jdbcType=TIMESTAMP}, - - - #{data,jdbcType=LONGVARCHAR}, - - - - - - update simulation_frame - - - id = #{record.id,jdbcType=BIGINT}, - - - record_id = #{record.recordId,jdbcType=BIGINT}, - - - time = #{record.time,jdbcType=TIMESTAMP}, - - - data = #{record.data,jdbcType=LONGVARCHAR}, - - - - - - - - update simulation_frame - set id = #{record.id,jdbcType=BIGINT}, - record_id = #{record.recordId,jdbcType=BIGINT}, - time = #{record.time,jdbcType=TIMESTAMP}, - data = #{record.data,jdbcType=LONGVARCHAR} - - - - - - update simulation_frame - set id = #{record.id,jdbcType=BIGINT}, - record_id = #{record.recordId,jdbcType=BIGINT}, - time = #{record.time,jdbcType=TIMESTAMP} - - - - - - update simulation_frame - - - record_id = #{recordId,jdbcType=BIGINT}, - - - time = #{time,jdbcType=TIMESTAMP}, - - - data = #{data,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_frame - set record_id = #{recordId,jdbcType=BIGINT}, - time = #{time,jdbcType=TIMESTAMP}, - data = #{data,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=BIGINT} - - - update simulation_frame - set record_id = #{recordId,jdbcType=BIGINT}, - time = #{time,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationProcessRecordDAO.xml b/src/main/resources/mybatis/mapper/SimulationProcessRecordDAO.xml deleted file mode 100644 index 53c402c10..000000000 --- a/src/main/resources/mybatis/mapper/SimulationProcessRecordDAO.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, simulation_group, map_id, date_time - - - socket_message - - - - - - delete from simulation_process_record - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_process_record - - - - - - insert into simulation_process_record (simulation_group, map_id, date_time, - socket_message) - values (#{simulationGroup,jdbcType=VARCHAR}, #{mapId,jdbcType=BIGINT}, #{dateTime,jdbcType=TIMESTAMP}, - #{socketMessage,jdbcType=LONGVARCHAR}) - - - insert into simulation_process_record - - - simulation_group, - - - map_id, - - - date_time, - - - socket_message, - - - - - #{simulationGroup,jdbcType=VARCHAR}, - - - #{mapId,jdbcType=BIGINT}, - - - #{dateTime,jdbcType=TIMESTAMP}, - - - #{socketMessage,jdbcType=LONGVARCHAR}, - - - - - - update simulation_process_record - - - id = #{record.id,jdbcType=BIGINT}, - - - simulation_group = #{record.simulationGroup,jdbcType=VARCHAR}, - - - map_id = #{record.mapId,jdbcType=BIGINT}, - - - date_time = #{record.dateTime,jdbcType=TIMESTAMP}, - - - socket_message = #{record.socketMessage,jdbcType=LONGVARCHAR}, - - - - - - - - update simulation_process_record - set id = #{record.id,jdbcType=BIGINT}, - simulation_group = #{record.simulationGroup,jdbcType=VARCHAR}, - map_id = #{record.mapId,jdbcType=BIGINT}, - date_time = #{record.dateTime,jdbcType=TIMESTAMP}, - socket_message = #{record.socketMessage,jdbcType=LONGVARCHAR} - - - - - - update simulation_process_record - set id = #{record.id,jdbcType=BIGINT}, - simulation_group = #{record.simulationGroup,jdbcType=VARCHAR}, - map_id = #{record.mapId,jdbcType=BIGINT}, - date_time = #{record.dateTime,jdbcType=TIMESTAMP} - - - - - - update simulation_process_record - - - simulation_group = #{simulationGroup,jdbcType=VARCHAR}, - - - map_id = #{mapId,jdbcType=BIGINT}, - - - date_time = #{dateTime,jdbcType=TIMESTAMP}, - - - socket_message = #{socketMessage,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_process_record - set simulation_group = #{simulationGroup,jdbcType=VARCHAR}, - map_id = #{mapId,jdbcType=BIGINT}, - date_time = #{dateTime,jdbcType=TIMESTAMP}, - socket_message = #{socketMessage,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=BIGINT} - - - update simulation_process_record - set simulation_group = #{simulationGroup,jdbcType=VARCHAR}, - map_id = #{mapId,jdbcType=BIGINT}, - date_time = #{dateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationRecordDAO.xml b/src/main/resources/mybatis/mapper/SimulationRecordDAO.xml deleted file mode 100644 index a4549a0a1..000000000 --- a/src/main/resources/mybatis/mapper/SimulationRecordDAO.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, map_id, map_name, prd_type, creator_id, create_time, destroy_time, `status` - - - - - delete from simulation_record - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_record - - - - - - insert into simulation_record (map_id, map_name, prd_type, - creator_id, create_time, destroy_time, - `status`) - values (#{mapId,jdbcType=BIGINT}, #{mapName,jdbcType=VARCHAR}, #{prdType,jdbcType=VARCHAR}, - #{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{destroyTime,jdbcType=TIMESTAMP}, - #{status,jdbcType=VARCHAR}) - - - insert into simulation_record - - - map_id, - - - map_name, - - - prd_type, - - - creator_id, - - - create_time, - - - destroy_time, - - - `status`, - - - - - #{mapId,jdbcType=BIGINT}, - - - #{mapName,jdbcType=VARCHAR}, - - - #{prdType,jdbcType=VARCHAR}, - - - #{creatorId,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{destroyTime,jdbcType=TIMESTAMP}, - - - #{status,jdbcType=VARCHAR}, - - - - - - update simulation_record - - - id = #{record.id,jdbcType=BIGINT}, - - - map_id = #{record.mapId,jdbcType=BIGINT}, - - - map_name = #{record.mapName,jdbcType=VARCHAR}, - - - prd_type = #{record.prdType,jdbcType=VARCHAR}, - - - creator_id = #{record.creatorId,jdbcType=BIGINT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - destroy_time = #{record.destroyTime,jdbcType=TIMESTAMP}, - - - `status` = #{record.status,jdbcType=VARCHAR}, - - - - - - - - update simulation_record - set id = #{record.id,jdbcType=BIGINT}, - map_id = #{record.mapId,jdbcType=BIGINT}, - map_name = #{record.mapName,jdbcType=VARCHAR}, - prd_type = #{record.prdType,jdbcType=VARCHAR}, - creator_id = #{record.creatorId,jdbcType=BIGINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - destroy_time = #{record.destroyTime,jdbcType=TIMESTAMP}, - `status` = #{record.status,jdbcType=VARCHAR} - - - - - - update simulation_record - - - map_id = #{mapId,jdbcType=BIGINT}, - - - map_name = #{mapName,jdbcType=VARCHAR}, - - - prd_type = #{prdType,jdbcType=VARCHAR}, - - - creator_id = #{creatorId,jdbcType=BIGINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - destroy_time = #{destroyTime,jdbcType=TIMESTAMP}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_record - set map_id = #{mapId,jdbcType=BIGINT}, - map_name = #{mapName,jdbcType=VARCHAR}, - prd_type = #{prdType,jdbcType=VARCHAR}, - creator_id = #{creatorId,jdbcType=BIGINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - destroy_time = #{destroyTime,jdbcType=TIMESTAMP}, - `status` = #{status,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationRoomDAO.xml b/src/main/resources/mybatis/mapper/SimulationRoomDAO.xml deleted file mode 100644 index fe291cdf6..000000000 --- a/src/main/resources/mybatis/mapper/SimulationRoomDAO.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, map_id, prd_type, code, `name`, role_permit_amount, audience_permit_amount, creator_id, - create_time, destroy_time, `status` - - - - - delete from simulation_room - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_room - - - - - - insert into simulation_room (map_id, prd_type, code, - `name`, role_permit_amount, audience_permit_amount, - creator_id, create_time, destroy_time, - `status`) - values (#{mapId,jdbcType=BIGINT}, #{prdType,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{rolePermitAmount,jdbcType=INTEGER}, #{audiencePermitAmount,jdbcType=INTEGER}, - #{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{destroyTime,jdbcType=TIMESTAMP}, - #{status,jdbcType=VARCHAR}) - - - insert into simulation_room - - - map_id, - - - prd_type, - - - code, - - - `name`, - - - role_permit_amount, - - - audience_permit_amount, - - - creator_id, - - - create_time, - - - destroy_time, - - - `status`, - - - - - #{mapId,jdbcType=BIGINT}, - - - #{prdType,jdbcType=VARCHAR}, - - - #{code,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{rolePermitAmount,jdbcType=INTEGER}, - - - #{audiencePermitAmount,jdbcType=INTEGER}, - - - #{creatorId,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{destroyTime,jdbcType=TIMESTAMP}, - - - #{status,jdbcType=VARCHAR}, - - - - - - update simulation_room - - - id = #{record.id,jdbcType=BIGINT}, - - - map_id = #{record.mapId,jdbcType=BIGINT}, - - - prd_type = #{record.prdType,jdbcType=VARCHAR}, - - - code = #{record.code,jdbcType=VARCHAR}, - - - `name` = #{record.name,jdbcType=VARCHAR}, - - - role_permit_amount = #{record.rolePermitAmount,jdbcType=INTEGER}, - - - audience_permit_amount = #{record.audiencePermitAmount,jdbcType=INTEGER}, - - - creator_id = #{record.creatorId,jdbcType=BIGINT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - destroy_time = #{record.destroyTime,jdbcType=TIMESTAMP}, - - - `status` = #{record.status,jdbcType=VARCHAR}, - - - - - - - - update simulation_room - set id = #{record.id,jdbcType=BIGINT}, - map_id = #{record.mapId,jdbcType=BIGINT}, - prd_type = #{record.prdType,jdbcType=VARCHAR}, - code = #{record.code,jdbcType=VARCHAR}, - `name` = #{record.name,jdbcType=VARCHAR}, - role_permit_amount = #{record.rolePermitAmount,jdbcType=INTEGER}, - audience_permit_amount = #{record.audiencePermitAmount,jdbcType=INTEGER}, - creator_id = #{record.creatorId,jdbcType=BIGINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - destroy_time = #{record.destroyTime,jdbcType=TIMESTAMP}, - `status` = #{record.status,jdbcType=VARCHAR} - - - - - - update simulation_room - - - map_id = #{mapId,jdbcType=BIGINT}, - - - prd_type = #{prdType,jdbcType=VARCHAR}, - - - code = #{code,jdbcType=VARCHAR}, - - - `name` = #{name,jdbcType=VARCHAR}, - - - role_permit_amount = #{rolePermitAmount,jdbcType=INTEGER}, - - - audience_permit_amount = #{audiencePermitAmount,jdbcType=INTEGER}, - - - creator_id = #{creatorId,jdbcType=BIGINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - destroy_time = #{destroyTime,jdbcType=TIMESTAMP}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_room - set map_id = #{mapId,jdbcType=BIGINT}, - prd_type = #{prdType,jdbcType=VARCHAR}, - code = #{code,jdbcType=VARCHAR}, - `name` = #{name,jdbcType=VARCHAR}, - role_permit_amount = #{rolePermitAmount,jdbcType=INTEGER}, - audience_permit_amount = #{audiencePermitAmount,jdbcType=INTEGER}, - creator_id = #{creatorId,jdbcType=BIGINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - destroy_time = #{destroyTime,jdbcType=TIMESTAMP}, - `status` = #{status,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationRoomDeviceDAO.xml b/src/main/resources/mybatis/mapper/SimulationRoomDeviceDAO.xml deleted file mode 100644 index 2097999ec..000000000 --- a/src/main/resources/mybatis/mapper/SimulationRoomDeviceDAO.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, room_id, device_type, device_code, `status` - - - - - delete from simulation_room_device - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_room_device - - - - - - insert into simulation_room_device (room_id, device_type, device_code, - `status`) - values (#{roomId,jdbcType=BIGINT}, #{deviceType,jdbcType=VARCHAR}, #{deviceCode,jdbcType=VARCHAR}, - #{status,jdbcType=VARCHAR}) - - - insert into simulation_room_device - - - room_id, - - - device_type, - - - device_code, - - - `status`, - - - - - #{roomId,jdbcType=BIGINT}, - - - #{deviceType,jdbcType=VARCHAR}, - - - #{deviceCode,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - - - - update simulation_room_device - - - id = #{record.id,jdbcType=BIGINT}, - - - room_id = #{record.roomId,jdbcType=BIGINT}, - - - device_type = #{record.deviceType,jdbcType=VARCHAR}, - - - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - - - `status` = #{record.status,jdbcType=VARCHAR}, - - - - - - - - update simulation_room_device - set id = #{record.id,jdbcType=BIGINT}, - room_id = #{record.roomId,jdbcType=BIGINT}, - device_type = #{record.deviceType,jdbcType=VARCHAR}, - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - `status` = #{record.status,jdbcType=VARCHAR} - - - - - - update simulation_room_device - - - room_id = #{roomId,jdbcType=BIGINT}, - - - device_type = #{deviceType,jdbcType=VARCHAR}, - - - device_code = #{deviceCode,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_room_device - set room_id = #{roomId,jdbcType=BIGINT}, - device_type = #{deviceType,jdbcType=VARCHAR}, - device_code = #{deviceCode,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationRoomMemberDAO.xml b/src/main/resources/mybatis/mapper/SimulationRoomMemberDAO.xml deleted file mode 100644 index 1abf01b6d..000000000 --- a/src/main/resources/mybatis/mapper/SimulationRoomMemberDAO.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, room_id, user_id, nick_name, `role`, device_code, ibp_part, `status`, in_room, - in_simulation - - - - - delete from simulation_room_member - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_room_member - - - - - - insert into simulation_room_member (room_id, user_id, nick_name, - `role`, device_code, ibp_part, - `status`, in_room, in_simulation - ) - values (#{roomId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{nickName,jdbcType=VARCHAR}, - #{role,jdbcType=VARCHAR}, #{deviceCode,jdbcType=VARCHAR}, #{ibpPart,jdbcType=VARCHAR}, - #{status,jdbcType=VARCHAR}, #{inRoom,jdbcType=BIT}, #{inSimulation,jdbcType=BIT} - ) - - - insert into simulation_room_member - - - room_id, - - - user_id, - - - nick_name, - - - `role`, - - - device_code, - - - ibp_part, - - - `status`, - - - in_room, - - - in_simulation, - - - - - #{roomId,jdbcType=BIGINT}, - - - #{userId,jdbcType=BIGINT}, - - - #{nickName,jdbcType=VARCHAR}, - - - #{role,jdbcType=VARCHAR}, - - - #{deviceCode,jdbcType=VARCHAR}, - - - #{ibpPart,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{inRoom,jdbcType=BIT}, - - - #{inSimulation,jdbcType=BIT}, - - - - - - update simulation_room_member - - - id = #{record.id,jdbcType=BIGINT}, - - - room_id = #{record.roomId,jdbcType=BIGINT}, - - - user_id = #{record.userId,jdbcType=BIGINT}, - - - nick_name = #{record.nickName,jdbcType=VARCHAR}, - - - `role` = #{record.role,jdbcType=VARCHAR}, - - - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - - - ibp_part = #{record.ibpPart,jdbcType=VARCHAR}, - - - `status` = #{record.status,jdbcType=VARCHAR}, - - - in_room = #{record.inRoom,jdbcType=BIT}, - - - in_simulation = #{record.inSimulation,jdbcType=BIT}, - - - - - - - - update simulation_room_member - set id = #{record.id,jdbcType=BIGINT}, - room_id = #{record.roomId,jdbcType=BIGINT}, - user_id = #{record.userId,jdbcType=BIGINT}, - nick_name = #{record.nickName,jdbcType=VARCHAR}, - `role` = #{record.role,jdbcType=VARCHAR}, - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - ibp_part = #{record.ibpPart,jdbcType=VARCHAR}, - `status` = #{record.status,jdbcType=VARCHAR}, - in_room = #{record.inRoom,jdbcType=BIT}, - in_simulation = #{record.inSimulation,jdbcType=BIT} - - - - - - update simulation_room_member - - - room_id = #{roomId,jdbcType=BIGINT}, - - - user_id = #{userId,jdbcType=BIGINT}, - - - nick_name = #{nickName,jdbcType=VARCHAR}, - - - `role` = #{role,jdbcType=VARCHAR}, - - - device_code = #{deviceCode,jdbcType=VARCHAR}, - - - ibp_part = #{ibpPart,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - in_room = #{inRoom,jdbcType=BIT}, - - - in_simulation = #{inSimulation,jdbcType=BIT}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_room_member - set room_id = #{roomId,jdbcType=BIGINT}, - user_id = #{userId,jdbcType=BIGINT}, - nick_name = #{nickName,jdbcType=VARCHAR}, - `role` = #{role,jdbcType=VARCHAR}, - device_code = #{deviceCode,jdbcType=VARCHAR}, - ibp_part = #{ibpPart,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR}, - in_room = #{inRoom,jdbcType=BIT}, - in_simulation = #{inSimulation,jdbcType=BIT} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationRoomRealDeviceDAO.xml b/src/main/resources/mybatis/mapper/SimulationRoomRealDeviceDAO.xml deleted file mode 100644 index f20aeddec..000000000 --- a/src/main/resources/mybatis/mapper/SimulationRoomRealDeviceDAO.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, room_id, project_device_id, device_code - - - - - delete from simulation_room_real_device - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_room_real_device - - - - - - insert into simulation_room_real_device (room_id, project_device_id, device_code - ) - values (#{roomId,jdbcType=BIGINT}, #{projectDeviceId,jdbcType=BIGINT}, #{deviceCode,jdbcType=VARCHAR} - ) - - - insert into simulation_room_real_device - - - room_id, - - - project_device_id, - - - device_code, - - - - - #{roomId,jdbcType=BIGINT}, - - - #{projectDeviceId,jdbcType=BIGINT}, - - - #{deviceCode,jdbcType=VARCHAR}, - - - - - - update simulation_room_real_device - - - id = #{record.id,jdbcType=BIGINT}, - - - room_id = #{record.roomId,jdbcType=BIGINT}, - - - project_device_id = #{record.projectDeviceId,jdbcType=BIGINT}, - - - device_code = #{record.deviceCode,jdbcType=VARCHAR}, - - - - - - - - update simulation_room_real_device - set id = #{record.id,jdbcType=BIGINT}, - room_id = #{record.roomId,jdbcType=BIGINT}, - project_device_id = #{record.projectDeviceId,jdbcType=BIGINT}, - device_code = #{record.deviceCode,jdbcType=VARCHAR} - - - - - - update simulation_room_real_device - - - room_id = #{roomId,jdbcType=BIGINT}, - - - project_device_id = #{projectDeviceId,jdbcType=BIGINT}, - - - device_code = #{deviceCode,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_room_real_device - set room_id = #{roomId,jdbcType=BIGINT}, - project_device_id = #{projectDeviceId,jdbcType=BIGINT}, - device_code = #{deviceCode,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/SimulationRunAsPlanMapper.xml b/src/main/resources/mybatis/mapper/SimulationRunAsPlanMapper.xml deleted file mode 100644 index 6142f4ee0..000000000 --- a/src/main/resources/mybatis/mapper/SimulationRunAsPlanMapper.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, record_id, start_time, end_time, run_plan_daily_id, system_time - - - - - delete from simulation_run_as_plan - where id = #{id,jdbcType=BIGINT} - - - delete from simulation_run_as_plan - - - - - - - SELECT LAST_INSERT_ID() - - insert into simulation_run_as_plan (record_id, start_time, end_time, - run_plan_daily_id, system_time) - values (#{recordId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, - #{runPlanDailyId,jdbcType=BIGINT}, #{systemTime,jdbcType=TIMESTAMP}) - - - - SELECT LAST_INSERT_ID() - - insert into simulation_run_as_plan - - - record_id, - - - start_time, - - - end_time, - - - run_plan_daily_id, - - - system_time, - - - - - #{recordId,jdbcType=BIGINT}, - - - #{startTime,jdbcType=TIMESTAMP}, - - - #{endTime,jdbcType=TIMESTAMP}, - - - #{runPlanDailyId,jdbcType=BIGINT}, - - - #{systemTime,jdbcType=TIMESTAMP}, - - - - - - update simulation_run_as_plan - - - id = #{record.id,jdbcType=BIGINT}, - - - record_id = #{record.recordId,jdbcType=BIGINT}, - - - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - - - end_time = #{record.endTime,jdbcType=TIMESTAMP}, - - - run_plan_daily_id = #{record.runPlanDailyId,jdbcType=BIGINT}, - - - system_time = #{record.systemTime,jdbcType=TIMESTAMP}, - - - - - - - - update simulation_run_as_plan - set id = #{record.id,jdbcType=BIGINT}, - record_id = #{record.recordId,jdbcType=BIGINT}, - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - end_time = #{record.endTime,jdbcType=TIMESTAMP}, - run_plan_daily_id = #{record.runPlanDailyId,jdbcType=BIGINT}, - system_time = #{record.systemTime,jdbcType=TIMESTAMP} - - - - - - update simulation_run_as_plan - - - record_id = #{recordId,jdbcType=BIGINT}, - - - start_time = #{startTime,jdbcType=TIMESTAMP}, - - - end_time = #{endTime,jdbcType=TIMESTAMP}, - - - run_plan_daily_id = #{runPlanDailyId,jdbcType=BIGINT}, - - - system_time = #{systemTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - update simulation_run_as_plan - set record_id = #{recordId,jdbcType=BIGINT}, - start_time = #{startTime,jdbcType=TIMESTAMP}, - end_time = #{endTime,jdbcType=TIMESTAMP}, - run_plan_daily_id = #{runPlanDailyId,jdbcType=BIGINT}, - system_time = #{systemTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/TaskMapper.xml b/src/main/resources/mybatis/mapper/TaskMapper.xml deleted file mode 100644 index e68b50537..000000000 --- a/src/main/resources/mybatis/mapper/TaskMapper.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, name, type, status, result, creator_id, create_time, finish_time, start_time, - parameter - - - - - delete from task - where id = #{id,jdbcType=BIGINT} - - - delete from task - - - - - - - SELECT LAST_INSERT_ID() - - insert into task (name, type, status, - result, creator_id, create_time, - finish_time, start_time, parameter - ) - values (#{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{result,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, - #{finishTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{parameter,jdbcType=VARCHAR} - ) - - - - SELECT LAST_INSERT_ID() - - insert into task - - - name, - - - type, - - - status, - - - result, - - - creator_id, - - - create_time, - - - finish_time, - - - start_time, - - - parameter, - - - - - #{name,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{result,jdbcType=VARCHAR}, - - - #{creatorId,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{finishTime,jdbcType=TIMESTAMP}, - - - #{startTime,jdbcType=TIMESTAMP}, - - - #{parameter,jdbcType=VARCHAR}, - - - - - - update task - - - id = #{record.id,jdbcType=BIGINT}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - type = #{record.type,jdbcType=VARCHAR}, - - - status = #{record.status,jdbcType=VARCHAR}, - - - result = #{record.result,jdbcType=VARCHAR}, - - - creator_id = #{record.creatorId,jdbcType=BIGINT}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - finish_time = #{record.finishTime,jdbcType=TIMESTAMP}, - - - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - - - parameter = #{record.parameter,jdbcType=VARCHAR}, - - - - - - - - update task - set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - type = #{record.type,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=VARCHAR}, - result = #{record.result,jdbcType=VARCHAR}, - creator_id = #{record.creatorId,jdbcType=BIGINT}, - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - finish_time = #{record.finishTime,jdbcType=TIMESTAMP}, - start_time = #{record.startTime,jdbcType=TIMESTAMP}, - parameter = #{record.parameter,jdbcType=VARCHAR} - - - - - - update task - - - name = #{name,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=VARCHAR}, - - - status = #{status,jdbcType=VARCHAR}, - - - result = #{result,jdbcType=VARCHAR}, - - - creator_id = #{creatorId,jdbcType=BIGINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - finish_time = #{finishTime,jdbcType=TIMESTAMP}, - - - start_time = #{startTime,jdbcType=TIMESTAMP}, - - - parameter = #{parameter,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update task - set name = #{name,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - status = #{status,jdbcType=VARCHAR}, - result = #{result,jdbcType=VARCHAR}, - creator_id = #{creatorId,jdbcType=BIGINT}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - finish_time = #{finishTime,jdbcType=TIMESTAMP}, - start_time = #{startTime,jdbcType=TIMESTAMP}, - parameter = #{parameter,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file