设备级设备详细信息

Lius

2024-04-19 f9f3535125e2ab51d0f8c2d56293bd549a07b54c

设备级设备详细信息

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/constant/MdcConstant.java

@@ -83,4 +83,9 @@
    public static final Integer USER_TYPE_3 = 3;
    public static final Integer USER_TYPE_4 = 4;

    /**
     * 串口设备类型
     */
    public static final String SERIA_TYPE = "seria_equipment_type";

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcHomeController.java

@@ -10,6 +10,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
@@ -226,6 +227,13 @@
        return Result.OK(result);
    }

    @ApiOperation(value = "MDC首页接口-设备级设备详细信息", notes = "MDC首页接口-设备级设备详细信息")
    @GetMapping("/equipmentDetails")
    public Result<?> equipmentDetails(@RequestParam(name = "equipmentId", required = true) String equipmentId) {
        MdcEquipmentDto result = mdcHomeService.getEquipmentDetails(equipmentId);
        return Result.OK(result);
    }

    @ApiOperation(value = "MDC首页接口-设备级设备列表", notes = "MDC首页接口-设备级设备列表")
    @GetMapping("/equipmentList")
    public Result<?> equipmentList(String productionCode) {

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.service;

import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.vo.MdcCommonVo;
@@ -63,4 +64,10 @@
     * 根据车间id获取设备列表
     */
    List<MdcEquipment> getEquipmentList(String key);

    /**
     * 查询设备运行信息
     */
    MdcEquipmentDto getEquipmentDetails(String equipmentId);

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java

@@ -2,18 +2,23 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.jeecg.modules.mdc.entity.EquipmentLog;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.mapper.MdcHomeMapper;
import org.jeecg.modules.mdc.service.IEquipmentLogService;
import org.jeecg.modules.mdc.service.IEquipmentService;
import org.jeecg.modules.mdc.service.IEquipmentWorkLineService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcHomeService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -33,7 +38,13 @@
    private IMdcEquipmentService mdcEquipmentService;

    @Resource
    private IEquipmentLogService equipmentLogService;
    private IEquipmentService equipmentService;

    @Resource
    private ISysDictService sysDictService;

    @Resource
    private IEquipmentWorkLineService equipmentWorkLineService;

    @Resource
    private MdcHomeMapper mdcHomeMapper;
@@ -71,11 +82,12 @@
        if (equipmentIdList == null || equipmentIdList.isEmpty()) {
            return result;
        }
        List<EquipmentLog> logList = equipmentLogService.getEquipmentStatusList(equipmentIdList);
        if (logList != null && !logList.isEmpty()) {
            for (EquipmentLog equipmentLog : logList) {
                if (equipmentLog.getOporation() != null) {
                    switch (equipmentLog.getOporation()) {
//        List<EquipmentLog> logList = equipmentLogService.getEquipmentStatusList(equipmentIdList);
        List<Equipment> equipmentList = equipmentService.list(new LambdaQueryWrapper<Equipment>().in(Equipment::getEquipmentid, equipmentIdList));
        if (equipmentList != null && !equipmentList.isEmpty()) {
            for (Equipment equipment : equipmentList) {
                if (equipment.getOporation() != null) {
                    switch (equipment.getOporation()) {
                        case 1:
                        case 2:
                            mdcEquipmentStatusVo.setWaitCount(mdcEquipmentStatusVo.getWaitCount() + 1);
@@ -443,4 +455,29 @@
    public List<MdcEquipment> getEquipmentList(String key) {
        return mdcHomeMapper.getEquipmentList(key);
    }

    @Override
    public MdcEquipmentDto getEquipmentDetails(String equipmentId) {
        MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
        List<DictModel> dictModelList = sysDictService.queryEnableDictItemsByCode(MdcConstant.SERIA_TYPE);
        if (dictModelList != null && !dictModelList.isEmpty()) {
            for (DictModel dictModel : dictModelList) {
                if (dictModel.getValue().equals(mdcEquipment.getDriveType())) {
                    return null;
                }
            }
        }
        String saveTableName = mdcEquipment.getSaveTableName();
        MdcEquipmentDto dto = equipmentWorkLineService.getMacingDataList(saveTableName);
        if ("LSV2".equals(mdcEquipment.getDriveType())) {
            dto.setSpindlebeilv(dto.getSFeed());
            dto.setFeedbeilv(dto.getFFeed());
            dto.setRapidfeed(dto.getRapidfeed());
            dto.setNCVersion(dto.getNCVersion());
            dto.setTNCVersion(dto.getTNCVersion());
            dto.setOPTVersion(dto.getOPTVersion());
            dto.setPLCVersion(dto.getPLCVersion());
        }
        return dto;
    }
}