运维修改

xuhy

2026-03-14 c0b9802720f8ac52398ed9b82ad2e65bf4184dd7

运维修改

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/OperationRecordsVO.java

@@ -34,7 +34,7 @@
    private Long operationsUserId;

    @ApiModelProperty(value = "操作时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy年MM月dd日 HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime operationTime;

    @ApiModelProperty(value = "开始剩余电量")

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java

@@ -103,6 +103,12 @@
    public R<String> clockIn(ClockDTO dto) {

        XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
        if (null == xpCheckLocation) {
            return R.fail("打卡地址不存在");
        }
        if (xpCheckLocation.getStatus() == 0) {
            return R.fail("打卡地址已禁用");
        }

        Map<String, Double> distance = GeodesyUtil.getDistance(dto.getUserLon() + "," + dto.getUserLat(), xpCheckLocation.getLocationLon() + "," + xpCheckLocation.getLocationLat());
        if (null != distance) {
@@ -143,6 +149,12 @@
    public R<String> clockOut(ClockDTO dto) {

        XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
        if (null == xpCheckLocation) {
            return R.fail("打卡地址不存在");
        }
        if (xpCheckLocation.getStatus() == 0) {
            return R.fail("打卡地址已禁用");
        }
        Map<String, Double> distance = GeodesyUtil.getDistance(dto.getUserLon() + "," + dto.getUserLat(), xpCheckLocation.getLocationLon() + "," + xpCheckLocation.getLocationLat());
        if (null != distance) {
            Double distance1 = distance.get("WGS84");

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehiclePreparationServiceImpl.java

@@ -7,6 +7,7 @@
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.maintenance.XpVehiclePreparation;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
import com.xiaopeng.maintenance.model.query.XpVehiclePreparationPageQuery;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.vo.maintenance.XpVehiclePreparationDetailVO;
@@ -20,6 +21,9 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

@@ -55,6 +59,8 @@
    private XpOperationUserClient xpOperationUserClient;
    @Autowired
    private XpVehicleClient xpVehicleClient;
    @Autowired
    private MongoTemplate mongoTemplate;


    @Override
@@ -69,6 +75,12 @@
            case 2:
                // 充电记录
                operationRecords = xpChargingRecordMapper.operationRecords(query);
                if(!CollectionUtils.isEmpty(operationRecords)){
                    for (OperationRecordsVO operationRecord : operationRecords) {
                        operationRecord.setStartMileageRange(Objects.isNull(operationRecord.getStartMileageRange())?0.0f:operationRecord.getStartMileageRange());
                        operationRecord.setEndMileageRange(Objects.isNull(operationRecord.getEndMileageRange())?0.0f:operationRecord.getEndMileageRange());
                    }
                }
                break;
            case 3:
                // 检测记录
@@ -88,7 +100,7 @@
            return pageInfo;
        }

        List<Long> userIds = operationRecords.stream().map(OperationRecordsVO::getOperationsUserId).collect(Collectors.toList());
        List<Long> userIds = operationRecords.stream().map(OperationRecordsVO::getOperationsUserId).distinct().collect(Collectors.toList());
        // 查询操作人信息
        R<List<XpOperationsUser>> listR = xpOperationUserClient.listByIds(userIds);
        List<XpOperationsUser> xpOperationsUsers = listR.getData();

 xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/utils/AliPushUtil.java

@@ -104,7 +104,7 @@
                        .targetValue(account)
                        .title(title)
                        .body(content)
                        .androidExtParameters(body)
//                        .androidExtParameters(body)
                        .androidNotificationChannel(channelIds)
                        .build();
                if(deviceType == 2){