ludc
2023-06-25 773d9314b7f1bf4dce390bf8fa0b6a9b12e32344
Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
已修改10个文件
已删除3个文件
已添加11个文件
1244 ■■■■ 文件已修改
Source/UBCS-WEB/src/api/resource/file.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/api/resource/file.js
@@ -16,10 +16,7 @@
  return request({
    url: '/api/ubcs-resource/fileController/deleteFile',
    method: 'delete',
    params: {
      fileOids,
      oids
    }
    data: oids
  })
}
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,7 +12,7 @@
 * @date 2019/10/14 17:28
 */
@Data
public class LifeCycleDTO implements java.io.Serializable {
public class LifeCycleDTO extends LifeCycleRule {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -19,48 +20,12 @@
    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;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
    /**
     * åŒ…含的连接线
     */
    private List<LifeCycleLineDTO> lineDTOList;
    private List<LifeCycleEdgeDTO> edges;
}
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;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
ÎļþÒÑɾ³ý
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;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
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;
}
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;
}
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;
    /**
     * äº‹ä»¶çš„全路径
@@ -46,39 +39,8 @@
    private String description;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     * æ‰€å±žé¢†åŸŸ
     */
    private String btmname;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
    private String domain;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
ÎļþÒÑɾ³ý
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 btmname;
    private String domain;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
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;
}
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;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
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;
}
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;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
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;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
ÎļþÒÑɾ³ý
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;
}
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,7 +12,7 @@
 * @date 2023/4/3
 */
@Data
public class LifeCycleVO implements java.io.Serializable{
public class LifeCycleVO extends LifeCycleRule {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
@@ -19,77 +20,12 @@
    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;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
    /**
     * åŒ…含连接线
     */
    private List<LifeCycleLineVO> lines;
    private List<LifeCycleEdgeVO> edges;
}
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -96,13 +96,16 @@
        try {
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            baseModel.setOid(dataMap.getOrDefault("OID",""));
            String createTime=dataMap.getOrDefault("CREATETIME","");
            Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
            String createTime= createTimeObj.toString();
            baseModel.setCreateTime(chageStringToDate(createTime));
            baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
            String lastModifyTime=dataMap.getOrDefault("LASTMODIFYTIME","");
            Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
            String lastModifyTime= lastModifyTimeObj.toString();
            baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
            String ts=dataMap.getOrDefault("TS","");
            Object tsObj=dataMap.getOrDefault("TS","");
            String ts= tsObj.toString();
            baseModel.setTs(chageStringToDate(ts));
            baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
            //用户id
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));
    }
}
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> {
}
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);
}
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;
    }
}
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;
    }
}