From 1b8120cacac0037fcb1f8ae747c2f54eb735368b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 五月 2023 18:50:51 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java |  173 ++++++++++++---------------------------------------------
 1 files changed, 37 insertions(+), 136 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java
index f91f223..95a66fd 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeButton.java
@@ -17,13 +17,18 @@
 package com.vci.ubcs.code.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.web.annotation.VciUseEnum;
+import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -37,153 +42,49 @@
 @Data
 @TableName("PL_CODE_BUTTON")
 @ApiModel(value = "codebutton瀵硅薄", description = "妯℃澘鎵╁睍姹�")
-//@EqualsAndHashCode(callSuper = false)
-public class CodeButton implements Serializable {
-	@JsonSerialize(
-		using = ToStringSerializer.class
-	)
-	@ApiModelProperty("涓婚敭id")
-	@TableId(
-		value = "oid",
-		type = IdType.ASSIGN_ID
-	)
-	private Long oid;
-	@ApiModelProperty("鎸夐挳缂栫爜")
+@EqualsAndHashCode(callSuper = true)
+public class CodeButton extends BaseModel {
+
+	/**
+	 * 搴忓垪鍖�
+	 */
+	private static final long serialVersionUID = -2281543776769670606L;
+
+	/**
+	 * 鎸夐挳鐨勮嫳鏂囩紪鍙�
+	 */
+	//@Column(nullable = false,columnDefinition = "鎸夐挳鐨勮嫳鏂囩紪鍙�")
 	private String id;
+
 	/**
-	 *
+	 * 鎸夐挳鐨勪腑鏂囧悕绉�
 	 */
-	@ApiModelProperty(value = "")
-	private String revisionoid;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String nameoid;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String btmname;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String lastr;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String firstr;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String lastv;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String firstv;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String creator;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private Date createtime;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String lastmodifier;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private Date lastmodifytime;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String revisionrule;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String versionrule;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private Short revisionseq;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String revisionvalue;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private Short versionseq;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String versionvalue;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String lctid;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String lcstatus;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private Date ts;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
+	//@Column(nullable = false,columnDefinition = "鎸夐挳鐨勪腑鏂囧悕绉�")
 	private String name;
+
 	/**
-	 *
+	 * 鎸夐挳鐨勫浘鏍囨牱寮�
 	 */
-	@ApiModelProperty(value = "")
-	private String description;
+	//@Column(columnDefinition = "鎸夐挳鐨勫浘鏍囨牱寮�")
+	private String iconCls;
+
 	/**
-	 *
+	 * 鎵ц鐨刯s鍐呭
 	 */
-	@ApiModelProperty(value = "")
-	private String owner;
+	//@Column(columnDefinition = "鎵ц鐨刯s鍐呭")
+	private String executeJs;
+
 	/**
-	 *
+	 * 浣跨敤鎸夐挳鐨勪綅缃�
 	 */
-	@ApiModelProperty(value = "")
-	private String copyfromversion;
+	//@Column(columnDefinition = "鎸夐挳鐨勪綅缃�")
+	@VciUseEnum(value = MdmEnumIdConstant.CODE_BUTTON_POSITION,showTextField = "usedPositionTypeText")
+	private String usedPositionType;
+
 	/**
-	 *
+	 * 浣跨敤鎸夐挳鐨勪綅缃殑鏄剧ず鏂囨湰
 	 */
-	@ApiModelProperty(value = "")
-	private String iconcls;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String executejs;
-	/**
-	 *
-	 */
-	@ApiModelProperty(value = "")
-	private String usedpositiontype;
+	@TableField(exist = false)
+	private String usedPositionTypeText;
 
 }

--
Gitblit v1.9.3