Lius
2025-01-21 ce1e1dc15cbea0944a5f0f5279e42396034b1f78
计算OEE接口
已添加1个文件
已修改4个文件
124 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOeeInfoController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOeeInfoService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeComputeVo.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOeeInfoController.java
@@ -12,6 +12,7 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.service.IMdcOeeInfoService;
import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -83,4 +84,17 @@
        return mdcOeeInfoService.exportXls(userId, mdcOeeInfoVo);
    }
    /**
     * è®¡ç®—OEE
     *
     * @return
     */
    @AutoLog(value = "OEE表-计算OEE")
    @ApiOperation(value = "OEE表-计算OEE", notes = "OEE表-计算OEE")
    @PostMapping(value = "/computeOee")
    public Result<?> computeOee(@RequestBody MdcOeeComputeVo mdcOeeComputeVo) {
        mdcOeeInfoService.computeOee(mdcOeeComputeVo);
        return Result.OK("计算成功!");
    }
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcOeeInfoService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcOeeInfo;
import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
import org.springframework.web.servlet.ModelAndView;
@@ -42,4 +43,11 @@
     * @return
     */
    ModelAndView exportXls(String userId, MdcOeeInfoVo mdcOeeInfoVo);
    /**
     * è®¡ç®—OEE
     * @param mdcOeeComputeVo
     */
    void computeOee(MdcOeeComputeVo mdcOeeComputeVo);
}
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -464,7 +464,7 @@
            result.put("runData", runData);
            // æŸ¥è¯¢åæ ‡ä¿¡æ¯
            if (!mdcEquipmentDetailedDto.getDriveType().equals("ZUOLAN") || !mdcEquipmentDetailedDto.getDriveType().equals("CurrentState")) {
            if (!"ZUOLAN".equals(mdcEquipmentDetailedDto.getDriveType()) && !"CurrentState".equals(mdcEquipmentDetailedDto.getDriveType())) {
                EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
                if (equipmentXYZ != null) {
                    Map<String, Object> map = new HashMap<>();
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
@@ -13,6 +13,7 @@
import org.jeecg.modules.mdc.mapper.MdcOeeInfoMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcOeeComputeVo;
import org.jeecg.modules.mdc.vo.MdcOeeInfoVo;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -154,6 +155,92 @@
    }
    /**
     * è®¡ç®—OEE
     * @param mdcOeeComputeVo
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void computeOee(MdcOeeComputeVo mdcOeeComputeVo) {
        List<MdcOeeInfo> result = new ArrayList<>();
        String startDate = mdcOeeComputeVo.getStartDate();
        String endDate = mdcOeeComputeVo.getEndDate();
        List<String> dateList = DateUtils.getDatesStringList(DateUtils.getShortDate(startDate), DateUtils.getShortDate(endDate));
        if (!dateList.isEmpty()) {
            //获取设备列表
            List<MdcEquipment> equipmentList = mdcEquipmentService.list();
            for (String validDate : dateList) {
                try {
                    this.remove(new LambdaQueryWrapper<MdcOeeInfo>().eq(MdcOeeInfo::getTheDate, validDate));
                } catch (Exception e) {
                    log.error("参数格式不对", e);
                }
                for (MdcEquipment mdcEquipment : equipmentList) {
                    String equipmentId = mdcEquipment.getEquipmentId();
                    MdcOeeInfo mdcOeeInfo = new MdcOeeInfo();
                    // è®¾å¤‡ç¼–号
                    mdcOeeInfo.setEquipmentId(equipmentId);
                    // è®¡ç®—日期
                    mdcOeeInfo.setTheDate(validDate);
                    // å·¥ä½œæ—¥åŽ†æ—¶é—´(min) --- æŒ‰æ¯å¤©24小时算
                    mdcOeeInfo.setCalendarLong(1440);
                    // è®¡åˆ’停机时间(min) --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天总时长
                    Integer planCloseLong = mdcPlanCloseService.findPlanTimeDuration(equipmentId, validDate, CommonConstant.CLOSE_TYPE_1);
                    mdcOeeInfo.setPlanCloseLong(planCloseLong);
                    // è´Ÿè·æ—¶é—´(min) --- æ—¥åŽ†å·¥ä½œæ—¶é—´-计划停机时间
                    Integer loadLong = mdcOeeInfo.getCalendarLong() - planCloseLong;
                    mdcOeeInfo.setLoadLong(loadLong);
                    // éžè®¡åˆ’停机时间(min) --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天总时长
                    Integer noPlanCloseLong = mdcPlanCloseService.findPlanTimeDuration(equipmentId, validDate, CommonConstant.CLOSE_TYPE_2);
                    mdcOeeInfo.setNoplanCloseLong(noPlanCloseLong);
                    // å¼€åŠ¨æ—¶é—´(min) --- è´Ÿè·æ—¶é—´-非计划停机时间
                    int actuateLong = loadLong - noPlanCloseLong;
                    mdcOeeInfo.setActuateLong(actuateLong);
                    // æ—¶é—´å¼€åŠ¨çŽ‡ --- å¼€åŠ¨æ—¶é—´/负荷时间
                    BigDecimal timeActuationRate = new BigDecimal(actuateLong).divide(new BigDecimal(loadLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    mdcOeeInfo.setTimeActuationRate(timeActuationRate);
                    // æœ‰æ•ˆè¿è¡Œæ—¶é—´ --- æŒ‰éœ€æ±‚维护零件加工总时长||系统主轴负载时间
                    Integer effectiveRunLong = 0;
                    Integer totalProcessLong = mdcPartProcessInfoService.selectTotalProcessLong(equipmentId, validDate);
                    if (totalProcessLong == 0) {
                        //查询设备运行时间
                        effectiveRunLong = mdcEquipmentStatisticalInfoService.selectProcessLong(equipmentId, validDate.replace("-", ""));
                    } else {
                        effectiveRunLong = totalProcessLong;
                    }
                    mdcOeeInfo.setEffectiveRunLong(effectiveRunLong);
                    // æ€§èƒ½å¼€åŠ¨çŽ‡ --- æœ‰æ•ˆè¿è¡Œæ—¶é—´/开动时间
                    BigDecimal performanceRate = BigDecimal.ZERO;
                    if (effectiveRunLong != 0 && actuateLong != 0) {
                        performanceRate = new BigDecimal(effectiveRunLong).divide(new BigDecimal(actuateLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setPerformanceRate(performanceRate);
                    // åŠ å·¥é›¶ä»¶æ•°é‡ --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天
                    Integer processCount = mdcPartProcessInfoService.selectTotalProcessCount(equipmentId, validDate);
                    mdcOeeInfo.setProcessCount(processCount);
                    // åˆæ ¼é›¶ä»¶æ•°é‡ --- æŒ‰ç»´æŠ¤æ•°æ®ç»Ÿè®¡å½“天
                    Integer passCount = mdcPartProcessInfoService.selectTotalPassCount(equipmentId, validDate);
                    mdcOeeInfo.setPassCount(passCount);
                    // åˆæ ¼çއ --- åˆæ ¼æ•°/加工数
                    BigDecimal passRate = BigDecimal.ZERO;
                    if (processCount != 0 && passCount != 0) {
                        passRate = new BigDecimal(passCount).divide(new BigDecimal(processCount), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setPassRate(passRate);
                    // OEE --- æ—¶é—´å¼€åŠ¨çŽ‡ * æ€§èƒ½å¼€åŠ¨çŽ‡ * ä¸€æ¬¡åˆæ ¼çއ
                    BigDecimal oee = BigDecimal.ZERO;
                    if (!timeActuationRate.equals(BigDecimal.ZERO) && !performanceRate.equals(BigDecimal.ZERO) && !passRate.equals(BigDecimal.ZERO)) {
                        oee = timeActuationRate.multiply(performanceRate).multiply(passRate).divide(new BigDecimal("10000"), 4, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setOee(oee);
                    result.add(mdcOeeInfo);
                }
            }
        }
        super.saveBatch(result);
    }
    /**
     * è®¡ç®—oee
     * @param dateTime å‚æ•°
     */
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcOeeComputeVo.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package org.jeecg.modules.mdc.vo;
import lombok.Data;
/**
 * @author Lius
 * @date 2025/1/20 14:41
 */
@Data
public class MdcOeeComputeVo {
    private String startDate;
    private String endDate;
}