xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -203,7 +203,7 @@ .in(XpOperationsRole::getOperationsUserId, operationsUserIds)); if(!CollectionUtils.isEmpty(xpOperationsRoles)){ List<Long> roleIds = xpOperationsRoles.stream().map(XpOperationsRole::getRoleId).collect(Collectors.toList()); List<Long> roleIds = xpOperationsRoles.stream().map(XpOperationsRole::getRoleId).distinct().collect(Collectors.toList()); // 查询列表关联的所有角色 List<SysRole> sysRoles = sysRoleMapper.selectList(Wrappers.lambdaQuery(SysRole.class) .in(SysRole::getId, roleIds)); xp-robotaxi-account-boot/src/main/resources/mapper/account/XpOperationsUserMapper.xml
@@ -40,9 +40,9 @@ and xou.phone_number like concat('%',#{query.phoneNumber},'%') </if> <if test="query.roleId != null"> AND EXISTS (SELECT 1 FROM xp_operations_role xor WHERE xor.operations_user_id = xou.id AND xor.role_id = #{query.roleId}) AND EXISTS (SELECT 1 FROM xp_operations_role xore WHERE xore.operations_user_id = xou.id AND xore.role_id = #{query.roleId}) </if> <if test="query.status != null"> and xou.status = #{query.status} xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementAccidentDetailVO.java
@@ -59,7 +59,12 @@ private String reportUserPhone; @ApiModelProperty(value = "上报人头像") private String reportUserAvatar; @ApiModelProperty(value = "上报人时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime createTime; @ApiModelProperty(value = "处理时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime handleTime; @ApiModelProperty(value = "处理id") private Long handleUserId; @ApiModelProperty(value = "处理名称") xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementChargingDetailVO.java
@@ -36,6 +36,8 @@ private String vehicleVin; @ApiModelProperty(value = "车辆地址") private String vehicleLocation; @ApiModelProperty(value = "车辆图片") private String vehiclePictures; @ApiModelProperty(value = "任务编号") private String taskCode; @ApiModelProperty(value = "开始剩余电量") @@ -58,4 +60,5 @@ private Long endOperationsUserId; @ApiModelProperty(value = "结束充电操作人名称") private String endOperationsUserName; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementCleanDetailVO.java
@@ -36,7 +36,8 @@ private String vehicleVin; @ApiModelProperty(value = "车辆地址") private String vehicleLocation; @ApiModelProperty(value = "车辆图片") private String vehiclePictures; @ApiModelProperty(value = "任务编号") private String taskCode; @@ -46,5 +47,11 @@ private Long operationUserId; @ApiModelProperty(value = "操作人名称") private String operationsUserName; @ApiModelProperty(value = "上报人时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime createTime; @ApiModelProperty(value = "处理时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime handleTime; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementDetectionDetailVO.java
@@ -36,6 +36,8 @@ private String vehicleVin; @ApiModelProperty(value = "车辆地址") private String vehicleLocation; @ApiModelProperty(value = "车辆图片") private String vehiclePictures; @ApiModelProperty(value = "任务编号") private String taskCode; @@ -95,4 +97,10 @@ @ApiModelProperty(value = "检测时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime checkTime; @ApiModelProperty(value = "上报人时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime createTime; @ApiModelProperty(value = "处理时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime handleTime; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementPreparationDetailVO.java
@@ -36,6 +36,8 @@ private String vehicleVin; @ApiModelProperty(value = "车辆地址") private String vehicleLocation; @ApiModelProperty(value = "车辆图片") private String vehiclePictures; @ApiModelProperty(value = "任务编号") private String taskCode; @ApiModelProperty(value = "左前轮") @@ -78,4 +80,5 @@ @ApiModelProperty(value = "操作时间") private LocalDateTime operationsTime; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementRepairDetailVO.java
@@ -37,7 +37,8 @@ private String vehicleVin; @ApiModelProperty(value = "车辆地址") private String vehicleLocation; @ApiModelProperty(value = "车辆图片") private String vehiclePictures; @ApiModelProperty(value = "任务编号") private String taskCode; @@ -76,4 +77,5 @@ @ApiModelProperty(value = "取回时间") private LocalDateTime returnTime; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementRoutineDetailVO.java
@@ -35,6 +35,8 @@ private String vehicleVin; @ApiModelProperty(value = "车辆地址") private String vehicleLocation; @ApiModelProperty(value = "车辆图片") private String vehiclePictures; @ApiModelProperty(value = "任务编号") private String taskCode; @ApiModelProperty(value = "完成任务情况描述") @@ -48,4 +50,8 @@ @ApiModelProperty(value = "处理时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime handleTime; @ApiModelProperty(value = "上报人时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime createTime; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -945,6 +945,8 @@ task.setEndTime(LocalDateTime.now().plusMinutes(taskRule.getProcessingTimeLimit())); } task.setTaskCategory(2); // todo 临时处理 task.setHandleUserId("1"); task.setTaskTypeId(dto.getTaskTypeId()); task.setTaskUrgencyLevel(dto.getTaskUrgencyLevel()); task.setTaskDescription(dto.getTaskDescription()); @@ -994,6 +996,7 @@ taskManagementDetectionDetailVO.setVehicleCode(vehicle.getVehicleCode()); taskManagementDetectionDetailVO.setVehicleVin(vehicle.getVehicleVin()); taskManagementDetectionDetailVO.setVehicleLocation(task.getVehicleLocation()); taskManagementDetectionDetailVO.setVehiclePictures(vehicle.getVehiclePictures()); taskManagementDetectionDetailVO.setTaskCode(task.getTaskCode()); XpVehicleDetection vehicleDetection = vehicleDetectionMapper.selectOne(new LambdaQueryWrapper<XpVehicleDetection>() .eq(XpVehicleDetection::getTaskId, id).last("limit 1")); @@ -1037,6 +1040,8 @@ taskManagementChargingDetailVO.setVehicleVin(vehicle.getVehicleVin()); taskManagementChargingDetailVO.setVehicleLocation(task.getVehicleLocation()); taskManagementChargingDetailVO.setTaskCode(task.getTaskCode()); taskManagementChargingDetailVO.setVehiclePictures(vehicle.getVehiclePictures()); XpChargingRecord chargingRecord = chargingRecordMapper.selectOne(new LambdaQueryWrapper<XpChargingRecord>() .eq(XpChargingRecord::getTaskId, id).last("limit 1")); if (chargingRecord != null) { @@ -1076,6 +1081,8 @@ taskManagementPreparationDetailVO.setVehicleVin(vehicle.getVehicleVin()); taskManagementPreparationDetailVO.setVehicleLocation(task.getVehicleLocation()); taskManagementPreparationDetailVO.setTaskCode(task.getTaskCode()); taskManagementPreparationDetailVO.setVehiclePictures(vehicle.getVehiclePictures()); XpVehiclePreparation vehiclePreparation = vehiclePreparationMapper.selectOne(new LambdaQueryWrapper<XpVehiclePreparation>() .eq(XpVehiclePreparation::getTaskId, id).last("limit 1")); if (vehiclePreparation != null) { @@ -1115,6 +1122,8 @@ taskManagementCleanDetailVO.setVehicleVin(vehicle.getVehicleVin()); taskManagementCleanDetailVO.setVehicleLocation(task.getVehicleLocation()); taskManagementCleanDetailVO.setTaskCode(task.getTaskCode()); taskManagementCleanDetailVO.setVehiclePictures(vehicle.getVehiclePictures()); XpVehicleClean vehicleClean = vehicleCleanMapper.selectOne(new LambdaQueryWrapper<XpVehicleClean>() .eq(XpVehicleClean::getTaskId, id).last("limit 1")); if (vehicleClean != null) { @@ -1142,6 +1151,8 @@ taskManagementRepairDetailVO.setVehicleVin(vehicle.getVehicleVin()); taskManagementRepairDetailVO.setVehicleLocation(task.getVehicleLocation()); taskManagementRepairDetailVO.setTaskCode(task.getTaskCode()); taskManagementRepairDetailVO.setVehiclePictures(vehicle.getVehiclePictures()); XpVehicleRepair vehicleRepair = vehicleRepairMapper.selectOne(new LambdaQueryWrapper<XpVehicleRepair>() .eq(XpVehicleRepair::getTaskId, id).last("limit 1")); if (vehicleRepair != null) { @@ -1182,6 +1193,7 @@ res.setVehicleLocation(task.getVehicleLocation()); res.setVehicleVin(vehicle.getVehicleVin()); res.setTaskCode(task.getTaskCode()); res.setVehiclePictures(vehicle.getVehiclePictures()); XpTaskHandleDetailRoutine xpTaskHandleDetailRoutine = xpTaskHandleDetailRoutineMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetailRoutine>() .eq(XpTaskHandleDetailRoutine::getTaskId, id)); if (xpTaskHandleDetailRoutine != null) { @@ -1220,6 +1232,8 @@ for (XpErrorType xpErrorType : xpErrorTypes) { xpErrorType.setChild(errorType.get(xpErrorType.getId())); } res.setCreateTime(task.getCreateTime()); res.setHandleTime(task.getHandleTime()); res.setErrorTypeList(xpErrorTypes); res.setStatus(task.getStatus()); res.setTaskDescription(task.getTaskDescription()); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceAreaController.java
@@ -34,7 +34,7 @@ * @return 区域信息 */ @ApiOperation(value = "根据区域ID查询区域信息", notes = "根据区域ID查询区域信息", tags = {"内部接口"}) @PostMapping("/inner/v1/xp-electronic-fence-area/queryById/queryById") @PostMapping("/inner/v1/xp-electronic-fence-area/queryById") public R<XpElectronicFenceArea> queryById(@RequestParam("id") Long id) { return R.ok(xpElectronicFenceAreaService.getById(id)); }
