Merge remote-tracking branch 'origin/master'

无关风月

13 小时以前 053c2264ab5d7596aea3f8fcac18d487e6f9c766

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetAdServiceImpl.java

@@ -1,19 +1,35 @@
package com.ruoyi.system.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.dto.asset.AssetAdDTO;
import com.ruoyi.system.mapper.AssetAdMapper;
import com.ruoyi.system.mapper.AssetAdRentalRecordMapper;
import com.ruoyi.system.model.AssetAd;
import com.ruoyi.system.model.AssetAdRentalRecord;
import com.ruoyi.system.query.AssetAdQuery;
import com.ruoyi.system.service.AssetAdService;
import com.ruoyi.system.service.AssetTypeService;
import com.ruoyi.system.vo.asset.AssetAdDetailVO;
import com.ruoyi.system.vo.asset.AssetAdRentalRecordVO;
import com.ruoyi.system.vo.asset.AssetAdVO;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
 * <p>
@@ -27,6 +43,8 @@
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class AssetAdServiceImpl extends ServiceImpl<AssetAdMapper, AssetAd> implements AssetAdService {
    private final AssetTypeService assetTypeService;
    private final AssetAdRentalRecordMapper rentalRecordMapper;

    @Override
    public void addAssetAd(AssetAdDTO dto) {
        AssetAd assetAd = BeanUtil.copyProperties(dto, AssetAd.class);
@@ -62,4 +80,105 @@
        assetAd.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
        updateById(assetAd);
    }

    @Override
    public IPage<AssetAdVO> getPageList(AssetAdQuery query) {
        // 1. 分页查询 AssetAd
        Page<AssetAd> page = new Page<>(query.getPageNum(), query.getPageSize());
        LambdaQueryWrapper<AssetAd> queryWrapper = new LambdaQueryWrapper<AssetAd>()
            .like(StringUtils.isNotBlank(query.getKeyword()), AssetAd::getAssetName, query.getKeyword())
            .or()
            .like(StringUtils.isNotBlank(query.getKeyword()), AssetAd::getAssetCode, query.getKeyword())
            .orderByDesc(AssetAd::getCreateTime);

        Page<AssetAd> assetPage = this.page(page, queryWrapper);

        // 2. 如果没有数据，返回空分页
        if (assetPage.getRecords().isEmpty()) {
            return new Page<>(query.getPageNum(), query.getPageSize());
        }

        // 3. 获取所有资产ID
        List<Integer> assetAdIds = assetPage.getRecords().stream()
            .map(AssetAd::getId)
            .collect(Collectors.toList());

        // 4. 查询相关租赁记录
        LocalDate today = LocalDate.now();
        List<AssetAdRentalRecord> allRentalRecords = rentalRecordMapper.selectList(
            new LambdaQueryWrapper<AssetAdRentalRecord>()
                .in(AssetAdRentalRecord::getAssetAdId, assetAdIds)
                    .ge(AssetAdRentalRecord::getStartDate, today)
                    .le(AssetAdRentalRecord::getEndDate,today)
                .orderByDesc(AssetAdRentalRecord::getCreateTime)
        );

        // 5. 转换为Map
        Map<Integer, AssetAdRentalRecord> currentRentalMap = allRentalRecords.stream()
                .collect(Collectors.toMap(AssetAdRentalRecord::getAssetAdId, Function.identity()));

        // 6. 组装VO数据
        List<AssetAdVO> voList = new ArrayList<>();
        for (AssetAd asset : assetPage.getRecords()) {
            AssetAdVO vo = BeanUtil.copyProperties(asset, AssetAdVO.class);

            // 设置租赁相关信息
            AssetAdRentalRecord currentRental = currentRentalMap.get(asset.getId());
            if (currentRental != null) {
                vo.setCurrentUseBy(currentRental.getUseBy());
                vo.setRentalPrice(currentRental.getRentalPrice());
                vo.setUseDuration(calculateUseDuration(currentRental.getStartDate(), currentRental.getEndDate()));
            }

            voList.add(vo);
        }

        // 7. 返回分页结果
        Page<AssetAdVO> resultPage = new Page<>(query.getPageNum(), query.getPageSize());
        resultPage.setRecords(voList);
        resultPage.setTotal(assetPage.getTotal());
        resultPage.setSize(assetPage.getSize());
        resultPage.setCurrent(assetPage.getCurrent());
        resultPage.setPages(assetPage.getPages());

        return resultPage;
    }

    /**
     * 计算使用期限（月）
     */
    private Integer calculateUseDuration(LocalDate startDate, LocalDate endDate) {
        if (startDate == null || endDate == null) {
            return null;
        }
        // 计算月份差值
        long months = ChronoUnit.MONTHS.between(startDate, endDate);
        return (int) months;
    }

    @Override
    public AssetAdDetailVO getDetail(Integer id) {
        // 1. 查询资产基础信息
        AssetAd assetAd = getById(id);
        if (assetAd == null) {
            return null;
        }

        // 2. 查询租赁记录
        List<AssetAdRentalRecord> rentalRecords = rentalRecordMapper.selectList(
            new LambdaQueryWrapper<AssetAdRentalRecord>()
                .eq(AssetAdRentalRecord::getAssetAdId, id)
                .orderByDesc(AssetAdRentalRecord::getStartDate)
        );

        // 3. 转换为AssetAdDetailVO
        AssetAdDetailVO detailVO = BeanUtil.copyProperties(assetAd, AssetAdDetailVO.class);

        // 4. 转换租赁记录为VO列表
        List<AssetAdRentalRecordVO> rentalRecordVOList = BeanUtil.copyToList(rentalRecords, AssetAdRentalRecordVO.class);
        
        detailVO.setRentalRecordVOList(rentalRecordVOList);

        return detailVO;
    }
}