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; } }