From 0568a06862707f10eab2e9e62dd08a447cdcb563 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期日, 25 六月 2023 10:52:09 +0800
Subject: [PATCH] 生命周期暂时不报错
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java | 57 ---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java | 26 -
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java | 20 +
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java | 62 ---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java | 63 +++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java | 64 +++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java | 61 +++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java | 48 --
/dev/null | 100 -----
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java | 50 --
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java | 84 ----
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java | 46 ++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java | 121 ++++++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java | 17
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java | 55 --
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java | 18 +
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java | 47 --
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java | 20 +
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java | 90 +++++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java | 20 +
20 files changed, 581 insertions(+), 488 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
index 7a1ccf6..406c378 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.vci.ubcs.omd.entity.LifeCycleRule;
import lombok.Data;
import java.util.Date;
@@ -11,56 +12,20 @@
* @date 2019/10/14 17:28
*/
@Data
-public class LifeCycleDTO implements java.io.Serializable {
+public class LifeCycleDTO extends LifeCycleRule {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = -2896532706167604421L;
- /**
- * 涓婚敭
- */
- private String oid;
+ /**
+ * 鑺傜偣
+ */
+ private List<LifeCycleNodeDTO> nodes;
- /**
- * 鐢熷懡鍛ㄦ湡缂栧彿
- */
- private String id;
-
- /**
- * 鐢熷懡鍛ㄦ湡鍚嶇О
- */
- private String name;
-
- /**
- * 鎻忚堪
- */
- private String description;
-
- /**
- * 璧峰鐘舵��
- */
- private String startStatus;
-
- /**
- * 璧峰鐘舵�佸悕绉�
- */
- private String startStatusName;
-
- /**
- * 鍦ㄦ壂鎻忕殑鏃跺�欒褰曡繖涓敓鍛藉懆鏈熷搴旂殑绫诲叏璺緞
- */
- private String classFullName;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
- /**
- * 鍖呭惈鐨勮繛鎺ョ嚎
- */
- private List<LifeCycleLineDTO> lineDTOList;
-
+ /**
+ * 杈圭晫鍜岃繛鎺ョ嚎
+ */
+ private List<LifeCycleEdgeDTO> edges;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java
new file mode 100644
index 0000000..4b661e8
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java
@@ -0,0 +1,20 @@
+package com.vci.ubcs.omd.dto;
+
+import com.vci.ubcs.omd.entity.LifeCycleEdge;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鍥句笂鐨勮繛鎺ョ嚎绛夊唴瀹�
+ * @author weidy
+ * @date 2023/6/15
+ */
+@Data
+public class LifeCycleEdgeDTO extends LifeCycleEdge {
+
+ /**
+ * 浜嬩欢
+ */
+ private List<LifeCycleLineEventDTO> events;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
deleted file mode 100644
index 57ea385..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.vci.ubcs.omd.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 鐢熷懡鍛ㄦ湡杩炴帴绾挎暟鎹紶杈撳璞�
- * @author weidy
- * @date 2019/10/14 17:31
- */
-@Data
-public class LifeCycleLineDTO implements java.io.Serializable{
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = -7556637895235122903L;
-
- /**
- * 鎵�灞炵敓鍛藉懆鏈�
- */
- private String pkLifeCycle;
-
- /**
- * 婧愮姸鎬佷富閿�
- */
- private String sourceLifeStatusOid;
-
- /**
- * 婧愮姸鎬佷唬鍙�
- */
- private String sourceLifeStatus;
-
- /**
- * 婧愮姸鎬佸悕绉�
- */
- private String sourceLifeStatusName;
-
- /**
- * 鐩爣鐘舵�佷富閿�
- */
- private String targetLifeStatusOid;
-
- /**
- * 鐩爣鐘舵�佷唬鍙�
- */
- private String targetLifeStatus;
-
- /**
- * 鐩爣鐘舵�佸悕绉�
- */
- private String targetLifeStatusName;
-
- /**
- * 杩炴帴绾垮悕绉�
- */
- private String name;
-
- /**
- * 杩炴帴绾夸綅缃俊鎭�
- */
- private String transLineSiteInfo;
-
- /**
- * 涓婚敭
- */
- private String oid;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
- /**
- * 鍖呭惈鐨勪簨浠�
- */
- private List<LifeCycleLineEventDTO> eventDTOList;
-
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
index 2f01763..ba07d73 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
import lombok.Data;
import java.util.Date;
@@ -10,35 +11,12 @@
* @date 2019/10/14 17:47
*/
@Data
-public class LifeCycleLineEventDTO implements java.io.Serializable {
+public class LifeCycleLineEventDTO extends LifeCycleLineEvent {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 6860210157516359420L;
- /**
- * 涓婚敭
- */
- private String oid;
- /**
- * 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
- */
- private String pkLifeCycleLine;
-
- /**
- * 浜嬩欢鐨勫叏璺緞
- */
- private String eventFullName;
-
- /**
- * 浜嬩欢鐨勫悕绉�
- */
- private String eventShowName;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java
new file mode 100644
index 0000000..ea36159
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java
@@ -0,0 +1,20 @@
+package com.vci.ubcs.omd.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.vci.ubcs.omd.entity.LifeCycleNode;
+import lombok.Data;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鐨勮妭鐐圭殑鏁版嵁浼犺緭瀵硅薄
+ * @author weidy
+ * @date 2023/6/15
+ */
+@Data
+public class LifeCycleNodeDTO extends LifeCycleNode {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = -5906341589798877268L;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java
new file mode 100644
index 0000000..46910d1
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java
@@ -0,0 +1,63 @@
+package com.vci.ubcs.omd.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鐨勫浘鐨勮竟鐣屽唴瀹�
+ * @author weidy
+ * @date 2023/6/15
+ */
+@Data
+@TableName("pl_omd_life_cycle_edge")
+@ApiModel(value = "鐢熷懡鍛ㄦ湡鐨勫浘鐨勮竟鐣屽唴瀹�", description = "鐢熷懡鍛ㄦ湡杈圭晫鍐呭")
+public class LifeCycleEdge extends BaseModel {
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = -8998234372457685057L;
+ /**
+ * 鏉ユ簮鐘舵��
+ */
+ private String source;
+
+ /**
+ * 鏉ユ簮鐘舵�佽竟鐣�
+ */
+ private String sourceAnchor;
+
+ /**
+ * 鐩爣鐘舵��
+ */
+ private String target;
+
+ /**
+ * 鐩爣鐘舵�佽竟鐣�
+ */
+ private String targetAnchor;
+
+
+ /**
+ * 绾跨殑绫诲瀷
+ */
+ private String shape;
+
+ /**
+ * 杩炴帴绾跨殑鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 鎺掑簭鍙�
+ */
+ @JSONField(name = "index")
+ private Integer indexNO;
+
+ /**
+ * 鎵�灞炵敓鍛藉懆鏈�
+ */
+ private String lifeCycleOid;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
index 0c41e84..8f12d8e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
@@ -1,12 +1,11 @@
package com.vci.ubcs.omd.entity;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
-import java.util.Date;
/**
* 鐢熷懡鍛ㄦ湡浜嬩欢闆嗗悎
@@ -17,18 +16,12 @@
@Data
@TableName("pl_omd_life_cycle_event")
@ApiModel(value = "鐢熷懡鍛ㄦ湡浜嬩欢闆嗗悎", description = "鐢熷懡鍛ㄦ湡浜嬩欢闆嗗悎")
-public class LifeCycleEvent implements java.io.Serializable{
+public class LifeCycleEvent extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 6950469551222671511L;
-
- /**
- * 涓婚敭
- */
- @TableId
- private String oid;
/**
* 浜嬩欢鐨勫叏璺緞
@@ -45,40 +38,9 @@
*/
private String description;
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
+ /**
+ * 鎵�灞為鍩�
+ */
+ private String domain;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
deleted file mode 100644
index 1cb65c1..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.vci.ubcs.omd.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- *
- * 鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎
- * @author weidy
- * @date 2019/10/10 6:56 PM
- */
-@Data
-@TableName("pl_omd_life_cycle_line")
-@ApiModel(value = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎", description = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎")
-public class LifeCycleLine implements java.io.Serializable {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 1220998076767353574L;
-
- /**
- * 鎵�灞炵敓鍛藉懆鏈�
- */
- private String pkLifeCycle;
-
- /**
- * 婧愮姸鎬佷唬鍙�
- */
- private String sourceLifeStatus;
-
- /**
- * 婧愮姸鎬佸悕绉�
- */
- private String sourceLifeStatusName;
-
- /**
- * 鐩爣鐘舵�佷唬鍙�
- */
- private String targetLifeStatus;
-
- /**
- * 鐩爣鐘舵�佸悕绉�
- */
- private String targetLifeStatusName;
-
- /**
- * 杩炴帴绾垮悕绉�
- */
- private String name;
-
- /**
- * 杩炴帴绾夸綅缃俊鎭�
- */
- private String transLineSiteInfo;
-
- /**
- * 涓婚敭
- */
- @TableId
- private String oid;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmName;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
index 2f8d1cf..e3ba056 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -17,22 +18,17 @@
@Data
@TableName("pl_omd_life_cycle_line_event")
@ApiModel(value = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎", description = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎")
-public class LifeCycleLineEvent implements java.io.Serializable{
+public class LifeCycleLineEvent extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = -842247029575668650L;
- /**
- * 涓婚敭
- */
- @TableId
- private String oid;
/**
* 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
*/
- private String pkLifeCycleLine;
+ private String pkLifeCycleEdge;
/**
* 浜嬩欢鐨勫叏璺緞
@@ -49,40 +45,10 @@
*/
private Integer orderNum;
+ /**
+ * 鎵�灞為鍩�
+ */
+ private String domain;
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java
new file mode 100644
index 0000000..80f792a
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java
@@ -0,0 +1,64 @@
+package com.vci.ubcs.omd.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author weidy
+ * @date 2023/6/15
+ */
+@Data
+@TableName("pl_omd_life_cycle_node")
+@ApiModel(value = "鐢熷懡鍛ㄦ湡鐨勮妭鐐瑰唴瀹�", description = "鐢熷懡鍛ㄦ湡鑺傜偣")
+public class LifeCycleNode extends BaseModel {
+
+ /**
+ * 鑺傜偣鐨勫昂瀵�
+ */
+ @JSONField(name = "size")
+ private String boxSize;
+
+ /**
+ * 棰滆壊鐨勬樉绀�
+ */
+ private String color;
+
+ /**
+ * 鏄剧ず鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 鐘舵�佹爣璇�
+ */
+ private String id;
+
+ /**
+ * x杞寸殑鍧愭爣
+ */
+ private String x;
+
+ /**
+ * y杞寸殑鍧愭爣
+ */
+ private String y;
+
+ /**
+ * 鎺掑簭鍙�
+ */
+ @JSONField(name = "index")
+ private Integer indexNO;
+
+ /**
+ * 绾跨殑绫诲瀷
+ */
+ private String shape;
+
+ /**
+ * 鎵�灞炵敓鍛藉懆鏈�
+ */
+ private String lifeCycleOid;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
index 6aed6d3..c79b372 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -17,18 +18,13 @@
@Data
@TableName("pl_omd_life_cycle_rule")
@ApiModel(value = "鐢熷懡鍛ㄦ湡瑙勫垯", description = "鐢熷懡鍛ㄦ湡瑙勫垯")
-public class LifeCycleRule implements java.io.Serializable {
+public class LifeCycleRule extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 1476717511843047292L;
- /**
- * 涓婚敭
- */
- @TableId
- private String oid;
/**
* 鐢熷懡鍛ㄦ湡缂栧彿
@@ -54,44 +50,5 @@
* 璧峰鐘舵�佸悕绉�
*/
private String startStatusName;
-
- /**
- * 绫荤殑鍏ㄨ矾寰�
- */
- private String classFullName;
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmName;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java
new file mode 100644
index 0000000..2b7e07c
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java
@@ -0,0 +1,20 @@
+package com.vci.ubcs.omd.vo;
+
+import com.vci.ubcs.omd.entity.LifeCycleEdge;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢熷懡鍛ㄦ湡杩炴帴绾�
+ * @author weidy
+ * @date 2023/6/15
+ */
+@Data
+public class LifeCycleEdgeVO extends LifeCycleEdge {
+
+ /**
+ * 浜嬩欢
+ */
+ private List<LifeCycleLineEventVO> events;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
index 8ca36cb..3588cf6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.vo;
+import com.vci.ubcs.omd.entity.LifeCycleEvent;
import lombok.Data;
import java.util.Date;
@@ -10,65 +11,11 @@
* @date 2023/4/3
*/
@Data
-public class LifeCycleEventVO implements java.io.Serializable{
+public class LifeCycleEventVO extends LifeCycleEvent {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 8503381504954264216L;
- /**
- * 涓婚敭
- */
- private String oid;
-
- /**
- * 浜嬩欢鐨勫叏璺緞
- */
- private String eventFullName;
-
- /**
- * 浜嬩欢鐨勫悕绉�
- */
- private String eventShowName;
-
- /**
- * 浜嬩欢鎻忚堪
- */
- private String description;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
index 9db39af..25822d2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.vo;
+import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
import lombok.Data;
import java.util.Date;
@@ -11,70 +12,11 @@
* @date 2023/4/3
*/
@Data
-public class LifeCycleLineEventVO implements java.io.Serializable{
+public class LifeCycleLineEventVO extends LifeCycleLineEvent {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 216430078444875215L;
- /**
- * 涓婚敭
- */
- private String oid;
-
- /**
- * 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
- */
- private String pkLifeCycleLine;
-
- /**
- * 浜嬩欢鐨勫叏璺緞
- */
- private String eventFullName;
-
- /**
- * 浜嬩欢鐨勫悕绉�
- */
- private String eventShowName;
-
- /**
- * 鎺掑簭鍙�
- */
- private Integer orderNum;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
deleted file mode 100644
index 9ae40f7..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.vci.ubcs.omd.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 鐢熷懡鍛ㄦ湡杩炴帴绾�
- * @author LiHang
- * @date 2023/4/3
- */
-@Data
-public class LifeCycleLineVO implements java.io.Serializable {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 1429889911601940640L;
-
- /**
- * 鎵�灞炵敓鍛藉懆鏈�
- */
- private String pkLifeCycle;
-
- /**
- * 婧愮姸鎬佷唬鍙�
- */
- private String sourceLifeStatus;
-
- /**
- * 婧愮姸鎬佸悕绉�
- */
- private String sourceLifeStatusName;
-
- /**
- * 鐩爣鐘舵�佷唬鍙�
- */
- private String targetLifeStatus;
-
- /**
- * 鐩爣鐘舵�佸悕绉�
- */
- private String targetLifeStatusName;
-
- /**
- * 杩炴帴绾垮悕绉�
- */
- private String name;
-
- /**
- * 杩炴帴绾夸綅缃俊鎭�
- */
- private String transLineSiteInfo;
-
- /**
- * 涓婚敭
- */
- private String oid;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
- /**
- * 鍖呭惈浜嬩欢
- */
- private List<LifeCycleLineEventVO> events;
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java
new file mode 100644
index 0000000..87c7a6a
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java
@@ -0,0 +1,17 @@
+package com.vci.ubcs.omd.vo;
+
+import com.vci.ubcs.omd.entity.LifeCycleNode;
+import lombok.Data;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鑺傜偣鐨勬樉绀哄璞�
+ * @author weidy
+ * @date 2023/6/15
+ */
+@Data
+public class LifeCycleNodeVO extends LifeCycleNode {
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = -3685497665145192869L;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
index 164824e..5813a75 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.vo;
+import com.vci.ubcs.omd.entity.LifeCycleRule;
import lombok.Data;
import java.util.Date;
@@ -11,85 +12,20 @@
* @date 2023/4/3
*/
@Data
-public class LifeCycleVO implements java.io.Serializable{
+public class LifeCycleVO extends LifeCycleRule {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = 5567711696707791107L;
- /**
- * 涓婚敭
- */
- private String oid;
+ /**
+ * 鑺傜偣
+ */
+ private List<LifeCycleNodeVO> nodes;
- /**
- * 鐢熷懡鍛ㄦ湡缂栧彿
- */
- private String id;
-
- /**
- * 鐢熷懡鍛ㄦ湡鍚嶇О
- */
- private String name;
-
- /**
- * 鎻忚堪
- */
- private String description;
-
- /**
- * 绫荤殑鍏ㄨ矾寰�
- */
- private String classFullName;
-
- /**
- * 璧峰鐘舵��
- */
- private String startStatus;
-
- /**
- * 璧峰鐘舵�佸悕绉�
- */
- private String startStatusName;
-
- /**
- * 涓氬姟绫诲瀷鍚嶇О
- */
- private String btmname;
-
- /**
- * 鎷ユ湁鑰�
- */
- private String owner;
-
- /**
- * 鍒涘缓浜�
- */
- private String creator;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 鏈�鍚庝慨鏀逛汉
- */
- private String lastModifier;
-
- /**
- * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
- */
- private Date lastModifyTime;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
- /**
- * 鍖呭惈杩炴帴绾�
- */
- private List<LifeCycleLineVO> lines;
+ /**
+ * 杩炴帴绾�
+ */
+ private List<LifeCycleEdgeVO> edges;
}
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
new file mode 100644
index 0000000..c3a9567
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
@@ -0,0 +1,121 @@
+package com.vci.ubcs.omd.controller;
+
+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.LifeCycleRule;
+import com.vci.ubcs.omd.service.ILifeCycleService;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LifeCycleVO;
+import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鐨勬帶鍒跺櫒
+ * @author weidy
+ * @date 2023/6/15
+ */
+@RestController
+@RequestMapping("/lifeCycle")
+@AllArgsConstructor
+@Api(value = "鐢熷懡鍛ㄦ湡鎺у埗鍣�",tags = "鐢熷懡鍛ㄦ湡鎺ュ彛")
+public class LifeCycleController {
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
+ */
+ private final ILifeCycleService lifeCycleService;
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ */
+ @GetMapping("page")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡",notes = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡")
+ public R<IPage<LifeCycleVO>> page(BaseQueryObject baseQueryObject){
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ if (conditionMap == null){
+ conditionMap = new HashMap<>();
+ }
+ return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getPageHelper()));
+ }
+
+
+ /**
+ * 鏌ョ湅璇︽儏
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "鏌ョ湅璇︽儏", notes = "鐢熷懡鍛ㄦ湡")
+ public R<LifeCycleVO> detail(LifeCycleDTO lifeCycleDTO){
+ LifeCycleRule lifeCycleRule = lifeCycleService.getOne(Condition.getQueryWrapper(BeanUtil.copy(lifeCycleDTO, LifeCycleRule.class)));
+ return R.data(LifeCycleRuleWrapper.build().entityVO(lifeCycleRule));
+ }
+
+ /**
+ * 鏂板鎴栦慨鏀�
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+ public R<LifeCycleVO> submit(@RequestBody LifeCycleDTO lifeCycleDTO){
+ return R.data(lifeCycleService.addSave(lifeCycleDTO));
+ }
+
+ /**
+ * 鏂板鎴栦慨鏀�
+ */
+ @PostMapping("/batch-submit")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐘舵�佹睜椤甸潰瀵硅薄")
+ public R<List<LifeCycleVO>> batchSubmit(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
+ return R.data(lifeCycleService.batchAddSave(lifeCycleDTOs));
+ }
+
+ /**
+ * 鍒犻櫎
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆涓婚敭")
+ public R remove(@RequestBody LifeCycleDTO lifeCycleDTO){
+ lifeCycleService.delete(lifeCycleDTO);
+ return R.status(true);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ */
+ @PostMapping("/batch-remove")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "鎵归噺鍒犻櫎",notes = "浼犲叆涓婚敭")
+ public R batchRemove(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
+ lifeCycleService.batchDelete(lifeCycleDTOs);
+ return R.status(true);
+ }
+
+ /**
+ * 鏌ョ湅搴旂敤鑼冨洿
+ * @param lifeCycleDTO 鐢熷懡鍛ㄦ湡鐨勪紶杈撳璞�
+ * @return 涓氬姟绫诲瀷鐨勬樉绀哄璞�
+ */
+ @GetMapping("/listUses")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鏌ョ湅搴旂敤鑼冨洿",notes = "浼犲叆涓婚敭")
+ public R<List<BtmTypeVO>> listUses(LifeCycleDTO lifeCycleDTO){
+ return R.data(lifeCycleService.listUses(lifeCycleDTO));
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java
new file mode 100644
index 0000000..88ff512
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java
@@ -0,0 +1,18 @@
+package com.vci.ubcs.omd.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.omd.entity.LifeCycleRule;
+import com.vci.ubcs.omd.entity.Status;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鐨勬暟鎹搷浣滃眰
+ *
+ * @author weidy
+ * @date 2023/6/20
+ */
+public interface LifeCycleMapper extends BaseMapper<LifeCycleRule> {
+
+}
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
new file mode 100644
index 0000000..fd21582
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
@@ -0,0 +1,61 @@
+package com.vci.ubcs.omd.service;
+
+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.LifeCycleRule;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LifeCycleVO;
+import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
+ * @author weidy
+ * @date 2023/6/15
+ */
+public interface ILifeCycleService extends IService<LifeCycleRule> {
+
+ /**
+ * 鑾峰彇鐢熷懡鍛ㄦ湡鍒楄〃
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param pageHelper 鍒嗛〉
+ * @return 鐢熷懡鍛ㄦ湡鐨勬樉绀哄璞�
+ */
+ IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper);
+
+ /**
+ * 娣诲姞淇濆瓨
+ * @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
+ * @return 娣诲姞鍚庣殑鏄剧ず瀵硅薄
+ */
+ LifeCycleVO addSave(LifeCycleDTO lifeCycleDTO);
+
+ /**
+ * 鎵归噺娣诲姞鍐呭
+ * @param lifeCycleDTOs 鏁版嵁浼犺緭瀵硅薄
+ * @return 娣诲姞鍚庣殑鏄剧ず瀵硅薄
+ */
+ List<LifeCycleVO> batchAddSave(List<LifeCycleDTO> lifeCycleDTOs);
+
+ /**
+ * 鍒犻櫎鐢熷懡鍛ㄦ湡
+ * @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
+ */
+ void delete(LifeCycleDTO lifeCycleDTO);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢熷懡鍛ㄦ湡
+ * @param lifeCycleDTOs 鏁版嵁浼犺緭瀵硅薄鍒楄〃
+ */
+ void batchDelete(List<LifeCycleDTO> lifeCycleDTOs);
+
+ /**
+ * 鏄剧ず寮曠敤鑼冨洿
+ * @param lifeCycleDTO 鐢熷懡鍛ㄦ湡鐨勬暟鎹紶杈撳璞�
+ * @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
new file mode 100644
index 0000000..29ad035
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
@@ -0,0 +1,90 @@
+package com.vci.ubcs.omd.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.omd.dto.LifeCycleDTO;
+import com.vci.ubcs.omd.entity.LifeCycleRule;
+import com.vci.ubcs.omd.mapper.LifeCycleMapper;
+import com.vci.ubcs.omd.service.ILifeCycleService;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LifeCycleVO;
+import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
+ * @author weidy
+ * @date 2023/6/20
+ */
+@Service
+public class LifeCycleServiceImpl extends ServiceImpl<LifeCycleMapper, LifeCycleRule> implements ILifeCycleService{
+
+
+ /**
+ * 鑾峰彇鐢熷懡鍛ㄦ湡鍒楄〃
+ *
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param pageHelper 鍒嗛〉
+ * @return 鐢熷懡鍛ㄦ湡鐨勬樉绀哄璞�
+ */
+ @Override
+ public IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper) {
+ return null;
+ }
+
+ /**
+ * 娣诲姞淇濆瓨
+ *
+ * @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
+ * @return 娣诲姞鍚庣殑鏄剧ず瀵硅薄
+ */
+ @Override
+ public LifeCycleVO addSave(LifeCycleDTO lifeCycleDTO) {
+ return null;
+ }
+
+ /**
+ * 鎵归噺娣诲姞鍐呭
+ *
+ * @param lifeCycleDTOs 鏁版嵁浼犺緭瀵硅薄
+ * @return 娣诲姞鍚庣殑鏄剧ず瀵硅薄
+ */
+ @Override
+ public List<LifeCycleVO> batchAddSave(List<LifeCycleDTO> lifeCycleDTOs) {
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鐢熷懡鍛ㄦ湡
+ *
+ * @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
+ */
+ @Override
+ public void delete(LifeCycleDTO lifeCycleDTO) {
+
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐢熷懡鍛ㄦ湡
+ *
+ * @param lifeCycleDTOs 鏁版嵁浼犺緭瀵硅薄鍒楄〃
+ */
+ @Override
+ public void batchDelete(List<LifeCycleDTO> lifeCycleDTOs) {
+
+ }
+
+ /**
+ * 鏄剧ず寮曠敤鑼冨洿
+ *
+ * @param lifeCycleDTO 鐢熷懡鍛ㄦ湡鐨勬暟鎹紶杈撳璞�
+ * @return 涓氬姟绫诲瀷
+ */
+ @Override
+ public List<BtmTypeVO> listUses(LifeCycleDTO lifeCycleDTO) {
+ return null;
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java
new file mode 100644
index 0000000..739efa7
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java
@@ -0,0 +1,46 @@
+package com.vci.ubcs.omd.wrapper;
+
+import com.vci.ubcs.omd.entity.LifeCycleRule;
+import com.vci.ubcs.omd.vo.LifeCycleVO;
+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 LifeCycleRuleWrapper extends BaseEntityWrapper<LifeCycleRule, LifeCycleVO> {
+
+ public static LifeCycleRuleWrapper build() {
+ return new LifeCycleRuleWrapper();
+ }
+
+ @Override
+ public LifeCycleVO entityVO(LifeCycleRule entity) {
+ LifeCycleVO vo = BeanUtil.copy(entity, LifeCycleVO.class);
+ //杩欓噷澶勭悊鏋氫妇鐩稿叧鐨�
+ return vo;
+ }
+
+ public List<LifeCycleVO> listEntityVO(List<LifeCycleRule> LifeCycleRuleList){
+ return Optional.ofNullable(LifeCycleRuleList).orElseGet(ArrayList::new).stream().map(this::entityVO).collect(Collectors.toList());
+ }
+
+ public List<LifeCycleRule> batchCopyVO2DO(List<LifeCycleVO> LifeCycleVOList) {
+ return Optional.ofNullable(LifeCycleVOList).orElseGet(ArrayList::new).stream().map(this::copyVO2DO).collect(Collectors.toList());
+ }
+
+ private LifeCycleRule copyVO2DO(LifeCycleVO LifeCycleVO) {
+ LifeCycleRule LifeCycleRule = BeanUtil.copy(LifeCycleVO, LifeCycleRule.class);
+ return LifeCycleRule;
+ }
+
+
+}
--
Gitblit v1.9.3