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

@@ -1,7 +1,8 @@
package com.vci.web.service.impl;

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -19,19 +20,16 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
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层
@@ -112,12 +110,12 @@
    */
   @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,1,1)).collect(Collectors.toList()));
      } catch (VCIError vciError) {
//         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("",1,1)).collect(Collectors.toList()));
      } catch (PLException vciError) {
         throw WebUtil.getVciBaseException(vciError);
      }
   }
@@ -141,7 +139,7 @@
    * @return 显示对象
    */
   @Override
   public List<OsAttributeVO> attributeDO2VOs(Collection<AttribItem> attribItems) {
   public List<OsAttributeVO> attributeDO2VOs(Collection<AttributeDef> attribItems) {
      List<OsAttributeVO> vos = new ArrayList<>();
      Optional.ofNullable(attribItems).orElseGet(()->new ArrayList<>()).stream().forEach(attribItem -> {
         vos.add(attributeDO2VO(attribItem));
@@ -156,15 +154,15 @@
    * @return 显示对象
    */
   @Override
   public OsAttributeVO attributeDO2VO(AttribItem attribItem) {
   public OsAttributeVO attributeDO2VO(AttributeDef attribItem) {
      OsAttributeVO attributeVO = new OsAttributeVO();
      if(attribItem!=null){
         attributeVO.setOid(attribItem.oid);
         attributeVO.setId(attribItem.name);
         attributeVO.setCreator(attribItem.creator);
         try {
            attributeVO.setCreateTime(VciDateUtil.str2Date(attribItem.createTime,VciDateUtil.DateTimeFormat));
            attributeVO.setLastModifyTime(VciDateUtil.str2Date(attribItem.modifyTime,VciDateUtil.DateTimeFormat));
            attributeVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(attribItem.createTime),VciDateUtil.DateTimeFormat));
            attributeVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(attribItem.modifyTime),VciDateUtil.DateTimeFormat));
            attributeVO.setTs(VciDateUtil.str2Date(attribItem.ts,VciDateUtil.DateTimeMillFormat));
         }catch (Throwable e){

@@ -224,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();
@@ -332,12 +330,12 @@
    * @param attribItemList 属性的列表
    */
   @Override
   public void batchAddAttribute(List<AttribItem> attribItemList) {
   public void batchAddAttribute(List<AttributeDef> attribItemList) {
      if(!CollectionUtils.isEmpty(attribItemList)){
         attribItemList.stream().forEach(attribItem -> {
            try {
               platformClientUtil.getAttributeService().addAttribItem(attribItem);
            } catch (VCIError e) {
               platformClientUtil.getAttributeService().addAttributeDef(attribItem);
            } catch (PLException e) {
               throw WebUtil.getVciBaseException(e);
            }
         });
@@ -349,12 +347,12 @@
    * @param editAttrList 属性的列表
    */
   @Override
   public void batchEditAttribute(List<AttribItem> editAttrList) {
   public void batchEditAttribute(List<AttributeDef> editAttrList) {
      if(!CollectionUtils.isEmpty(editAttrList)){
         editAttrList.stream().forEach(attribItem -> {
            try {
               platformClientUtil.getAttributeService().modifyAbItem(attribItem);
            } catch (VCIError e) {
               platformClientUtil.getAttributeService().modifyAttributeDef(attribItem);
            } catch (PLException e) {
               throw WebUtil.getVciBaseException(e);
            }
         });