ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java

@@ -24,6 +24,7 @@

    private Integer id;


    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;

@@ -33,6 +34,7 @@
    private Integer whichYear;
    /** 运维单位 */
    private String unitName;
    private Integer unitId;

    /** 合同名称 */
    private String contractName;

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

@@ -74,6 +74,8 @@
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        Long userId = SecurityUtils.getLoginUser().getUserId();
        form.setPeopleId(Integer.parseInt(userId+""));
        if ("事前报备".equals(form.getReportType())) {
            // 如果是事前报备需要检验是否已经生成下发工单
            YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());

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

@@ -477,12 +477,16 @@
        //一个部门一个sheet
        for (Integer deptId : exportForm.getDeptIds()) {
            CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                //筛选部门数据
                Set<String> ids = onlineResult.stream().filter(tMonitorResult -> deptId.equals(tMonitorResult.getDeptId())).map(BaseResult::getNo).collect(Collectors.toSet());
                if (CollectionUtils.isEmpty(ids)) return;
                //筛选部门数据
                List<TMonitorResult> onlineList = onlineResult.stream().filter(tMonitorResult -> deptId.equals(tMonitorResult.getDeptId())).collect(Collectors.toList());
                Map<LocalDate, List<TMonitorResult>> onlineMap = onlineList.stream()
                        .collect(Collectors.groupingBy(TMonitorResult::getMongoCreateTime));
                List<RecordMetaDSumResult> recordList = recordResult.stream().filter(result -> ids.contains(result.getNo())).collect(Collectors.toList());
                Map<Date, List<RecordMetaDSumResult>> recordMap = recordList.stream().collect(Collectors.groupingBy(RecordMetaDSumResult::getStatTime));
                List<VideoTotalExp> videoTotalExps = new ArrayList<>();
                for (int i = 0; i < 31; i++) {
                    String date = exportForm.getMonth();
@@ -490,41 +494,46 @@
                    //总量
                    VideoTotalExp totalExp = totalMap.computeIfAbsent(date, k -> new VideoTotalExp());
                    LocalDate parseTime = LocalDate.parse(date, formatter);
                    //获取星期几
                    String week = weeks[parseTime.getDayOfWeek().getValue() - 1];
                    VideoTotalExp videoExp = new VideoTotalExp();
                    videoExp.setDate(date);
                    videoExp.setWeek(week);
                    //设置点位在线总量
                    List<TMonitorResult> onlines = onlineList.stream().filter(tMonitorResult -> tMonitorResult.getMongoCreateTime().minusDays(1).equals(parseTime)).collect(Collectors.toList());
                    if (!CollectionUtils.isEmpty(onlines)) {
                        videoExp.setTotal(onlines.size());
                        long count = onlines.stream()
                                .filter(item -> ApiConstants.UY_OnlineSite_Online.equals(item.getOnline()))
                                .count();
                        videoExp.setOnline(Integer.valueOf(count + ""));
                        videoExp.setOffline(videoExp.getTotal() - videoExp.getOnline());
                    try {
                        Date parseDate = simpleDateFormat.parse(date);
                        //获取星期几
                        String week = weeks[parseTime.getDayOfWeek().getValue() - 1];
                        VideoTotalExp videoExp = new VideoTotalExp();
                        videoExp.setDate(date);
                        videoExp.setWeek(week);
                        //设置点位在线总量
                        List<TMonitorResult> onlines = onlineMap.get(parseTime);
                        if (!CollectionUtils.isEmpty(onlines)) {
                            videoExp.setTotal(onlines.size());
                            long count = onlines.stream()
                                    .filter(item -> ApiConstants.UY_OnlineSite_Online.equals(item.getOnline()))
                                    .count();
                            videoExp.setOnline(Integer.valueOf(count + ""));
                            videoExp.setOffline(videoExp.getTotal() - videoExp.getOnline());
                        }
                        //设置存储情况
                        List<RecordMetaDSumResult> records = recordMap.get(parseDate);
                        if (!CollectionUtils.isEmpty(records)) {
                            videoExp.setNoStore(Integer.valueOf(records.stream()
                                    .filter(record -> ApiConstants.UY_RecordStatus_Abnormal.equals(record.getRecordStatus()))
                                    .count() + ""));
                            videoExp.setPartStore(Integer.valueOf(records.stream()
                                    .filter(record -> ApiConstants.UY_RecordStatus_Interval.equals(record.getRecordStatus()))
                                    .count() + ""));
                        }
                        videoTotalExps.add(videoExp);
                        //累加作为全量表
                        totalExp.setDate(date);
                        totalExp.setWeek(week);
                        totalExp.setTotal((totalExp.getTotal() == null ? 0 : totalExp.getTotal()) + (videoExp.getTotal() == null ? 0 : videoExp.getTotal()));
                        totalExp.setOnline((totalExp.getOnline() == null ? 0 : totalExp.getOnline()) + (videoExp.getOnline() == null ? 0 : videoExp.getOnline()));
                        totalExp.setOffline((totalExp.getOffline() == null ? 0 : totalExp.getOffline()) + (videoExp.getOffline() == null ? 0 : videoExp.getOffline()));
                        totalExp.setNoStore((totalExp.getNoStore() == null ? 0 : totalExp.getNoStore()) + (videoExp.getNoStore() == null ? 0 : videoExp.getNoStore()));
                        totalExp.setPartStore((totalExp.getPartStore() == null ? 0 : totalExp.getPartStore()) + (videoExp.getPartStore() == null ? 0 : videoExp.getPartStore()));
                        totalMap.put(date, totalExp);
                    } catch (ParseException e) {
                        e.printStackTrace();
                    }
                    //设置存储情况
                    List<RecordMetaDSumResult> records = recordList.stream().filter(record -> record.getMongoCreateTime().minusDays(1).equals(parseTime)).collect(Collectors.toList());
                    if (!CollectionUtils.isEmpty(records)) {
                        videoExp.setNoStore(Integer.valueOf(records.stream()
                                .filter(record -> ApiConstants.UY_RecordStatus_Abnormal.equals(record.getRecordStatus()))
                                .count() + ""));
                        videoExp.setPartStore(Integer.valueOf(records.stream()
                                .filter(record -> ApiConstants.UY_RecordStatus_Interval.equals(record.getRecordStatus()))
                                .count() + ""));
                    }
                    videoTotalExps.add(videoExp);
                    //累加作为全量表
                    totalExp.setDate(date);
                    totalExp.setWeek(week);
                    totalExp.setTotal((totalExp.getTotal() == null ? 0 : totalExp.getTotal()) + (videoExp.getTotal() == null ? 0 : videoExp.getTotal()));
                    totalExp.setOnline((totalExp.getOnline() == null ? 0 : totalExp.getOnline()) + (videoExp.getOnline() == null ? 0 : videoExp.getOnline()));
                    totalExp.setOffline((totalExp.getOffline() == null ? 0 : totalExp.getOffline()) + (videoExp.getOffline() == null ? 0 : videoExp.getOffline()));
                    totalExp.setNoStore((totalExp.getNoStore() == null ? 0 : totalExp.getNoStore()) + (videoExp.getNoStore() == null ? 0 : videoExp.getNoStore()));
                    totalExp.setPartStore((totalExp.getPartStore() == null ? 0 : totalExp.getPartStore()) + (videoExp.getPartStore() == null ? 0 : videoExp.getPartStore()));
                    totalMap.put(date, totalExp);
                }
                AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
                ExcelExp excelExp = new ExcelExp(areaDeptEnum == null ? "未知" : areaDeptEnum.getName(), videoTotalExps, VideoTotalExp.class);
@@ -535,7 +544,6 @@
        // 等待所有任务完成
        CompletableFuture<Void> allFutures = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
        allFutures.join(); // 这将阻塞直到所有任务完成

        //添加全量表
        List<VideoTotalExp> totalExps = new ArrayList<>(totalMap.values());
        totalExps = totalExps.stream().sorted(Comparator.comparing(VideoTotalExp::getDate)).collect(Collectors.toList());
@@ -750,7 +758,8 @@
                    // 使用Map直接获取记录，避免filter操作
                    List<RecordMetaDSumResult> recordsResult = recordMap.get(result.getNo());
                    try {
                        if(!CollectionUtils.isEmpty(recordsResult)) setRecordDaily(videoDailyExp, result, recordsResult);
                        if (!CollectionUtils.isEmpty(recordsResult))
                            setRecordDaily(videoDailyExp, result, recordsResult);
                    } catch (Exception e) {
                        log.error(e.getMessage());
                    }
@@ -869,7 +878,7 @@
                    // 使用Map直接获取记录，避免filter操作
                    List<RecordMetaDSumResult> recordsResult = recordMap.get(result.getNo());
                    try {
                        if(!CollectionUtils.isEmpty(recordsResult)) setLoseDaily(videoDailyExp, recordsResult);
                        if (!CollectionUtils.isEmpty(recordsResult)) setLoseDaily(videoDailyExp, recordsResult);
                    } catch (Exception e) {
                        log.error(e.getMessage());
                    }

 ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml

@@ -79,6 +79,7 @@
        <result column="id" property="id"/>
        <result column="create_time" property="createTime"/>
        <result column="unit_name" property="unitName"/>
        <result column="unit_id" property="unitId"/>
        <result column="name" property="contractName"/>
        <result column="contract_id" property="contractId"/>
        <result column="which_year" property="whichYear"/>
@@ -127,6 +128,7 @@

    <select id="getById" resultMap="DetailResultMap">
        SELECT tyu.unit_name,
        tyu.id as unit_id,
        tc.name,
        tcr.id,
        tcr.contract_id,

 ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml

@@ -31,7 +31,7 @@
        FROM
        t_report r
        LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
        LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
        LEFT JOIN t_yw_people p ON r.people_id = p.user_id and p.deleted = 0
        LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
        INNER JOIN t_report_error_type ret ON ret.report_id = r.id and ret.deleted = 0 <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
        AND ret.error_type in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>