From 4d8f8ea304c739da4da6af2448b2957785f3d561 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期四, 06 七月 2023 20:23:59 +0800
Subject: [PATCH] 增加生命周期的事件列表

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java    |   17 +++++
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleEventWrapper.java     |   53 +++++++++++++++++
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java |   35 ++++++-----
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleEventMapper.java       |   15 +++++
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java         |   12 ++++
 5 files changed, 116 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
index 7410c7a..0d942ba 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
+++ b/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()));
+	}
+
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleEventMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleEventMapper.java
new file mode 100644
index 0000000..c83c346
--- /dev/null
+++ b/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> {
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
index 982c852..9fed8ea 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
+++ b/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);
+
+
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
index bd1f599..f2f24e2 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
+++ b/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);
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleEventWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleEventWrapper.java
new file mode 100644
index 0000000..3af3c62
--- /dev/null
+++ b/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;
+    }
+}

--
Gitblit v1.9.3