Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java

@@ -2,7 +2,6 @@

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
@@ -25,14 +24,12 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.corba.attribpool.AttribItem;
import plm.corba.attribpool.AttribItemFilter;

import java.util.*;
import java.util.stream.Collectors;

import static com.vci.client.omd.attribpool.ui.VTDataTypePanel.*;
import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
import static plm.vo.omd.attribpool.ui.VTDataTypePanel.*;

/**
 * 属性池服务  --已经调用了平台的服务，因此不在提供Dao层
@@ -113,12 +110,11 @@
    */
   @Override
   public List<OsAttributeVO> selectAllAttribute() {
      AttribItemFilter abFilter = new AttribItemFilter();
      //后面两个分页数，完全没有用
      try {
//         return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
//         return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
         return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs(abFilter.name,1,1)).collect(Collectors.toList()));
         return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs("",1,1)).collect(Collectors.toList()));
      } catch (PLException vciError) {
         throw WebUtil.getVciBaseException(vciError);
      }
@@ -226,14 +222,14 @@
    * @return 数据对象
    */
   @Override
   public AttribItem attributeVO2DO(OsAttributeVO attributeVO) {
      AttribItem attribItem = new AttribItem();
   public AttributeDef attributeVO2DO(OsAttributeVO attributeVO) {
      AttributeDef attribItem = new AttributeDef();
      attribItem.oid = attributeVO.getOid();
      attribItem.ts = VciDateUtil.date2Str(attributeVO.getTs(),VciDateUtil.DateTimeFormat);
      attribItem.creator = attributeVO.getCreator();
      attribItem.createTime = VciDateUtil.date2Str(attributeVO.getCreateTime(),VciDateUtil.DateTimeFormat);
      attribItem.createTime = attributeVO.getCreateTime() != null?attributeVO.getCreateTime().getTime():null;
      attribItem.modifier = attributeVO.getLastModifier();
      attribItem.modifyTime = VciDateUtil.date2Str(attributeVO.getLastModifyTime(),VciDateUtil.DateTimeFormat);
      attribItem.modifyTime = attributeVO.getLastModifyTime() != null ? attributeVO.getLastModifyTime().getTime():null;
      attribItem.name = attributeVO.getId();
      attribItem.label = attributeVO.getName();
      attribItem.description = attributeVO.getDescription() == null ?"":attributeVO.getDescription();