工单异步获取图片、工单导出时间参数bug

fuliqi

2024-11-05 3dc714284a95fe9677a964ec039b2b547547e30d

 ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java

@@ -1,34 +1,44 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.dto.ReportImportDTO;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.ReportAuditingForm;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
import com.ycl.platform.domain.vo.ReportVO;
import com.ycl.platform.domain.vo.YwPointVO;
import com.ycl.platform.mapper.ReportMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.ReportAuditingRecordService;
import com.ycl.platform.service.ReportErrorTypeService;
import com.ycl.platform.service.ReportService;
import com.ycl.system.Result;
import com.ycl.system.entity.SysDictData;
import com.ycl.system.page.PageUtil;
import com.ycl.system.service.ISysDictTypeService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.StringUtils;
import com.ycl.utils.html.EscapeUtil;
import com.ycl.utils.poi.ExcelUtil;
import com.ycl.utils.uuid.IdUtils;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -44,6 +54,9 @@
    private final YwUnitMapper unitMapper;
    private final YwPointMapper ywpointMapper;
    private final YwPeopleMapper peopleMapper;
    private final ReportErrorTypeService reportErrorTypeService;
    private final ISysDictTypeService dictTypeService;
    private final ReportAuditingRecordService reportAuditingRecordService;

    /**
     * 添加
@@ -51,17 +64,114 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result add(ReportForm form) {
        Long userId = SecurityUtils.getUserId();
        YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
        form.setPeopleId(people.getId());
        form.setUnitId(people.getBelongUnit());
        Report entity = ReportForm.getEntityByForm(form, null);
        entity.setStatus(0);
        if(baseMapper.insert(entity) > 0) {
            return Result.ok("添加成功");
        if (Objects.isNull(form.getPointId())) {
            throw new RuntimeException("点位不能为空");
        }
        return Result.error("添加失败");
        Integer unitId = SecurityUtils.getUnitId();
        if (Objects.isNull(unitId)) {
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        if ("事前报备".equals(form.getReportType())) {
            // 如果是事前报备需要检验是否已经生成下发工单
            YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
            if (Objects.nonNull(point)) {
                throw new RuntimeException(String.format("点位【%s】已经存在下发工单，无法事前报备", point.getPointName()));
            }
        }
        YwPoint point = new LambdaQueryChainWrapper<>(ywpointMapper)
                .eq(YwPoint::getSerialNumber, form.getPointId())
                .one();
        if (Objects.isNull(point)) {
            throw new RuntimeException("点位不存在");
        }
        Report entity = ReportForm.getEntityByForm(form, null);
        entity.setSerialNumber(point.getSerialNumber());
        entity.setStatus(0);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        entity.setIdentify(IdUtils.randomNO(now));
        baseMapper.insert(entity);
        List<ReportErrorType> errorTypeList = form.getErrorTypeList().stream().map(item -> {
            ReportErrorType reportErrorType = new ReportErrorType();
            reportErrorType.setErrorType(item);
            reportErrorType.setDeleted(0);
            reportErrorType.setCreateTime(now);
            reportErrorType.setReportId(entity.getId());
            return reportErrorType;
        }).collect(Collectors.toList());
        reportErrorTypeService.saveBatch(errorTypeList);
        return Result.ok("报备成功");
    }

    @Override
    @SneakyThrows
    public void importTemplate(HttpServletResponse response) {
        ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
        excelUtil.exportExcel(response, null, "报备导入模板");
    }

    @Override
    @SneakyThrows
    @Transactional
    public Result importData(ReportForm form) {
        Integer unitId = SecurityUtils.getUnitId();
        if (Objects.isNull(unitId)) {
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
        form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
        // 读取excel数据
        ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
        List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
        Date now = DateUtils.getNowDate();
        // 批量插入
        String pid = IdUtils.randomNO(now);
        Integer success = 0;
        for (ReportImportDTO item : list) {
            if ("事前报备".equals(form.getReportType())) {
                // 如果是事前报备需要检验是否已经生成下发工单
                YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(item.getSerialNumber());
                if (Objects.nonNull(point)) {
                    throw new RuntimeException(String.format("点位【%s】已经存在下发工单，无法事前报备", point.getPointName()));
                }
            }
            YwPoint point = new LambdaQueryChainWrapper<>(ywpointMapper)
                    .eq(YwPoint::getSerialNumber, item.getSerialNumber())
                    .one();
            if (Objects.isNull(point)) {
                continue;
            }
            Report entity = ReportForm.getEntityByForm(form, null);
            entity.setImportBatchNumber(pid);
            entity.setSerialNumber(item.getSerialNumber());
            entity.setStatus(0);
            entity.setIdentify(IdUtils.randomNO(now));
            entity.setCreateTime(now);
            entity.setUpdateTime(now);
            baseMapper.insert(entity);
            List<ReportErrorType> errorTypeList = form.getErrorTypeList().stream().map(err -> {
                ReportErrorType reportErrorType = new ReportErrorType();
                reportErrorType.setErrorType(err);
                reportErrorType.setDeleted(0);
                reportErrorType.setCreateTime(now);
                reportErrorType.setReportId(entity.getId());
                return reportErrorType;
            }).collect(Collectors.toList());
            reportErrorTypeService.saveBatch(errorTypeList);
            success++;
        }
        return Result.ok("报备点位数：" + list.size() + "，导入成功数：" + success);
    }

    @Override
    public Result getTogether(String pid) {
        List<Report> list = baseMapper.getTogether(pid);
        return Result.ok().data(list);
    }

    /**
@@ -70,17 +180,45 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result update(ReportForm form) {

        Report entity = baseMapper.selectById(form.getId());

        // 为空抛IllegalArgumentException，做全局异常处理
        Assert.notNull(entity, "记录不存在");
        BeanUtils.copyProperties(form, entity);
        if (baseMapper.updateById(entity) > 0) {
            return Result.ok("修改成功");
        Date now = new Date();
        entity.setUpdateTime(now);
        if ("事前报备".equals(form.getReportType())) {
            // 如果是事前报备需要检验是否已经生成下发工单
            YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
            if (Objects.nonNull(point)) {
                throw new RuntimeException(String.format("点位【%s】已经存在下发工单，无法事前报备", point.getPointName()));
            }
        }
        return Result.error("修改失败");
        YwPoint point = new LambdaQueryChainWrapper<>(ywpointMapper)
                .eq(YwPoint::getSerialNumber, form.getPointId())
                .one();
        if (Objects.isNull(point)) {
            throw new RuntimeException("点位不存在");
        }
        BeanUtils.copyProperties(form, entity);
        entity.setSerialNumber(form.getPointId());
        // 重置为待审核
        entity.setStatus(0);
        baseMapper.updateById(entity);
        new LambdaUpdateChainWrapper<>(reportErrorTypeService.getBaseMapper())
                .eq(ReportErrorType::getReportId, form.getId())
                .remove();
        List<ReportErrorType> errorTypeList = form.getErrorTypeList().stream().map(err -> {
            ReportErrorType reportErrorType = new ReportErrorType();
            reportErrorType.setErrorType(err);
            reportErrorType.setDeleted(0);
            reportErrorType.setCreateTime(now);
            reportErrorType.setReportId(entity.getId());
            return reportErrorType;
        }).collect(Collectors.toList());
        reportErrorTypeService.saveBatch(errorTypeList);
        return Result.ok("修改成功");
    }

    /**
@@ -116,48 +254,25 @@
     */
    @Override
    public Result page(ReportQuery query) {

        if (StringUtils.isNotBlank(query.getPointId())) {
            LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPoint::getPointName, query.getPointId());
            query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPointIdList())) {
                return Result.ok();
        IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
        query.setUnitId(SecurityUtils.getUnitId());
        baseMapper.page(page, query);
        List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
        Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
        page.getRecords().stream().forEach(item -> {
            if (StringUtils.hasText(item.getErrorType())) {
                item.setErrorTypeList(List.of(item.getErrorType().split(",")));
                StringBuilder sb = new StringBuilder();
                item.getErrorTypeList().stream().forEach(err -> {
                    String s = dictMap.get(err);
                    if (org.springframework.util.StringUtils.hasText(s)) {
                        sb.append(s).append("、");
                    }
                });
                item.setErrorType(sb.substring(0, sb.length() - 1));
            }
        }
        if (StringUtils.isNotBlank(query.getPeopleId())) {
            LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
            query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
                return Result.ok();
            }
        }

        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
                .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
                .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
                .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));

        List<ReportVO> vos = page.getRecords().stream()
                .map(
                        entity -> {
                            ReportVO vo = ReportVO.getVoByEntity(entity, null);
                            YwUnit unit = unitMapper.selectById(vo.getUnitId());
                            vo.setUnitName(unit.getUnitName());
                            YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
                            vo.setPeopleName(ywPeople.getYwPersonName());
                            YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
                            vo.setPointName(ywPoint.getPointName());
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return Result.ok().data(vos).total(page.getTotal());
        });
        return Result.ok().data(page).total(page.getTotal());
    }

    /**
@@ -167,10 +282,16 @@
     */
    @Override
    public Result detail(String id) {

        Report entity = baseMapper.selectById(id);
        Assert.notNull(entity, "记录不存在");
        ReportVO vo = ReportVO.getVoByEntity(entity, null);
        vo.setPointId(vo.getSerialNumber());
        List<ReportErrorType> errList = new LambdaQueryChainWrapper<>(reportErrorTypeService.getBaseMapper())
                .select(ReportErrorType::getErrorType)
                .eq(ReportErrorType::getReportId, id)
                .list();
        List<String> list = errList.stream().map(ReportErrorType::getErrorType).collect(Collectors.toList());
        vo.setErrorTypeList(list);
        return Result.ok().data(vo);
    }

@@ -189,49 +310,95 @@
        return Result.ok().data(vos);
    }

    @Override
    public List<ReportVO> export(ReportQuery query) {

        if (StringUtils.isNotBlank(query.getPointId())) {
            LambdaQueryWrapper<YwPoint> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPoint::getPointName, query.getPointId());
            query.setPointIdList(ywpointMapper.selectList(queryWrapper).stream().map(YwPoint::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPointIdList())) {
                return new ArrayList<>();
        IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
        page.setSize(-1);
        query.setUnitId(SecurityUtils.getUnitId());
        baseMapper.page(page, query);
        List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
        Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
        page.getRecords().forEach(item -> {
            if (StringUtils.hasText(item.getErrorType())) {
                item.setErrorTypeList(List.of(item.getErrorType().split(",")));
                StringBuilder sb = new StringBuilder();
                item.getErrorTypeList().stream().forEach(err -> {
                    String s = dictMap.get(err);
                    if (org.springframework.util.StringUtils.hasText(s)) {
                        sb.append(s).append("、");
                    }
                });
                item.setErrorType(sb.substring(0, sb.length() - 1));
            }
        }
        if (StringUtils.isNotBlank(query.getPeopleId())) {
            LambdaQueryWrapper<YwPeople> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.like(YwPeople::getYwPersonName, query.getPeopleId());
            query.setPeopleIdList(peopleMapper.selectList(queryWrapper).stream().map(YwPeople::getId).collect(Collectors.toList()));
            if(CollectionUtils.isEmpty(query.getPeopleIdList())) {
                return new ArrayList<>();
            // 审核结果
            List<ReportAuditingRecord> records = new LambdaQueryChainWrapper<>(reportAuditingRecordService.getBaseMapper())
                    .eq(ReportAuditingRecord::getReportId, item.getId())
                    .orderByDesc(ReportAuditingRecord::getCreateTime)
                    .last("limit 1")
                    .list();
            if (! CollectionUtils.isEmpty(records)) {
                item.setResultStr(records.get(0).getResult() ? "通过" : "未通过");
                item.setResultRemark(records.get(0).getResultRemark());
                item.setAuditingTime(records.get(0).getCreateTime());
            } else {
                item.setResultStr("审核中");
            }
        }

        IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
                .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
                .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
                .in(!CollectionUtils.isEmpty(query.getPointIdList()), Report::getPointId, query.getPointIdList())
                .in(!CollectionUtils.isEmpty(query.getPeopleIdList()), Report::getPeopleId, query.getPeopleIdList())
                .orderByDesc(Report::getCreateTime)
                .page(PageUtil.getPage(query, Report.class));

        List<ReportVO> vos = page.getRecords().stream()
                .map(
                        entity -> {
                            ReportVO vo = ReportVO.getVoByEntity(entity, null);
                            YwUnit unit = unitMapper.selectById(vo.getUnitId());
                            vo.setUnitName(unit.getUnitName());
                            YwPeople ywPeople = peopleMapper.selectById(vo.getPeopleId());
                            vo.setPeopleName(ywPeople.getYwPersonName());
                            YwPoint ywPoint = ywpointMapper.selectById(vo.getPointId());
                            vo.setPointName(ywPoint.getPointName());
                            return vo;
                        }
                )
                .collect(Collectors.toList());
        return vos;
            item.setReportContent(EscapeUtil.clean(item.getReportContent()));
        });
        return page.getRecords();
    }


    @Override
    public Result auditingRecord(Integer id) {
        List<ReportVO> reportList = baseMapper.examineRecord(id);
        return Result.ok().data(reportList);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result auditing(ReportAuditingForm form) {
        if (CollectionUtils.isEmpty(form.getTogetherList())) {
            form.setTogetherList(new ArrayList<>(2));
        }
        form.getTogetherList().add(form.getId());
        for (Integer id : form.getTogetherList()) {
            Report report = baseMapper.selectById(id);
            if (Objects.isNull(report)) {
                continue;
            }
            if (form.getAuditingResult()) {
                report.setStatus(1);
            } else {
                report.setStatus(2);
            }
            Date now = new Date();
            report.setUpdateTime(now);
            baseMapper.updateById(report);

            // 添加一条审核记录
            ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
            reportAuditingRecord.setReportId(id);
            reportAuditingRecord.setDeleted(0);
            reportAuditingRecord.setCreateTime(now);
            reportAuditingRecord.setResultRemark(form.getAuditOpinion());
            reportAuditingRecord.setResult(form.getAuditingResult());
            reportAuditingRecordService.save(reportAuditingRecord);
        }
        return Result.ok("操作成功");
    }

    @Override
    public Result getListByGb(String gb) {
        List<ReportVO> list = baseMapper.getListByGb(gb);
        for (ReportVO report : list) {
            List<ReportErrorType> errors = new LambdaQueryChainWrapper<>(reportErrorTypeService.getBaseMapper())
                    .eq(ReportErrorType::getReportId, report.getId())
                    .orderByDesc(ReportErrorType::getCreateTime)
                    .list();
            String err = errors.stream().map(ReportErrorType::getErrorType).collect(Collectors.joining(","));
            report.setErrorType(err);
        }
        return Result.ok().data(list);
    }
}