From 723d38375c45d24737bfef6f33a9686254abf99b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 17 十月 2024 13:42:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java | 100 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 75 insertions(+), 25 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
index 8c91dd0..2e66f28 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
@@ -1,8 +1,12 @@
package com.smartor.domain;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.google.gson.Gson;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,86 +29,122 @@
/**
* $column.columnComment
*/
- @ApiModelProperty(name = "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭")
private Long targetoptionid;
- @ApiModelProperty(name = "鎸囨爣ID")
+ @ApiModelProperty(value = "鎸囨爣ID")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Long targetid;
- @ApiModelProperty(name = "鎸囨爣绫诲瀷")
+ @ApiModelProperty(value = "鎸囨爣绫诲瀷")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String targettype;
/**
* 绫诲埆鍚嶇О
*/
- @ApiModelProperty(name = "绫诲埆鍚嶇О")
+ @ApiModelProperty(value = "绫诲埆鍚嶇О")
@Excel(name = "绫诲埆鍚嶇О")
private String categoryName;
- @ApiModelProperty(name = "鎸囨爣鍊�")
+ /**
+ * 閫変腑鎻愮ず
+ */
+ @ApiModelProperty(value = "閫変腑鎻愮ず")
+ @Excel(name = "閫変腑鎻愮ず")
+ private String prompt;
+
+ @ApiModelProperty(value = "鎸囨爣鍊�")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String targetvalue;
- @ApiModelProperty(name = "姝ｅ垯")
+ @ApiModelProperty(value = "姝ｅ垯1")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String targetregex;
- @ApiModelProperty(name = "閫夐」鎻忚堪")
+ @ApiModelProperty(value = "姝ｅ垯2")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String targetregex2;
+
+
+ @Excel(name = "姝ｅ垯鍏抽敭瀛楅泦鍚�(鍚�)")
+ private String nodynamiccruxsJson;
+
+
+ @Excel(name = "姝ｅ垯鍏抽敭瀛楅泦鍚�(涓嶅惈)")
+ private String dynamiccruxsJson;
+
+ @ApiModelProperty(value = "姝ｅ垯鍏抽敭瀛�(鍚�)")
+ @Excel(name = "姝ｅ垯鍏抽敭瀛�(鍚�)")
+ @JsonFormat
+ private List<String> nodynamiccruxs = new ArrayList<>();
+
+ @ApiModelProperty(value = "姝ｅ垯鍏抽敭瀛�(涓嶅惈)")
+ @Excel(name = "姝ｅ垯鍏抽敭瀛�(涓嶅惈)")
+ @JsonFormat
+ private List<String> dynamiccruxs = new ArrayList<>();
+
+ @ApiModelProperty(value = "閫夐」鎻忚堪")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String optiondesc;
- @ApiModelProperty(name = "璇█")
+ @ApiModelProperty(value = "璇█")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String language;
- @ApiModelProperty(name = "鐗堟湰鍙�")
+ @ApiModelProperty(value = "鐗堟湰鍙�")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Long version;
- @ApiModelProperty(name = "鍒嗙粍ID")
+ @ApiModelProperty(value = "鍒嗙粍ID")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String groupid;
/**
* 鏄惁寮傚父鏍囪瘑
*/
- @ApiModelProperty(name = "鏄惁寮傚父鏍囪瘑")
+ @ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑")
@Excel(name = "鏄惁寮傚父鏍囪瘑")
private Long isabnormal;
/**
* 棰勮闃�鍊间笂闄�
*/
- @ApiModelProperty(name = "棰勮闃�鍊间笂闄�")
+ @ApiModelProperty(value = "棰勮闃�鍊间笂闄�")
@Excel(name = "棰勮闃�鍊间笂闄�")
private Long warnup;
/**
* 棰勮闃�鍊间笅闄�
*/
- @ApiModelProperty(name = "棰勮闃�鍊间笅闄�")
+ @ApiModelProperty(value = "棰勮闃�鍊间笅闄�")
@Excel(name = "棰勮闃�鍊间笅闄�")
private Long warndown;
/**
+ * 椤哄簭搴忓彿
+ */
+ @ApiModelProperty(value = "椤哄簭搴忓彿")
+ @Excel(name = "椤哄簭搴忓彿")
+ private Long orderno;
+
+ /**
* 鍒犻櫎鏍囪
*/
- @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
private String delFlag;
/**
* 涓婁紶鏍囪
*/
- @ApiModelProperty(name = "涓婁紶鏍囪")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
@Excel(name = " 涓婁紶鏍囪 ")
private Long isupload;
/**
* 涓婁紶鏃堕棿
*/
- @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date uploadTime;
@@ -112,40 +152,50 @@
/**
* 鏈烘瀯ID
*/
- @ApiModelProperty(name = "鏈烘瀯ID")
+ @ApiModelProperty(value = "鏈烘瀯ID")
@Excel(name = " 鏈烘瀯ID ")
private String orgid;
/**
* 鐖禝D
*/
- @ApiModelProperty(name = "鐖禝D")
+ @ApiModelProperty(value = "鐖禝D")
@Excel(name = "鐖禝D")
private Long pid;
/**
* GUID
*/
- @ApiModelProperty(name = "GUID")
+ @ApiModelProperty(value = "GUID")
@Excel(name = "GUID")
private String guid;
+ @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
+ private Integer isoperation;
+
+ @ApiModelProperty(value = "鎬绘潯鏁�")
+ private Integer allitems;
+
+ @ApiModelProperty(value = "閫夐」闄勫姞鏍囪瘑")
+ private String appendflag;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ private String appenddesc;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ private String picturePath;
/**
* pageNum
*/
- @ApiModelProperty(name = "pageNum")
+ @ApiModelProperty(value = "pageNum")
@Excel(name = "pageNum")
private Integer pageNum;
/**
* pageSize
*/
- @ApiModelProperty(name = "pageSize")
+ @ApiModelProperty(value = "pageSize")
@Excel(name = "pageSize")
private Integer pageSize;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("targetoptionid", getTargetoptionid()).append("targetid", getTargetid()).append("targettype", getTargettype()).append("categoryName", getCategoryName()).append("targetvalue", getTargetvalue()).append("targetregex", getTargetregex()).append("optiondesc", getOptiondesc()).append("language", getLanguage()).append("version", getVersion()).append("groupid", getGroupid()).append("isabnormal", getIsabnormal()).append("warnup", getWarnup()).append("warndown", getWarndown()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).toString();
- }
}
--
Gitblit v1.9.3