|
|
|
@ -3,35 +3,21 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
|
|
|
|
|
import cn.estsh.i3plus.ext.mes.api.busi.IEquipmentExtService;
|
|
|
|
|
import cn.estsh.i3plus.mes.api.iservice.base.IEnumService;
|
|
|
|
|
import cn.estsh.i3plus.mes.apiservice.dao.IEquipmentDao;
|
|
|
|
|
import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.CommonService;
|
|
|
|
|
import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.EquipmentService;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.util.MesConstWords;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.MesWcEquipment;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.model.MesEquipmentModel;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.repository.MesWcEquipmentRepository;
|
|
|
|
|
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
|
|
|
|
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
|
|
|
|
import cn.estsh.impp.framework.boot.util.LocaleUtils;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @Description : mes设备管理方法调度类
|
|
|
|
@ -43,7 +29,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
@Slf4j
|
|
|
|
|
@Service
|
|
|
|
|
public class EquipmentExtService implements IEquipmentExtService {
|
|
|
|
|
public static final Logger LOGGER = LoggerFactory.getLogger(EquipmentService.class);
|
|
|
|
|
public static final Logger LOGGER = LoggerFactory.getLogger(EquipmentExtService.class);
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private IEquipmentDao equipmentDao;
|
|
|
|
|