xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/TokenAPPController.java
File was deleted xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/TokenController.java
@@ -111,7 +111,7 @@ return R.ok(encrypt.getString("content")); }*/ @ApiOperation(value = "账号密码登录", tags = {"运维APP登录"}) @PostMapping("base/v1/operationPasswordLogin") @PostMapping("/maintenance-app/base/v1/operationPasswordLogin") public R<?> operationPasswordLogin(@RequestBody AppLoginPasswordDTO appLoginPasswordDTO, HttpServletRequest request) { // 用户登录 LoginOperationUser userInfo = sysLoginService.operationPasswordLogin(appLoginPasswordDTO.getPhoneNumber(), appLoginPasswordDTO.getPassword(), appLoginPasswordDTO.getDeviceType(), request); @@ -127,7 +127,7 @@ } @ApiOperation(value = "手机验证码登录", tags = {"运维APP登录"}) @PostMapping("base/v1/verificationCodeLogin") @PostMapping("/maintenance-app/base/v1/verificationCodeLogin") public R<?> verificationCodeLogin(@RequestBody AppLoginCodeDTO appLoginCodeDTO, HttpServletRequest request) { // 用户登录 LoginOperationUser userInfo = sysLoginService.verificationCodeLogin(appLoginCodeDTO.getPhoneNumber(), appLoginCodeDTO.getVerificationCode(),appLoginCodeDTO.getDeviceType(), request); @@ -143,7 +143,7 @@ } @ApiOperation(value = "获取手机验证码", tags = {"运维APP登录"}) @PostMapping("base/v1/getVerificationCode") @PostMapping("/maintenance-app/base/v1/getVerificationCode") public R<?> verificationCodeLogin(@RequestBody AppLoginGetCodeDTO appLoginPasswordDTO) { XpOperationsUser xpOperationsUser = xpOperationsUserService.lambdaQuery() .eq(XpOperationsUser::getPhoneNumber, appLoginPasswordDTO.getPhoneNumber()) @@ -185,7 +185,7 @@ return R.ok(); } @ApiOperation(value = "修改密码", tags = {"运维APP登录"}) @PostMapping("base/v1/updatePassword") @PostMapping("/maintenance-app/base/v1/updatePassword") public R<?> updatePassword(@RequestBody UpdatePasswordDTO updatePasswordDTO, HttpServletRequest request) { // 用户登录 if (sysLoginService.verificationCodeUpdate(updatePasswordDTO, request)){ xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserAPPController.java
File was deleted xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -151,7 +151,7 @@ * @return 个人中心首页信息 */ @ApiOperation(value = "获取个人中心首页信息", tags = {"运维APP-个人中心"}) @GetMapping("/api/v1/userInfo") @GetMapping("/maintenance-app/api/v1/userInfo") public R<XpOperationsUserProfileVO> getProfile() { // 通过TokenService获取当前登录用户ID Long currentUserId = tokenService.getLoginOperationUser().getId(); @@ -169,7 +169,7 @@ * @return */ @ApiOperation(value = "个人中心-证件上传", tags = {"运维APP-个人中心"}) @PostMapping("/api/v1/saveCertificate") @PostMapping("/maintenance-app/api/v1/saveCertificate") public R<?> saveCertificate(@Valid @RequestBody XpOperationsUserDTO dto) { xpOperationsUserService.saveCertificate(dto); return R.ok(); xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserNotificationAPPController.java
File was deleted xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserNotificationController.java
@@ -34,7 +34,7 @@ /** * 根据当前登录用户获取通知分页列表(运维APP接口) */ @PostMapping("/api/v1/notification/list") @PostMapping("/maintenance-app/api/v1/notification/list") @ApiOperation(value = "获取通知分页列表", tags = {"运维APP-消息通知"}) public R<PageInfo<XpOperationsUserNotification>> getNotificationList( @RequestBody XpOperationsUserNotificationPageQuery query) { @@ -56,7 +56,7 @@ return R.ok(pageInfo); } @GetMapping("/api/v1/notification/unreadCount") @GetMapping("/maintenance-app/api/v1/notification/unreadCount") @ApiOperation(value = "获取未读通知数量", tags = {"运维APP-消息通知"}) public R<Long> getUnreadNotificationCount() { // 从Token中获取当前登录用户ID @@ -66,7 +66,7 @@ return R.ok(count); } @GetMapping("/api/v1/notification/read") @GetMapping("/maintenance-app/api/v1/notification/read") @ApiOperation(value = "操作已读", tags = "运维APP-消息通知") public R<?> readNotification(@RequestParam Long notificationId){ notificationService.lambdaUpdate().set(XpOperationsUserNotification::getReadStatus, 1).eq(XpOperationsUserNotification::getId, notificationId).update(); xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpLoginAgreement.java
New file @@ -0,0 +1,45 @@ package com.xiaopeng.api.model.operation; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.xiaopeng.common.core.web.domain.BaseModel; import lombok.Data; /** * 登录协议 */ @Data public class XpLoginAgreement extends BaseModel { /** * 数据id */ @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 数据类型（1=乘客登录协议，2=运维端登录协议） */ @TableField("type") private Integer type; /** * 协议名称 */ @TableField("name") private String name; /** * 协议内容 */ @TableField("content") private String content; /** * 版本号 */ @TableField("version") private String version; /** * 排序 */ @TableField("sort") private Integer sort; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/WorkbenchAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/WorkbenchController.java
@@ -39,7 +39,7 @@ private RedisService redisService; @ApiOperation(value = "工作台") @PostMapping("/api/v1/workbench") @PostMapping("/maintenance-app/api/v1/workbench") public R<PageInfo<WorkBenchVO>> workbench(@RequestBody WorkBenchQuery query) throws UnsupportedEncodingException { LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser(); query.setOperationId(loginOperationUser.getId()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpChargingRecordController.java
@@ -51,7 +51,7 @@ * 车辆运维-车辆运维-车辆开始充电 */ @ApiOperation(value = "车辆运维-车辆运维-车辆开始充电", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/chargingRecord/startCharging") @PostMapping("/maintenance-app/api/v1/chargingRecord/startCharging") public R<String> startCharging(@RequestBody XpChargingRecordStartDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); @@ -63,7 +63,7 @@ * 车辆运维-车辆运维-车辆结束充电 */ @ApiOperation(value = "车辆运维-车辆运维-车辆结束充电", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/chargingRecord/stopCharging") @PostMapping("/maintenance-app/api/v1/chargingRecord/stopCharging") public R<String> stopCharging(@RequestBody XpChargingRecordStopDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); @@ -77,7 +77,7 @@ * 车辆运维-车辆运维-车辆充电查询当前状态 */ @ApiOperation(value = "车辆运维-车辆运维-车辆充电查询当前状态", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/chargingRecord/queryChargingStatus") @GetMapping("/maintenance-app/api/v1/chargingRecord/queryChargingStatus") public R<ChargingStatusVO> queryChargingStatus(@RequestParam Long vehicleId) { Long id = tokenService.getLoginOperationUser().getId(); ChargingStatusVO chargingStatusVO = xpChargingRecordService.queryChargingStatus(vehicleId); @@ -89,7 +89,7 @@ * 车辆运维-车辆运维-充电记录详情 */ @ApiOperation(value = "车辆运维-运维记录-充电记录详情", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/chargingRecord/chargingDetail") @GetMapping("/maintenance-app/api/v1/chargingRecord/chargingDetail") public R<XpChargingRecordVO> chargingDetail(@RequestParam Long id) throws UnsupportedEncodingException { XpChargingRecordVO xpChargingRecordVO = xpChargingRecordService.chargingDetail(id); return R.ok(xpChargingRecordVO); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationController.java
@@ -55,7 +55,7 @@ } @ApiOperation(value = "根据ID查询打卡地址", tags = {"运维APP-排班与考勤"}) @GetMapping("/api/v1/check-location/queryByUserId") @GetMapping("/maintenance-app/api/v1/check-location/queryByUserId") public R<XpCheckLocation> queryByUserId() { Long id = tokenService.getLoginOperationUser().getId(); return R.ok(xpCheckLocationService.queryByUserId(id)); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
@@ -40,13 +40,13 @@ @Autowired private TokenService tokenService; @ApiOperation(value = "校验是否在打卡范围内", tags = "运维APP-排班与考勤") @PostMapping("/api/v1/clock/verifyRange") @PostMapping("/maintenance-app/api/v1/clock/verifyRange") public R<Boolean> verifyRange(@RequestBody VerifyRangeDTO dto) { return R.ok(xpClockInService.verifyRange(dto)); } @ApiOperation(value = "上班打卡", tags = "运维APP-排班与考勤") @PostMapping("/api/v1/clock/clockIn") @PostMapping("/maintenance-app/api/v1/clock/clockIn") public R<String> clockIn(@RequestBody ClockDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); dto.setOperationsUserId(id); @@ -65,7 +65,7 @@ } @ApiOperation(value = "下班打卡", tags = "运维APP-排班与考勤") @PostMapping("/api/v1/clock/clockOut") @PostMapping("/maintenance-app/api/v1/clock/clockOut") public R<String> clockOut(@RequestBody ClockDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); dto.setOperationsUserId(id); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpSchedulingDetailAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpSchedulingDetailController.java
@@ -42,7 +42,7 @@ private TokenService tokenService; @ApiOperation(value = "查询个人排班与考勤信息", response = XpErrorType.class, tags = "运维APP-排班与考勤") @PostMapping("/api/v1/scheduling/shiftAttendance") @PostMapping("/maintenance-app/api/v1/scheduling/shiftAttendance") public R<ShiftAttendanceVO> shiftAttendance(@RequestBody ShiftAttendanceDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); dto.setOperationsUserId(id); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -88,13 +88,13 @@ private AccidentTaskQuartzScheduler accidentTaskQuartzScheduler; @ApiOperation(value = "事故类型列表", response = XpErrorType.class, tags = "运维APP-任务中心") @GetMapping("/api/v1/task/errorTypeList") @GetMapping("/maintenance-app/api/v1/task/errorTypeList") public R<List<XpErrorType>> errorTypeList() { return xpErrorTypeService.errorTypeList(); } @ApiOperation(value = "任务中心列表", response = TaskPageListVO.class, tags = "运维APP-任务中心") @PostMapping("/api/v1/task/pageList") @PostMapping("/maintenance-app/api/v1/task/pageList") public R<PageInfo<TaskPageListVO>> pageList(@RequestBody TaskPageListQuery query) { query.setUserId(tokenService.getLoginOperationUser().getXpOperationsUser().getId()); PageInfo<TaskPageListVO> pageList = xpTaskService.pageList(query); @@ -102,14 +102,14 @@ } @ApiOperation(value = "事故任务确认到达", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/confirmArrive") @GetMapping("/maintenance-app/api/v1/task/confirmArrive") public R confirmArrive(Long id) { Long userId = tokenService.getLoginOperationUser().getXpOperationsUser().getId(); return xpTaskService.confirmArrive(id, userId); } @ApiOperation(value = "查询车辆不分页列表", tags = "运维APP-任务中心") @PostMapping("/api/v1/task/listVehicle") @PostMapping("/maintenance-app/api/v1/task/listVehicle") public R<List<VehicleListVO>> listVehicle() { LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser(); @@ -148,7 +148,7 @@ } @ApiOperation(value = "上传车辆事故", tags = "运维APP-任务中心") @PostMapping("/api/v1/task/saveVehicleAccident") @PostMapping("/maintenance-app/api/v1/task/saveVehicleAccident") public R saveVehicleAccident(@RequestBody SaveVehicleAccidentDto dto) { LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser(); XpOperationsUser xpOperationsUser = loginOperationUser.getXpOperationsUser(); @@ -165,19 +165,19 @@ } @ApiOperation(value = "车辆事故任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/vehicleAccidentDetail") @GetMapping("/maintenance-app/api/v1/task/vehicleAccidentDetail") public R<TaskAccidentDetailVO> vehicleAccidentDetail(Long id) throws UnsupportedEncodingException { return xpTaskService.vehicleAccidentDetail(id); } @ApiOperation(value = "车辆其他常规任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/vehicleRoutineDetail") @GetMapping("/maintenance-app/api/v1/task/vehicleRoutineDetail") public R<TaskRoutineDetailVO> vehicleRoutineDetail(Long id) throws UnsupportedEncodingException { return xpTaskService.vehicleRoutineDetail(id); } @ApiOperation(value = "上传车辆其他常规任务详情", tags = "运维APP-任务中心") @PostMapping("/api/v1/task/saveRoutineDetail") @PostMapping("/maintenance-app/api/v1/task/saveRoutineDetail") public R saveRoutineDetail(@RequestBody SaveRoutineDetailDto dto) { LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser(); Long id = loginOperationUser.getId(); @@ -185,31 +185,31 @@ } @ApiOperation(value = "车辆常规充电任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/chargingDetail") @GetMapping("/maintenance-app/api/v1/task/chargingDetail") public R<TaskChargingDetailVO> chargingDetail(Long id) { return xpTaskService.chargingDetail(id); } @ApiOperation(value = "车辆常规维修任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/repairDetail") @GetMapping("/maintenance-app/api/v1/task/repairDetail") public R<TaskRepairDetailVO> repairDetail(Long id) { return xpTaskService.repairDetail(id); } @ApiOperation(value = "车辆常规整备任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/preparationDetail") @GetMapping("/maintenance-app/api/v1/task/preparationDetail") public R<TaskPreparationDetailVO> preparationDetail(Long id) { return xpTaskService.preparationDetail(id); } @ApiOperation(value = "车辆常规检测任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/detectionDetail") @GetMapping("/maintenance-app/api/v1/task/detectionDetail") public R<TaskDetectionDetailVO> detectionDetail(Long id) { return xpTaskService.detectionDetail(id); } @ApiOperation(value = "车辆常规洗车任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/cleanDetail") @GetMapping("/maintenance-app/api/v1/task/cleanDetail") public R<TaskCleanDetailVO> cleanDetail(Long id) throws UnsupportedEncodingException { return xpTaskService.cleanDetail(id); } @@ -217,7 +217,7 @@ @Transactional @ShardingSphereTransactionType(TransactionType.BASE) @ApiOperation(value = "处理车辆事故", tags = "运维APP-任务中心") @PostMapping("/api/v1/task/handleVehicleAccident") @PostMapping("/maintenance-app/api/v1/task/handleVehicleAccident") public R handleVehicleAccident(@RequestBody HandleVehicleAccidentDto dto) { LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser(); XpOperationsUser xpOperationsUser = loginOperationUser.getXpOperationsUser(); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java
@@ -74,7 +74,7 @@ @Transactional @ShardingSphereTransactionType(TransactionType.BASE) @ApiOperation(value = "车辆运维-车辆运维-车身清洁", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicleClean/add") @PostMapping("/maintenance-app/api/v1/vehicleClean/add") public R<String> add(@RequestBody XpVehicleCleanDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); dto.setOperationsUserId(id); @@ -88,7 +88,7 @@ * 车辆运维-车辆运维-清洁记录详情 */ @ApiOperation(value = "车辆运维-运维记录-清洁记录详情", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehicleClean/cleanDetail") @GetMapping("/maintenance-app/api/v1/vehicleClean/cleanDetail") public R<XpVehicleCleanVO> cleanDetail(@RequestParam Long id) throws UnsupportedEncodingException { XpVehicleCleanVO xpVehicleCleanVO = xpVehicleCleanService.cleanDetail(id); String vehiclePictures = xpVehicleCleanVO.getVehiclePictures(); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDescriptionAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDescriptionController.java
@@ -32,7 +32,7 @@ } @ApiOperation(value = "获取车辆整备、充电、检测、保险、年检、保养、运营资质说明",notes = "车辆说明1胎压说明 2灯光说明 3车身标识及清洁说明 4舱内清洁及消毒 5遗失物品上报 6车辆充电说明 7车辆检测说明 8=车辆保险标准说明 9=车辆年检标准说明 10=车辆保养标准说明 11=车辆运营资质标准说明",tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehicle/vehicleDescription") @GetMapping("/maintenance-app/api/v1/vehicle/vehicleDescription") public R<XpVehicleDescription> getVehicleDescription(@RequestParam Integer descriptionType) { XpVehicleDescription xpVehicleDescription = xpVehicleDescriptionService.getOne(Wrappers.lambdaQuery(XpVehicleDescription.class) .eq(XpVehicleDescription::getDescriptionType,descriptionType) xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
@@ -61,7 +61,7 @@ * 车辆运维-车辆运维-开始自检 */ @ApiOperation(value = "车辆运维-车辆运维-开始自检", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehicleDetection/startDetection") @GetMapping("/maintenance-app/api/v1/vehicleDetection/startDetection") public R<Map<String, Integer>> startDetection(@RequestParam Long vehicleId) { // TODO 开始自检 @@ -84,7 +84,7 @@ @Transactional @ShardingSphereTransactionType(TransactionType.BASE) @ApiOperation(value = "车辆运维-车辆运维-车辆检测提交", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicleDetection/saveDetection") @PostMapping("/maintenance-app/api/v1/vehicleDetection/saveDetection") public R<String> saveDetection(@RequestBody XpVehicleDetectionDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); dto.setOperationsUserId(id); @@ -100,7 +100,7 @@ * 车辆运维-车辆运维-检测记录详情 */ @ApiOperation(value = "车辆运维-运维记录-检测记录详情", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehicleDetection/detectionDetail") @GetMapping("/maintenance-app/api/v1/vehicleDetection/detectionDetail") public R<XpVehicleDetectionVO> detectionDetail(@RequestParam Long id) throws UnsupportedEncodingException { XpVehicleDetectionVO xpVehicleDetectionVO = xpVehicleDetectionService.detectionDetail(id);
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
@@ -70,7 +70,7 @@ */ @Transactional(rollbackFor = Exception.class) @ApiOperation(value = "车辆运维-车辆调度-发车/收车", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicle/vehicleDispatchDeparture") @PostMapping("/maintenance-app/api/v1/vehicle/vehicleDispatchDeparture") public R<String> vehicleDispatchDeparture(@RequestBody VehicleDispatchDepartureDTO dto) { // 判断是否有正在进行的正常订单 @@ -164,7 +164,7 @@ * 车辆详情-车辆调度-接单、测试 */ @ApiOperation(value = "车辆运维-车辆调度-接单、测试", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicle/vehicleDispatchAccept") @PostMapping("/maintenance-app/api/v1/vehicle/vehicleDispatchAccept") public R<String> vehicleDispatchAccept(@RequestBody VehicleDispatchAcceptDTO dto) { // 查询车辆 XpVehicle xpVehicle = xpVehicleClient.queryById(dto.getVehicleId()).getData(); @@ -180,7 +180,7 @@ * 车辆详情-车辆调度-运维记录 */ @ApiOperation(value = "车辆运维-车辆调度-运维记录", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicle/operationRecords") @PostMapping("/maintenance-app/api/v1/vehicle/operationRecords") public R<PageInfo<OperationRecordsVO>> operationRecords(@Validated @RequestBody OperationRecordsQuery query) throws UnsupportedEncodingException { PageInfo<OperationRecordsVO> operationRecords = xpVehiclePreparationService.operationRecords(query); for (OperationRecordsVO record : operationRecords.getRecords()) { xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationAPPController.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java
@@ -56,7 +56,7 @@ @Transactional @ShardingSphereTransactionType(TransactionType.BASE) @ApiOperation(value = "车辆运维-车辆运维-车辆整备", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehiclePreparation/savePreparation") @PostMapping("/maintenance-app/api/v1/vehiclePreparation/savePreparation") public R<String> savePreparation(@RequestBody XpVehiclePreparationDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); dto.setOperationsUserId(id); @@ -70,7 +70,7 @@ * 车辆运维-车辆运维-整备记录详情 */ @ApiOperation(value = "车辆运维-运维记录-整备记录详情", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehiclePreparation/preparationDetail") @GetMapping("/maintenance-app/api/v1/vehiclePreparation/preparationDetail") public R<XpVehiclePreparationVO> preparationDetail(@RequestParam Long id) throws UnsupportedEncodingException { XpVehiclePreparationVO xpVehiclePreparationVO = xpVehiclePreparationService.preparationDetail(id);
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
@@ -57,7 +57,7 @@ * 车辆详情-车辆运维-车辆送修 */ @ApiOperation(value = "车辆运维-车辆运维-车辆送修", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicleRepair/saveRepair") @PostMapping("/maintenance-app/api/v1/vehicleRepair/saveRepair") public R<String> saveRepair(@Validated @RequestBody XpVehicleRepairStartDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); @@ -68,7 +68,7 @@ * 车辆详情-车辆运维-车辆取回 */ @ApiOperation(value = "车辆运维-车辆运维-车辆取回", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicleRepair/saveReturnRepair") @PostMapping("/maintenance-app/api/v1/vehicleRepair/saveReturnRepair") public R<String> saveReturnRepair(@Validated @RequestBody XpVehicleRepairReturnDTO dto) { Long id = tokenService.getLoginOperationUser().getId(); if (dto.getRepairMoney()>99999999.99) { @@ -82,7 +82,7 @@ * 车辆详情-车辆运维-查询车辆维修状态 */ @ApiOperation(value = "车辆运维-车辆运维-查询车辆维修状态", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehicleRepair/queryRepairStatus") @GetMapping("/maintenance-app/api/v1/vehicleRepair/queryRepairStatus") public R<RepairStatusVO> queryRepairStatus(@RequestParam Long vehicleId) { Long id = tokenService.getLoginOperationUser().getId(); RepairStatusVO repairStatusVO = xpVehicleRepairService.queryRepairStatus(vehicleId); @@ -93,7 +93,7 @@ * 车辆运维-车辆运维-维修记录详情 */ @ApiOperation(value = "车辆运维-运维记录-维修记录详情", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/vehicleRepair/repairDetail") @GetMapping("/maintenance-app/api/v1/vehicleRepair/repairDetail") public R<XpVehicleRepairVO> repairDetail(@RequestParam Long id) throws UnsupportedEncodingException { XpVehicleRepairVO xpVehicleRepairVO = xpVehicleRepairService.repairDetail(id);
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/IndexController.java
@@ -40,7 +40,7 @@ } @ApiOperation(value = "点位管理列表", tags = {"运维APP-站点导航"}) @PostMapping("/api/v1/map/list") @PostMapping("/maintenance-app/api/v1/map/list") public R<List<XpPoint>> list(@RequestBody PointListQuery query) { return pointClient.list( query); } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceAPPController.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java
@@ -49,7 +49,7 @@ * @return */ @ApiOperation(value = "获取地图开放区域围栏",tags = {"运维APP-电子围栏"},response = XpElectronicFenceVo.class) @GetMapping("/api/v1/fence/listByCityCode") @GetMapping("/maintenance-app/api/v1/fence/listByCityCode") public R<List<XpElectronicFenceVo>> listByCityCode(@RequestParam String cityCode) { return R.ok(xpElectronicFenceAreaService.citiesList(cityCode)); } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementAPPController.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
@@ -95,7 +95,7 @@ * @return 电子围栏列表 */ @ApiOperation(value = "电子围栏列表接口", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/electronicFence/list") @GetMapping("/maintenance-app/api/v1/electronicFence/list") public R<List<XpElectronicFence>> vehicleMap() { List<XpElectronicFence> list = xpElectronicFenceService.list(); return R.ok(list); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/SysMenuAPPController.java
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/SysMenuController.java
@@ -57,7 +57,7 @@ return R.ok(menuService.getPermission()); } @GetMapping("/api/v1/getAppPermission") @GetMapping("/maintenance-app/api/v1/getAppPermission") @ApiOperation(value = "获取获取当前登录用户权限列表", tags = {"运维APP-个人中心"}) public R<List<SysMenu>> getAppPermission(){ return R.ok(menuService.getAppPermission()); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementAPPController.java
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
@@ -3,7 +3,9 @@ import com.xiaopeng.api.model.operation.XpAgreement; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.controller.BaseController; import com.xiaopeng.operation.dto.XpAgreementAppUserDto; import com.xiaopeng.operation.dto.XpAgreementDTO; import com.xiaopeng.operation.service.IXpLoginAgreementService; import com.xiaopeng.operation.service.XpAgreementService; import com.xiaopeng.operation.vo.XpAgreementVo; import com.xiaopeng.unifiedverification.interceptor.XpClientCheck; @@ -14,6 +16,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.List; @@ -24,39 +28,49 @@ private final XpAgreementService xpAgreementService; @Resource private IXpLoginAgreementService xpLoginAgreementService; public XpAgreementController(XpAgreementService xpAgreementService) { this.xpAgreementService = xpAgreementService; } @ApiOperation(value = "获取协议",tags = {"小程序-首页"},response = XpAgreementVo.class) @ApiOperation(value = "获取协议", tags = {"小程序-首页"}, response = XpAgreementVo.class) @GetMapping("/base/v1/mini-program/privacy/content/{type}") public R<XpAgreementVo> getContent(@PathVariable Integer type) { return R.ok(xpAgreementService.getContentByType(type)); } @ApiOperation(value = "获取协议所有",tags = {"小程序-首页所有"},response = XpAgreementVo.class) @ApiOperation(value = "获取协议所有", tags = {"小程序-首页所有"}, response = XpAgreementVo.class) @GetMapping("/base/v1/mini-program/privacy/contentAll") public R<List<XpAgreementVo>> contentAll() { return R.ok(xpAgreementService.getContentByTypeAll()); } @ApiOperation(value = "获取协议/隐私政策",tags = {"运维APP-个人中心"},response = XpAgreementVo.class) @GetMapping("/base/v1/privacy/content/{type}") @ApiOperation(value = "获取协议/隐私政策", tags = {"运维APP-个人中心"}, response = XpAgreementVo.class) @GetMapping("/maintenance-app/base/v1/privacy/content/{type}") public R<XpAgreementVo> getAppContent(@ApiParam(name = "type", value = "类型 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用") @PathVariable Integer type) { return R.ok(xpAgreementService.getContentByType(type)); } @ApiOperation(value = "获取协议",tags = {"管理后台-内容中心"}) @ApiOperation(value = "获取登录协议", tags = {"运维APP-登录"}, response = XpAgreementVo.class) @GetMapping("/maintenance-app/base/v1/loginAgreement/getLoginAgreementList") public R<List<XpAgreementVo>> getLoginAgreementList() { return R.ok(xpLoginAgreementService.getLoginAgreementList(2)); } @ApiOperation(value = "获取协议", tags = {"管理后台-内容中心"}) @GetMapping("/api/v1/agreement/content/{type}") public R<XpAgreement> getAgreementContent(@ApiParam(name = "type", value = "类型 1=小鹏Robotaxi隐私政策 2=个人信息收集清单 3=敏感个人信息处理情况说明 4=向第三方提供个人信息情况的说明 5=乘车须知 6=计费规则说明 7=权限说明 8=运维APP-小鹏Robotaxi自动驾驶出行运维隐私政策 9=运维APP-第三方共享信息清单 10=运维APP-个人信息收集清单 11=运维APP-权限调用") @PathVariable Integer type) { return R.ok(xpAgreementService.getAgreementContent(type)); } @ApiOperation(value = "保存协议",tags = {"管理后台-内容中心"}) @ApiOperation(value = "保存协议", tags = {"管理后台-内容中心"}) @PostMapping("/api/v1/agreement/save") public R<?> saveAgreement(@RequestBody @Valid XpAgreementDTO dto){ public R<?> saveAgreement(@RequestBody @Valid XpAgreementDTO dto) { xpAgreementService.saveAgreement(dto); return R.ok(); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAppVersionAPPController.java
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAppVersionController.java
@@ -28,7 +28,7 @@ /** * 获取App最新版本(运维APP接口) */ @GetMapping("/api/v1/app/version/latest") @GetMapping("/maintenance-app/api/v1/app/version/latest") @ApiOperation(value = "获取App最新版本", tags = {"运维APP-版本管理"}) public R<XpAppVersionVO> getLatestVersion() { log.info("查询App最新版本"); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceAPPController.java
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java
@@ -42,7 +42,7 @@ */ @RestController @Slf4j @RequestMapping("/api/v1/electronicFence") @RequestMapping("") public class XpElectronicFenceController { @@ -59,12 +59,12 @@ * 查询省市管理 */ @ApiOperation(value = "查询省市区",response = XpRegion.class) @GetMapping(value = "/getRegion") @GetMapping(value = "/api/v1/electronicFence/getRegion") public R<List<List<XpRegion>>> geXpRegion() { return R.ok(regionService.getXpRegion()); } @ApiOperation(value = "电子围栏管理列表", response = XpElectronicFence.class) @PostMapping("/pageList") @PostMapping("/api/v1/electronicFence/pageList") public R<PageInfo<XpElectronicFence>> pageList(@RequestBody ElectronicPageListQuery query) { PageInfo<XpElectronicFence> pageList = xpElectronicFenceService.pageList(query); return R.ok(pageList); @@ -75,7 +75,7 @@ * @return 电子围栏列表 */ @ApiOperation(value = "电子围栏列表接口", tags = {"运维APP-车辆管理"}) @GetMapping("/operationsFenceList") @GetMapping("/maintenance-app/api/v1/electronicFence/operationsFenceList") public R<List<XpElectronicFence>> operationsFenceList() { List<XpElectronicFence> list = xpElectronicFenceService.list(Wrappers.lambdaQuery(XpElectronicFence.class).eq(XpElectronicFence::getStatus, 2)); return R.ok(list); @@ -83,7 +83,7 @@ /** * 新增电子围栏 */ @PostMapping("/add") @PostMapping("/api/v1/electronicFence/add") @ApiOperation(value = "新增电子围栏") public R add(@Validated @RequestBody ElectronicFenceAddDto dto) { return xpElectronicFenceService.addElectronic(dto); @@ -94,7 +94,7 @@ /** * 修改状态 */ @PostMapping("/updateStatus") @PostMapping("/api/v1/electronicFence/updateStatus") @ResponseBody @ApiOperation(value = "修改状态") public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) { @@ -112,7 +112,7 @@ /** * 电子围栏详情 */ @PostMapping("/queryById") @PostMapping("/api/v1/electronicFence/queryById") @ApiOperation(value = "电子围栏详情") public R<ElectronicFenceDetailVo> queryById(@RequestParam("id")Long id) { ElectronicFenceDetailVo res = new ElectronicFenceDetailVo(); @@ -133,7 +133,7 @@ /** * 编辑电子围栏 */ @PostMapping("/edit1") @PostMapping("/api/v1/electronicFence/edit1") @ApiOperation(value = "编辑电子围栏") public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) { return xpElectronicFenceService.editElectronic(dto); @@ -142,7 +142,7 @@ /** * 复制电子围栏 */ @PostMapping("/copy") @PostMapping("/api/v1/electronicFence/copy") @ApiOperation(value = "复制电子围栏") @Transactional @ShardingSphereTransactionType(TransactionType.BASE) @@ -176,7 +176,7 @@ * @param electronicIdSet * @return */ @PostMapping("/listByIds") @PostMapping("/api/v1/electronicFence/listByIds") R<List<XpElectronicFence>> listByIds(@RequestBody Collection<Long> electronicIdSet) { if (CollUtil.isEmpty(electronicIdSet)) { return R.ok(Collections.emptyList()); @@ -185,14 +185,14 @@ } @ApiOperation(value = "获取已启用的电子围栏列表",tags = {"管理后台-在库车辆管理"}) @GetMapping("/available/list") @GetMapping("/api/v1/electronicFence/available/list") R<List<XpElectronicFence>> getAvailableList(){ return R.ok(xpElectronicFenceService.getAvailableList()); } @ApiOperation(value = "获取不分页的电子围栏列表",tags = {"管理后台-在库车辆管理"}) @GetMapping("/list") @GetMapping("/api/v1/electronicFence/list") R<List<XpElectronicFence>> getList(){ return R.ok(xpElectronicFenceService.getList()); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingAPPController.java
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java
@@ -85,7 +85,7 @@ } @GetMapping("/base/v1/support/phone") @GetMapping("/maintenance-app/base/v1/support/phone") @ApiOperation(value = "获取客服电话", tags = {"运维APP-个人中心"}, response = String.class) public R<CustomerServicePhoneVo> getCustomerPhone() { Object customerServicePhone = redisService.getCacheObject(CacheConstants.CUSTOMER_SERVICE_PHONE); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/mapper/XpLoginAgreementMapper.java
New file @@ -0,0 +1,20 @@ package com.xiaopeng.operation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xiaopeng.api.model.operation.XpLoginAgreement; import com.xiaopeng.operation.vo.XpAgreementVo; import org.apache.ibatis.annotations.Param; import java.util.List; public interface XpLoginAgreementMapper extends BaseMapper<XpLoginAgreement> { /** * 查询登录协议 * @param type * @return */ List<XpAgreementVo> getLoginAgreementList(@Param("type") Integer type); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpLoginAgreementService.java
New file @@ -0,0 +1,18 @@ package com.xiaopeng.operation.service; import com.baomidou.mybatisplus.extension.service.IService; import com.xiaopeng.api.model.operation.XpLoginAgreement; import com.xiaopeng.operation.vo.XpAgreementVo; import java.util.List; public interface IXpLoginAgreementService extends IService<XpLoginAgreement> { /** * 查询登录协议 * @param type * @return */ List<XpAgreementVo> getLoginAgreementList(Integer type); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpLoginAgreementServiceImpl.java
New file @@ -0,0 +1,27 @@ package com.xiaopeng.operation.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.model.operation.XpLoginAgreement; import com.xiaopeng.operation.mapper.XpLoginAgreementMapper; import com.xiaopeng.operation.service.IXpLoginAgreementService; import com.xiaopeng.operation.vo.XpAgreementVo; import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; @Service public class XpLoginAgreementServiceImpl extends ServiceImpl<XpLoginAgreementMapper, XpLoginAgreement> implements IXpLoginAgreementService { /** * 查询登录协议 * @param type * @return */ @Override public List<XpAgreementVo> getLoginAgreementList(Integer type) { return this.baseMapper.getLoginAgreementList(type); } } xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpLoginAgreementMapper.xml
New file @@ -0,0 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.xiaopeng.operation.mapper.XpLoginAgreementMapper"> <select id="getLoginAgreementList" resultType="com.xiaopeng.operation.vo.XpAgreementVo"> select id, name, content, version from xp_login_agreement where is_deleted = 0 and type = #{type} order by `sort` desc </select> </mapper> xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpPolicyApplicationAPPController.java
File was deleted xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpPolicyApplicationController.java
@@ -51,7 +51,7 @@ } @ApiOperation(value = "申请保单查看", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/policyApplication/applyPolicyInformation") @GetMapping("/maintenance-app/api/v1/policyApplication/applyPolicyInformation") public R<String> applyPolicyInformation(@RequestParam Long vehicleId) { Long id = tokenService.getLoginOperationUser().getId(); @@ -61,7 +61,7 @@ } @ApiOperation(value = "通过车辆id查询保单审核明细", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/policyApplication/queryPolicyInfoByVid") @GetMapping("/maintenance-app/api/v1/policyApplication/queryPolicyInfoByVid") public R<QueryPolicyInfoVO> queryPolicyInfoByVid(@RequestParam Long vehicleId) { Long id = tokenService.getLoginOperationUser().getId(); xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleAPPController.java
File was deleted xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -883,7 +883,7 @@ * 车辆详情-车辆调度-接单、测试 */ @ApiOperation(value = "车辆详情", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicle/vehicleDetail") @PostMapping("/maintenance-app/api/v1/vehicle/vehicleDetail") public R<XpVehicleVO> vehicleDetail(@RequestParam Long id) { // 查询车辆 XpVehicle xpVehicle = xpVehicleService.getById(id); @@ -963,7 +963,7 @@ * @return 车辆列表 */ @ApiOperation(value = "车辆管理-地图", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicle/vehicleMap") @PostMapping("/maintenance-app/api/v1/vehicle/vehicleMap") public R<PageInfo<XpVehicleVO>> vehicleMap(@RequestBody VehicleMapQuery query) { Long operationsUserId = tokenService.getLoginOperationUser().getId(); query.setOperationsUserId(operationsUserId); @@ -985,7 +985,7 @@ * 车辆详情-车门解锁/后备箱解锁 */ @ApiOperation(value = "车辆运维-车门解锁/后备箱解锁", tags = {"运维APP-车辆管理"}) @PostMapping("/api/v1/vehicle/unlockByType") @PostMapping("/maintenance-app/api/v1/vehicle/unlockByType") public R<String> unlockByType(@RequestBody UnlockByTypeDTO dto) { // TODO 车门解锁、后备箱解锁
