feat(report): 新增设备稼动率统计功能

baoshiwei

2025-07-02 2f0009c750de4d47a18cce4a5a403fa83ba0c209

feat(report): 新增设备稼动率统计功能

- 在 ReportController 中添加 equEfficiency 接口
- 在 IReportService 中添加 queryEquEfficiencyList 方法
- 在 ReportServiceImpl 中实现 queryEquEfficiencyList 方法
- 在 EimsInspectStMapper 中添加 statEquEfficiency 查询
- 更新前端 API定义，添加 getEquEfficiency 方法
- 新增设备稼动率统计页面和相关组件

 eims-ui/apps/web-antd/src/api/eims/report/index.ts

@@ -1,6 +1,7 @@
import { requestClient } from '#/api/request';

enum Api {
  equEfficiency = '/eims/report/equEfficiency',
  insp = '/eims/report/insp',
  maint = '/eims/report/maint',
}
@@ -26,3 +27,9 @@
  return requestClient.get<any[]>(Api.maint, { params });
}

/**
 * æŸ¥è¯¢è®¾å¤‡ç¨¼åŠ¨çŽ‡åˆ—表
 */
export function getEquEfficiency() {
  return requestClient.get<any[]>(Api.equEfficiency);
}

 eims-ui/apps/web-antd/src/views/eims/equ-efficency/data.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
import type { VxeGridProps } from '#/adapter/vxe-table';
import { ref } from 'vue';
import dayjs from 'dayjs';
import { type FormSchemaGetter } from '#/adapter/form';

export const querySchema: FormSchemaGetter = () => [
  {
    component: 'DatePicker',
    componentProps: {
      picker: 'year',
      format: 'YYYY',
      valueFormat: 'YYYY',
      placeholder: '请选择年份',
      allowClear: true,
      defaultValue: dayjs().format('YYYY'),
      getPopupContainer: (triggerNode: HTMLElement) => triggerNode.parentNode as HTMLElement
    },
    fieldName: 'selectYear',
    defaultValue: dayjs().format('YYYY'),
    label: '年份选择'
  }
];

export function getEfficiencyColumns() {
  const months = Array.from({ length: 12 }, (_, i) => `${i + 1}月`);
  const columns: VxeGridProps['columns'] = [
    { title: '项目', field: 'item', width: 160, fixed: 'left' },
    ...months.map(month => ({ title: month, field: month, align: 'center' as const })),
    { title: '全年合计', field: 'total', align: 'center' as const }
  ];
  return columns;
}

export const columns = ref<VxeGridProps['columns']>(getEfficiencyColumns()); 

 eims-ui/apps/web-antd/src/views/eims/equ-efficency/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
<script setup lang="ts">
import { onMounted, ref, toRaw, computed } from 'vue';

import { Page, type VbenFormProps } from '@vben/common-ui';

import { Space } from 'ant-design-vue';

import { useVbenVxeGrid, type VxeGridProps, vxeSortEvent } from '#/adapter/vxe-table';
import { getEquEfficiency } from '#/api/eims/report';

import { columns, querySchema } from './data';

const selYear = ref('');

const formOptions: VbenFormProps = {
  commonConfig: {
    labelWidth: 80,
    componentProps: {
      allowClear: true
    }
  },
  schema: querySchema(),
  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
  handleReset: async () => {
    const { formApi, reload } = tableApi;
    await formApi.resetForm();
    const formValues = formApi.form.values;
    formApi.setLatestSubmissionValues(formValues);
    await reload(formValues);
  }
};

const gridOptions: VxeGridProps = {
  border: true,
  size: 'mini',
  columns: columns.value,
  height: 'auto',
  keepSource: true,
  proxyConfig: {
    ajax: {
      query: async (_ctx, formValues = {}) => {
        const params = toRaw(formValues);
        return await getEquEfficiency(params);
      }
    }
  },
  rowConfig: {
    isHover: true,
    keyField: 'item'
  },
  id: 'equ-efficency-index'
};

const [BasicTable, tableApi] = useVbenVxeGrid({
  formOptions,
  gridOptions,
  gridEvents: {
    sortChange: (sortParams) => vxeSortEvent(tableApi, sortParams)
  }
});

onMounted(() => {
  tableApi.formApi.updateSchema([
    {
      component: 'DatePicker',
      componentProps: {
        onChange: (sYear: string) => {
          selYear.value = sYear;
        }
      },
      fieldName: 'selectYear'
    }
  ]);
  // åˆå§‹åŒ–年份
  selYear.value = tableApi.formApi.form.values.selectYear;
});

const tableTitle = computed(() => `${selYear.value || new Date().getFullYear()}年生产设备正常运转率`);
</script>

<template>
  <Page :auto-content-height="true">
    <div class="flex h-full gap-[8px]">
      <BasicTable class="flex-1 overflow-hidden" :table-title="tableTitle">
        <template #toolbar-tools>
          <Space>
            <span class="ml-4 mr-2">稼动率 = (总运行时间-停机时间) Ã· æ€»è¿è¡Œæ—¶é—´ Ã— 100%</span>
          </Space>
        </template>
      </BasicTable>
    </div>
  </Page>
</template>

 eims-ui/apps/web-antd/src/views/eims/insp-report/index.vue

@@ -83,7 +83,7 @@
          pageNum: page.currentPage,
          pageSize: page.pageSize,
          ...params
        });;
        });
      }
    }
  },

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/ReportController.java

@@ -47,4 +47,13 @@
        return reportService.queryMaintList(queryParams, pageQuery);
    }

    /**
     * æŸ¥è¯¢è®¾å¤‡ç¨¼åŠ¨çŽ‡ç»Ÿè®¡åˆ—表
     */
    @SaCheckPermission("eims:equEfficiency:list")
    @GetMapping("/equEfficiency")
    public TableDataInfo<Map<String,Object>> equEfficiency(@RequestParam Map<String, Object> queryParams, PageQuery pageQuery) {
        return reportService.queryEquEfficiencyList(queryParams, pageQuery);
    }

}

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java

@@ -50,7 +50,7 @@
        planBoQueryWrapper.eq("ip.status", DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL)
            .eq("equ.status", DictConstants.EIMS_EQU_STATUS_DETAIL.SHIYONG);
        // å¢žåŠ è¿‡æ»¤æ¡ä»¶ ä¸Šæ¬¡ç”Ÿæˆæ—¥æœŸå°äºŽå½“前日期
        planBoQueryWrapper.and(wrapper -> wrapper.lt("ip.insp_next_time", DateUtils.getDate()).or().isNull("ip.insp_next_time"));
        planBoQueryWrapper.and(wrapper -> wrapper.le("ip.insp_next_time", DateUtils.getDate()).or().isNull("ip.insp_next_time"));
//        // è¿‡æ»¤æ²¡æœ‰ä¸‹æ¬¡è¿è¡Œæ—¶é—´
//        planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspNextTime);
//        // è¿‡æ»¤æ²¡æœ‰ç‚¹æ£€å‘¨æœŸçš„数据

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/mapper/EimsInspectStMapper.java

@@ -4,11 +4,15 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.dromara.eims.domain.EimsInspectSt;
import org.dromara.eims.domain.EimsMaintSt;
import org.dromara.eims.domain.vo.EimsInspectStVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.eims.domain.vo.EimsMaintStVo;

import java.util.List;
import java.util.Map;

/**
 * ç‚¹æ£€æ±‡æ€»Mapper接口
@@ -19,4 +23,17 @@
public interface EimsInspectStMapper extends BaseMapperPlus<EimsInspectSt, EimsInspectStVo> {
    Page<EimsInspectStVo> selectInspStList(@Param("page") Page<EimsInspectStVo> page, @Param(Constants.WRAPPER) Wrapper<EimsInspectSt> queryWrapper);

    @Select({
        "<script>",
        "SELECT",
        "  MONTH(plan_time) AS month,",
        "  SUM(run_times) AS runTimes,",
        "  SUM(fault_times) AS faultTimes",
        "FROM eims_inspect_st",
        "WHERE plan_time BETWEEN #{start} AND #{end}",
        "  AND type = 'Day'",
        "GROUP BY MONTH(plan_time)",
        "</script>"
    })
    List<Map<String, Object>> statEquEfficiency(@Param("start") String start, @Param("end") String end);
}

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/IReportService.java

@@ -30,4 +30,12 @@
     * @return
     */
    TableDataInfo<Map<String, Object>> queryMaintList(Map<String, Object> queryParams, PageQuery pageQuery);

    /**
     * æŸ¥è¯¢è®¾å¤‡ç¨¼åŠ¨çŽ‡ç»Ÿè®¡
     * @param queryParams
     * @param pageQuery
     * @return
     */
    TableDataInfo<Map<String, Object>> queryEquEfficiencyList(Map<String, Object> queryParams, PageQuery pageQuery);
}

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/ReportServiceImpl.java

@@ -1,9 +1,11 @@
package org.dromara.eims.service.impl;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -318,4 +320,71 @@

        return item;
    }

    @Override
    public TableDataInfo<Map<String, Object>> queryEquEfficiencyList(Map<String, Object> queryParams, PageQuery pageQuery) {
        Integer selectYear = getYearFromParams(queryParams);
        String start = Year.of(selectYear).atDay(1).toString(); // yyyy-MM-dd
        String end = Year.of(selectYear).atDay(Year.of(selectYear).length()).toString();

        List<Map<String, Object>> statList = inspectStMapper.statEquEfficiency(start, end);

        // ç»„装统计结果
        Map<Integer, Integer> runTimes = new HashMap<>();
        Map<Integer, Integer> faultTimes = new HashMap<>();
        Map<Integer, Integer> totalTimes = new HashMap<>();
        int runTotal = 0, faultTotal = 0, totalTotal = 0;

        for (Map<String, Object> row : statList) {
            int month = Integer.parseInt(row.get("month").toString());
            int run = row.get("runTimes") == null ? 0 : Integer.parseInt(row.get("runTimes").toString());
            int fault = row.get("faultTimes") == null ? 0 : Integer.parseInt(row.get("faultTimes").toString());
            int total = run + fault;
            runTimes.put(month, run);
            faultTimes.put(month, fault);
            totalTimes.put(month, total);
            runTotal += run;
            faultTotal += fault;
            totalTotal += total;
        }

        // ç»„装返回数据（同前）
        String targetValue = "98.00%";
        List<Map<String, Object>> resultList = new ArrayList<>();
        Map<String, Object> row1 = new LinkedHashMap<>(); // æ­£å¸¸è¿è½¬æ—¶é—´
        Map<String, Object> row2 = new LinkedHashMap<>(); // æ€»è¿è½¬æ—¶é—´
        Map<String, Object> row3 = new LinkedHashMap<>(); // æ•…障时间
        Map<String, Object> row4 = new LinkedHashMap<>(); // ç›®æ ‡å€¼
        Map<String, Object> row5 = new LinkedHashMap<>(); // æ­£å¸¸è¿è½¬çŽ‡ï¼ˆç¨¼åŠ¨çŽ‡ï¼‰

        row1.put("item", "正常运转时间");
        row2.put("item", "总运转时间");
        row3.put("item", "故障时间");
        row4.put("item", "目标值");
        row5.put("item", "正常运转率（稼动率）");

        for (int m = 1; m <= 12; m++) {
            row1.put(m + "月", runTimes.getOrDefault(m, 0));
            row2.put(m + "月", totalTimes.getOrDefault(m, 0));
            row3.put(m + "月", faultTimes.getOrDefault(m, 0));
            row4.put(m + "月", targetValue);
            int run = runTimes.getOrDefault(m, 0);
            int total = totalTimes.getOrDefault(m, 0);
            String eff = total > 0 ? String.format("%.2f%%", run * 100.0 / total) : "-";
            row5.put(m + "月", eff);
        }
        row1.put("total", runTotal);
        row2.put("total", totalTotal);
        row3.put("total", faultTotal);
        row4.put("total", targetValue);
        row5.put("total", totalTotal > 0 ? String.format("%.2f%%", runTotal * 100.0 / totalTotal) : "-");

        resultList.add(row1);
        resultList.add(row2);
        resultList.add(row3);
        resultList.add(row4);
        resultList.add(row5);

        return TableDataInfo.build(resultList);
    }
}