Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
@@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.vci.ubcs.omd.dto.LifeCycleDTO; import com.vci.ubcs.omd.entity.LifeCycleEvent; import com.vci.ubcs.omd.entity.LifeCycleRule; import com.vci.ubcs.omd.service.ILifeCycleService; import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.omd.vo.LifeCycleEventVO; import com.vci.ubcs.omd.vo.LifeCycleVO; import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper; import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; @@ -36,6 +38,7 @@ * çå½å¨æçæå¡ */ private final ILifeCycleService lifeCycleService; /** * å页æ¥è¯¢ @@ -139,5 +142,19 @@ return R.data(lifeCycleService.listUses(lifeCycleDTO)); } /** * å ¨é¨çäºä»¶ */ @GetMapping("page-event") @ApiOperationSupport(order = 2) @ApiOperation(value = "å ¨é¨çäºä»¶",notes = "å页æ¥è¯¢äºä»¶") public R<IPage<LifeCycleEventVO>> pageEvent(BladeQueryObject baseQueryObject){ Map<String, Object> conditionMap = baseQueryObject.getConditionMap(); if (conditionMap == null){ conditionMap = new HashMap<>(); } return R.data(lifeCycleService.listEvent(conditionMap,baseQueryObject.getQuery())); } } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleEventMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ package com.vci.ubcs.omd.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.vci.ubcs.omd.entity.LifeCycleEvent; import com.vci.ubcs.omd.entity.LifeCycleLineEvent; /** * äºä»¶çå 容 * @author weidy * @date 2023/7/6 */ public interface LifeCycleEventMapper extends BaseMapper<LifeCycleEvent> { } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
@@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.omd.dto.LifeCycleDTO; import com.vci.ubcs.omd.entity.LifeCycleEvent; import com.vci.ubcs.omd.entity.LifeCycleRule; import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.omd.vo.LifeCycleEventVO; import com.vci.ubcs.omd.vo.LifeCycleVO; import com.vci.ubcs.starter.web.pagemodel.PageHelper; import org.springblade.core.mp.support.Query; @@ -27,6 +29,14 @@ * @return çå½å¨æçæ¾ç¤ºå¯¹è±¡ */ IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query); /** * è·åå ¨é¨çäºä»¶ * @param conditionMap æ¥è¯¢æ¡ä»¶ * @param query å页 * @return äºä»¶çæ¾ç¤ºå¯¹è±¡ */ IPage<LifeCycleEventVO> listEvent(Map<String, Object> conditionMap, Query query); /** * æ·»å ä¿å @@ -74,4 +84,6 @@ * @return ä¸å¡ç±»å */ List<BtmTypeVO> listUses(LifeCycleDTO lifeCycleDTO); } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
@@ -9,21 +9,17 @@ import com.vci.ubcs.omd.dto.LifeCycleEdgeDTO; import com.vci.ubcs.omd.dto.LifeCycleLineEventDTO; import com.vci.ubcs.omd.dto.LifeCycleNodeDTO; import com.vci.ubcs.omd.entity.LifeCycleEdge; import com.vci.ubcs.omd.entity.LifeCycleLineEvent; import com.vci.ubcs.omd.entity.LifeCycleNode; import com.vci.ubcs.omd.entity.LifeCycleRule; import com.vci.ubcs.omd.mapper.LifeCycleEdgeMapper; import com.vci.ubcs.omd.mapper.LifeCycleLineEventMapper; import com.vci.ubcs.omd.mapper.LifeCycleMapper; import com.vci.ubcs.omd.mapper.LifeCycleNodeMapper; import com.vci.ubcs.omd.entity.*; import com.vci.ubcs.omd.mapper.*; import com.vci.ubcs.omd.repeater.DomainRepeater; import com.vci.ubcs.omd.service.IBtmTypeService; import com.vci.ubcs.omd.service.ILifeCycleService; import com.vci.ubcs.omd.service.IStatusService; import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.omd.vo.LifeCycleEventVO; import com.vci.ubcs.omd.vo.LifeCycleVO; import com.vci.ubcs.omd.vo.StatusVO; import com.vci.ubcs.omd.wrapper.LifeCycleEventWrapper; import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper; import com.vci.ubcs.starter.enumpack.NewAppConstantEnum; import com.vci.ubcs.starter.exception.VciBaseException; @@ -85,6 +81,9 @@ @Lazy private IBtmTypeService btmTypeService; @Resource private LifeCycleEventMapper eventMapper; /** * è·åçå½å¨æå表 @@ -96,6 +95,18 @@ @Override public IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query) { return LifeCycleRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap,LifeCycleRule.class).lambda().orderByAsc(LifeCycleRule::getId))); } /** * è·åå ¨é¨çäºä»¶ * * @param conditionMap æ¥è¯¢æ¡ä»¶ * @param query å页 * @return äºä»¶çæ¾ç¤ºå¯¹è±¡ */ @Override public IPage<LifeCycleEventVO> listEvent(Map<String, Object> conditionMap, Query query) { return LifeCycleEventWrapper.build().pageVO(eventMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap, LifeCycleEvent.class).lambda().orderByAsc(LifeCycleEvent::getEventFullName))); } /** @@ -132,8 +143,6 @@ life.setOid(VciBaseUtil.getPk()); String creator = AuthUtil.getUserAccount(); Date now = new Date(); life.setBtmname(BtmTypeConstant.LIFE_CYCLE); life.setOwner(creator); life.setCreator(creator); life.setCreateTime(now); life.setLastModifier(creator); @@ -197,8 +206,6 @@ LifeCycleLineEvent event = org.springblade.core.tool.utils.BeanUtil.copy(eventDTO, LifeCycleLineEvent.class); event.setOid(VciBaseUtil.getPk()); event.setPkLifeCycleEdge(edgeOid); event.setBtmname(BtmTypeConstant.LIFE_CYCLE_LINE_EVENT); event.setOwner(creator); event.setCreator(creator); event.setCreateTime(now); event.setLastModifier(creator); @@ -219,8 +226,6 @@ LifeCycleNode node = org.springblade.core.tool.utils.BeanUtil.copy(nodeDTO, LifeCycleNode.class); node.setOid(VciBaseUtil.getPk()); node.setLifeCycleOid(lifeOid); node.setBtmname(BtmTypeConstant.LIFE_CYCLE_NODE); node.setOwner(creator); node.setCreator(creator); node.setCreateTime(now); node.setLastModifier(creator); @@ -247,8 +252,6 @@ LifeCycleEdge edge = org.springblade.core.tool.utils.BeanUtil.copy(edgeDTO, LifeCycleEdge.class); edge.setOid(VciBaseUtil.getPk()); edge.setLifeCycleOid(lifeOid); edge.setBtmname(BtmTypeConstant.LIFE_CYCLE_EDGE); edge.setOwner(creator); edge.setCreator(creator); edge.setCreateTime(now); edge.setLastModifier(creator); Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleEventWrapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,53 @@ package com.vci.ubcs.omd.wrapper; import com.vci.ubcs.omd.dto.LifeCycleDTO; import com.vci.ubcs.omd.entity.LifeCycleEvent; import com.vci.ubcs.omd.entity.LifeCycleEvent; import com.vci.ubcs.omd.vo.LifeCycleEventVO; import com.vci.ubcs.omd.vo.LifeCycleEventVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; /** * Description:äºä»¶ * * @author LiHang * @date 2023/5/23 */ public class LifeCycleEventWrapper extends BaseEntityWrapper<LifeCycleEvent, LifeCycleEventVO> { public static LifeCycleEventWrapper build() { return new LifeCycleEventWrapper(); } @Override public LifeCycleEventVO entityVO(LifeCycleEvent entity) { LifeCycleEventVO vo = BeanUtil.copy(entity, LifeCycleEventVO.class); //è¿éå¤çæä¸¾ç¸å ³ç return vo; } public List<LifeCycleEventVO> listEntityVO(List<LifeCycleEvent> LifeCycleEventList){ return Optional.ofNullable(LifeCycleEventList).orElseGet(ArrayList::new).stream().map(this::entityVO).collect(Collectors.toList()); } public List<LifeCycleEvent> batchCopyVO2DO(List<LifeCycleEventVO> LifeCycleEventVOList) { return Optional.ofNullable(LifeCycleEventVOList).orElseGet(ArrayList::new).stream().map(this::copyVO2DO).collect(Collectors.toList()); } private LifeCycleEvent copyVO2DO(LifeCycleEventVO LifeCycleEventVO) { LifeCycleEvent LifeCycleEvent = BeanUtil.copy(LifeCycleEventVO, LifeCycleEvent.class); return LifeCycleEvent; } public LifeCycleEvent copyDTO2DO(LifeCycleDTO lifeCycleDTO) { LifeCycleEvent LifeCycleEvent = BeanUtil.copy(lifeCycleDTO, LifeCycleEvent.class); return LifeCycleEvent; } }