Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMapping.java

@@ -67,11 +67,6 @@
     */
    @ApiModelProperty(value = "模板视图的oid")
    private String viewModeId;
    /***
     * æ¨¡æ¿åç§°
     */
    @ApiModelProperty(value = "模板名称")
    private String viewModeName;

    /***
     * ç›®æ ‡å±žæ€§å†…部名称

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.vci.ubcs.code.controller;


import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;

/**
 * ç¼–码信息 æŽ§åˆ¶å™¨
 *
 * @author xiejun
 * @since 2023-05-23
 */
@RestController
@AllArgsConstructor
@RequestMapping("ubcs-code/DockingPreApplyCode")
@Api(value = "集团属性映射配置", tags = "集团属性映射配置接口")
public class DockingPreApplyCodeController {
    /**
     * é›†å›¢å±žæ€§æ˜ å°„配置属性
     */
    private final IDockingPreAttrMappingService dockingPreAttrMappingService;
    /***
     * å±žæ€§æžšä¸¾èŒƒå›´æœåŠ¡
     */

    private final IDockingPreAttrRangeService dockingPreAttrRangeService;

    /**
     * æ ¹æ®ä¸»æ•°æ®ç¼–码oid获取集团属性映射信息
     * @param codeClassifyId ä¸»é”®
     * @return ä¸»æ•°æ®ç¼–码规则显示对象
     */
    @GetMapping("/gridAttrMapping")
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "分类主键获取与集团模型属性映射关系", notes = "传入codeClassifyId")
    public R getDockingAttrMappingsByCodeClassId(String codeClassifyId){
        List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getdockingAttrMappingsByCodeclassId(codeClassifyId);
        return R.data(dockingPreAttrMappingVOList);
    }

    /**
     * æ ¹æ®é›†å›¢å±žæ€§id获取属性枚举范围
     * @param meatId ä¸»é”®
     * @return
     */
    @GetMapping("/gridAttrRanges")
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "根据属性id获取属性枚举范围", notes = "传入")
    public R getDockingPreAttrRangesByMetaId(String meatId){
        List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList=dockingPreAttrRangeService.getDockingPreAttrRangesByMetaId(meatId);
        return R.data(dockingPreAttrRangeVOList);
    }

    /**
     * ä¿å­˜å±žæ€§æ˜ å°„配置组件
     * @param dockingPreAttrMappingVOList å±žæ€§æ˜ å°„配置数据传输对象
     * @return æ‰§è¡Œç»“果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象
     */
    @PostMapping( "/batchAddSave")
    public R batchSave(@Valid @RequestBody List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList){
        List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>();
        try {
             dockingPreAttrRangeVOS = dockingPreAttrMappingService.batchAddSave(dockingPreAttrMappingVOList);
        }catch (Exception e){
            return R.fail("集团集成属性映射配置保存失败："+e.getMessage());
        }
        return R.data(dockingPreAttrRangeVOS);
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java

@@ -1,11 +1,36 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
import java.util.List;

/**
 * é›†å›¢é›†æˆé…ç½®æœåŠ¡
 * @author xiej
 * @date 2023-05-17
 */
public interface IDockingPreAttrMappingService extends IService<DockingPreAttrMapping> {

    /***
     * æ ¹æ®ä¸»æ•°æ®åˆ†ç±»ä¸»é”®èŽ·å–分类信息配置
     * @param codeClassifyId
     * @return
     */
    List<DockingPreAttrMappingVO> getdockingAttrMappingsByCodeclassId(String codeClassifyId);

    /**
     * ä½¿ç”¨æŸ¥è¯¢å°è£…器来查询
     * @param wrapper æŸ¥è¯¢å°è£…器
     * @return æ•°æ®å¯¹è±¡
     */
    List<DockingPreAttrMapping> selectByWrapper(Wrapper wrapper);

    /**
     * ä¿å­˜å±žæ€§æ˜ å°„配置组件
     * @param dockingPreAttrMappingDTOS å±žæ€§æ˜ å°„配置数据传输对象
     * @return æ‰§è¡Œç»“果，success为true表示成功，msg是失败的提示信息，obj是添加完成后的显示对象
     */
    public  List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingDTOS)throws Exception;
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrRangeService.java

@@ -1,7 +1,23 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingPreAttrRange;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;

import java.util.List;

public interface IDockingPreAttrRangeService extends IService<DockingPreAttrRange> {
    /***
     * æ ¹æ®é›†å›¢å±žæ€§id获取取值范围
     * @return
     */
    List<DockingPreAttrRangeVO> getDockingPreAttrRangesByMetaId(String meatId);

    /**
     * ä½¿ç”¨æŸ¥è¯¢å°è£…器来查询
     * @param wrapper æŸ¥è¯¢å°è£…器
     * @return æ•°æ®å¯¹è±¡
     */
    List<DockingPreAttrRange> selectByWrapper(Wrapper wrapper);
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java

@@ -1,7 +1,10 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingPreMetaAttr;

import java.util.List;

/***
 * é›†å›¢å±žæ€§æœåŠ¡
@@ -9,4 +12,14 @@
 * @date 2023-05-23
 */
public interface IDockingPreMetaAttrService extends IService<DockingPreMetaAttr> {



    /***
     * æž„造器查询方式
     * @param wrapper æŸ¥è¯¢å°è£…器
     * @return
     */

    public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper);
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java

@@ -1,10 +1,29 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.entity.DockingPreAttrRange;
import com.vci.ubcs.code.entity.DockingPreMetaAttr;
import com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper;
import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
import com.vci.ubcs.code.wrapper.DockingPreAttrMappingWrapper;
import com.vci.ubcs.code.wrapper.DockingPreAttrRangeWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/***
 *集团属性映射服务
@@ -13,4 +32,156 @@
 */
@Service
public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService {
    /***
     * é›†å›¢åˆ†ç±»å±žæ€§å±žæ€§æ˜ å°„配置服务
     */
    @Autowired(required = false)
    DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
    /***
     * é›†å›¢å±žæ€§æœåŠ¡
     */
    @Autowired(required = false)
    IDockingPreMetaAttrService dockingPreMetaAttrService;
    /***
     * å±žæ€§å–值范围服务
     */
    @Autowired(required = false)
    IDockingPreAttrRangeService dockingPreAttrRangeService;
    /***
     * æ ¹æ®ä¸»æ•°æ®åˆ†ç±»ä¸»é”®èŽ·å–分类信息配置
     * @param codeClassifyId
     * @return
     */
    @Override
    public List<DockingPreAttrMappingVO> getdockingAttrMappingsByCodeclassId(String codeClassifyId) {
        //首先获取分类模板属性，然后与属性配置坐比较，以防被有增删属性的可能
        List<DockingPreMetaAttr> dockingPreMetaAttrList=    dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,codeClassifyId));
        List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, codeClassifyId));
        Map<String/**属性主键**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t));

        List<DockingPreAttrMapping> newDockingPreAttrMappingList=new ArrayList<>();
        dockingPreMetaAttrList.stream().forEach(dockingPreMetaAttr -> {
            String attrOid=dockingPreMetaAttr.getOid();
            DockingPreAttrMapping dockingPreAttrMapping=new DockingPreAttrMapping();
            if(dockingPreAttrMappingMap.containsKey(attrOid)){
                dockingPreAttrMapping=    dockingPreAttrMappingMap.get(attrOid);
            }else{
                dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//属性主键
                dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//英文名称
                dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//中文名称
                dockingPreAttrMapping.setSourceClassifyId(dockingPreMetaAttr.getSourceClassifyId());//集团分类oid
                dockingPreAttrMapping.setSourceClassifyName("");//分类名称
                dockingPreAttrMapping.setViewModeId(dockingPreMetaAttr.getViewModelId());//模型视图id
                dockingPreAttrMapping.setViewModelName("");//分类模型名称
                dockingPreAttrMapping.setViewName("");//分类模型名称

            }
            newDockingPreAttrMappingList.add(dockingPreAttrMapping);
        });
        return     dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,false);
    }

    /***
     * æž„造器查询方式
     * @param wrapper æŸ¥è¯¢å°è£…器
     * @return
     */
    @Override
    public List<DockingPreAttrMapping> selectByWrapper(Wrapper wrapper) {
        return dockingPreAttrMappingMapper.selectList(wrapper);
    }

    /****
     * é›†å›¢å±žæ€§æ˜ å°„配置保存
     * @param dockingPreAttrMappingVOList
     * @return
     * @throws VciBaseException
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList) throws Exception {
        if(org.springframework.util.CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
            return new ArrayList<>();
        }
        /**
         * 1.传递过来的有可能主数据模板新增属性，这样的需要添加，也有可能删除的属性，这样的映射需要删除
         * ä¹Ÿæœ‰æ›´æ–°çš„这样则更新
         */
        List<DockingPreAttrMapping> newDockingPreAttrMapping=new ArrayList<>();
        List<String>appingConfigOidList=new ArrayList<>();
        List<String>attrIdList=new ArrayList<>();
        List<String> attributeOidList=new ArrayList<>();
        List<DockingPreAttrRange> newDockingPreAttrRangeList=new ArrayList<>();
        List<DockingPreAttrRangeVO> newDockingPreAttrRangeVOList=new ArrayList<>();
        dockingPreAttrMappingVOList.stream().forEach(dockingPreAttrMappingVO -> {
            List<DockingPreAttrRangeVO>dockingPreAttrRangeVOList=dockingPreAttrMappingVO.getDockingPreAttrRangeVoList();
            appingConfigOidList.add(dockingPreAttrMappingVO.getOid());
            if(!CollectionUtils.isEmpty(dockingPreAttrRangeVOList)) {
                attrIdList.add(dockingPreAttrMappingVO.getMetaListId());
                newDockingPreAttrRangeVOList.addAll(dockingPreAttrRangeVOList);
            }
        });
        //将属性取值范围转成数据持久层对象
        newDockingPreAttrRangeList=DockingPreAttrRangeWrapper.build().voentitys(newDockingPreAttrRangeVOList);
        //将属性映射配置信息转换为需要数据持久层保存的对象
        newDockingPreAttrMapping=DockingPreAttrMappingWrapper.build().voentitys(dockingPreAttrMappingVOList);

        List<DockingPreAttrRange> oldDockingPreAttrRangeList=new ArrayList<>();
        if(!org.springframework.util.CollectionUtils.isEmpty(attrIdList)) {
            //获取存在的属性取值范围.
            oldDockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().in(DockingPreAttrRange::getMetaListId,attrIdList));
        }
        //获取存在的属性映射.
        List<DockingPreAttrMapping> oldDataAttrMapping = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda().in(DockingPreAttrMapping::getOid,appingConfigOidList));

        Map<String/**oid**/,DockingPreAttrMapping/**属性对象**/> allSaveAttrMappingMap = newDockingPreAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
        Map<String/**oid**/,DockingPreAttrMapping/**对象**/> oldAttrMappingMap =oldDataAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
        //需要删除的属性映射
        List<String> deleteIdList=new ArrayList<>();
        oldDataAttrMapping.stream().forEach(cbo -> {
            String oid =cbo.getOid();
            if(!allSaveAttrMappingMap.containsKey(oid)){
                deleteIdList.add(oid);
            }
        });
        this.removeBatchByIds(deleteIdList);//删除已经丢掉的
        this.saveOrUpdateBatch(newDockingPreAttrMapping);//添加更新新的配置信息

        //取值范围处理
        if(!CollectionUtils.isEmpty(newDockingPreAttrRangeList)) {
            Map<String/**oid**/, DockingPreAttrRange/**属性对象**/> allSaveAttrAttrRangeDOMap =newDockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
            Map<String/**oid**/, DockingPreAttrRange/**对象**/> oldSaveAttrAttrRangeDOMap = oldDockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));

            //需要删除的属性取值范围
            List<String> deleteRangeIdList = new ArrayList<>();
            oldDockingPreAttrRangeList.stream().forEach(cbo -> {
                String oid = cbo.getOid();
                if (!allSaveAttrAttrRangeDOMap.containsKey(oid)) {
                    deleteRangeIdList.add(oid);
                }
            });
            dockingPreAttrRangeService.removeBatchByIds(deleteIdList);//删除已经丢掉的
            dockingPreAttrRangeService.saveOrUpdateBatch(newDockingPreAttrRangeList);//添加更新新的配置信息
        }
        return dockingPreAttrMappingVOList;
    }

    /***
     * å¯¹è±¡è½¬æ¢
     * @param dockingPreAttrMappings
     * @return
     */
    private List<DockingPreAttrMappingVO> dockingPreAttrMappingDO2VOS(Collection<DockingPreAttrMapping> dockingPreAttrMappings,boolean contain) {
        List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
            dockingPreAttrMappingVOList=DockingPreAttrMappingWrapper.build().entityVOs(dockingPreAttrMappings);
            if(CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
                dockingPreAttrMappingVOList.stream().distinct().forEach(dockingPreAttrMappingVO -> {
                    if(contain) {
                        List<DockingPreAttrRangeVO>  dockingPreAttrRangeVOList=    dockingPreAttrRangeService.getDockingPreAttrRangesByMetaId(dockingPreAttrMappingVO.getMetaListId());
                        dockingPreAttrMappingVO.setDockingPreAttrRangeVoList(dockingPreAttrRangeVOList);
                    }
                });
            }
            return dockingPreAttrMappingVOList;
        }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrRangeServiceImpl.java

@@ -1,11 +1,17 @@
package com.vci.ubcs.code.service.impl;


import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.DockingPreAttrRange;
import com.vci.ubcs.code.mapper.DockingPreAttrRangeMapper;
import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
import com.vci.ubcs.code.wrapper.DockingPreAttrRangeWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;

/***
 *集团属性取值范围服务
@@ -14,4 +20,17 @@
 */
@Service
public class DockingPreAttrRangeServiceImpl extends ServiceImpl<DockingPreAttrRangeMapper, DockingPreAttrRange> implements IDockingPreAttrRangeService {
    @Autowired(required = false)
    DockingPreAttrRangeMapper dockingPreAttrRangeMapper;
    @Override
    public List<DockingPreAttrRangeVO> getDockingPreAttrRangesByMetaId(String meatId) {
        List<DockingPreAttrRange> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, meatId));
        return DockingPreAttrRangeWrapper.build().entityVOs(dockingPreAttrMappings);
    }

    @Override
    public List<DockingPreAttrRange> selectByWrapper(Wrapper wrapper) {
        return dockingPreAttrRangeMapper.selectList(wrapper);
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java

@@ -1,10 +1,15 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.entity.DockingPreMetaAttr;
import com.vci.ubcs.code.mapper.DockingPreMetaAttrMapper;
import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/***
 * é›†å›¢å±žæ€§æœåŠ¡
@@ -13,4 +18,12 @@
 */
@Service
public class DockingPreMetaAttrServiceImpl extends ServiceImpl<DockingPreMetaAttrMapper, DockingPreMetaAttr> implements IDockingPreMetaAttrService {

    @Autowired(required = false)
    DockingPreMetaAttrMapper dockingPreMetaAttrMapper;

    @Override
    public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper) {
        return dockingPreMetaAttrMapper.selectList(wrapper);
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java

@@ -1,11 +1,16 @@
package com.vci.ubcs.code.wrapper;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.vci.ubcs.code.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.vo.pagemodel.DockingLogeVO;
import com.vci.ubcs.code.entity.DockingPreAttrRange;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
/**
 *集团编码集成属性映射配置包装类
@@ -14,9 +19,48 @@
 * @since 2023-05-23
 */
public class DockingPreAttrMappingWrapper extends BaseEntityWrapper<DockingPreAttrMapping, DockingPreAttrMappingVO> {
    public static DockingPreAttrMappingWrapper build() {
        return new DockingPreAttrMappingWrapper();
    }

    @Override
    public DockingPreAttrMappingVO entityVO(DockingPreAttrMapping entity) {
        DockingPreAttrMappingVO dockingPreAttrMappingVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreAttrMappingVO.class));
        return dockingPreAttrMappingVO;
    }

    /***
     * æ•°ç»„对象转换
     * @param dockingPreAttrMappings
     * @return
     */
    public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> dockingPreAttrMappings) {
        List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
        if(!CollectionUtils.isEmpty(dockingPreAttrMappings)) {
            dockingPreAttrMappings.stream().forEach(dockingPreAttrMapping -> {
                dockingPreAttrMappingVOList.add(entityVO(dockingPreAttrMapping));
            });
        }
        return dockingPreAttrMappingVOList;
    }

    /***
     * æ•°ç»„对象转换
     * @param dockingPreAttrMappingVOS
     * @return
     */
    public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> dockingPreAttrMappingVOS) {
        List<DockingPreAttrMapping> dockingPreAttrMappingList=new ArrayList<>();
        if(!CollectionUtils.isEmpty(dockingPreAttrMappingVOS)) {
            dockingPreAttrMappingVOS.stream().forEach(dockingPreAttrMappingVO -> {
                dockingPreAttrMappingList.add(voentity(dockingPreAttrMappingVO));
            });
        }
        return dockingPreAttrMappingList;
    }

    public DockingPreAttrMapping voentity( DockingPreAttrMappingVO vo) {
        DockingPreAttrMapping dockingPreAttrMapping = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreAttrMapping.class));
        return dockingPreAttrMapping;
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java

@@ -1,5 +1,6 @@
package com.vci.ubcs.code.wrapper;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.vci.ubcs.code.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.entity.DockingPreAttrRange;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
@@ -8,6 +9,9 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
/**
 *集团编码分类模型视图属性取值范围包装类
@@ -16,10 +20,49 @@
 * @since 2023-05-23
 */
public class DockingPreAttrRangeWrapper extends BaseEntityWrapper<DockingPreAttrRange, DockingPreAttrRangeVO> {

    public static DockingPreAttrRangeWrapper build() {
        return new DockingPreAttrRangeWrapper();
    }
    @Override
    public DockingPreAttrRangeVO entityVO(DockingPreAttrRange entity) {
        DockingPreAttrRangeVO dockingPreAttrRangeVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreAttrRangeVO.class));
        return dockingPreAttrRangeVO;
    }


    /***
     * æ•°ç»„对象转换
     * @param dockingPreAttrRanges
     * @return
     */
    public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> dockingPreAttrRanges) {
        List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList=new ArrayList<>();
        if(!CollectionUtils.isEmpty(dockingPreAttrRanges)) {
            dockingPreAttrRanges.stream().forEach(dockingPreAttrRange -> {
                dockingPreAttrRangeVOList.add(entityVO(dockingPreAttrRange));
            });
        }
        return dockingPreAttrRangeVOList;
    }

    /***
     * æ•°ç»„对象转换
     * @param dockingPreAttrRangeVos
     * @return
     */
    public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> dockingPreAttrRangeVos) {
        List<DockingPreAttrRange> dockingPreAttrRangeList=new ArrayList<>();
        if(!CollectionUtils.isEmpty(dockingPreAttrRangeVos)) {
            dockingPreAttrRangeVos.stream().forEach(dockingPreAttrRangeVO -> {
                dockingPreAttrRangeList.add(voentity(dockingPreAttrRangeVO));
            });
        }
        return dockingPreAttrRangeList;
    }

    public DockingPreAttrRange voentity( DockingPreAttrRangeVO vo) {
        DockingPreAttrRange dockingPreAttrRange = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreAttrRange.class));
        return dockingPreAttrRange;
    }

}