From 6080583faf1e5054dd7f95046894b797ce1ff7db Mon Sep 17 00:00:00 2001 From: huangge1199 Date: Wed, 6 Aug 2025 14:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/iet/ustb/sf/domain/Analysis.java | 37 ++++---- .../java/iet/ustb/sf/domain/Category.java | 30 +++---- src/main/java/iet/ustb/sf/domain/Columns.java | 62 ++++++------- src/main/java/iet/ustb/sf/domain/JobLog.java | 24 +++-- src/main/java/iet/ustb/sf/domain/Monitor.java | 90 +++++++++---------- src/main/java/iet/ustb/sf/domain/Rule.java | 52 +++++------ .../java/iet/ustb/sf/domain/TableColumn.java | 41 ++++----- src/main/java/iet/ustb/sf/domain/Tables.java | 56 ++++++------ src/main/java/iet/ustb/sf/domain/Target.java | 58 ++++++------ .../java/iet/ustb/sf/domain/TargetData.java | 34 ++++--- .../java/iet/ustb/sf/domain/TargetOption.java | 32 +++---- 11 files changed, 237 insertions(+), 279 deletions(-) diff --git a/src/main/java/iet/ustb/sf/domain/Analysis.java b/src/main/java/iet/ustb/sf/domain/Analysis.java index 3901597..e7ef2bb 100644 --- a/src/main/java/iet/ustb/sf/domain/Analysis.java +++ b/src/main/java/iet/ustb/sf/domain/Analysis.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_analysis */ @TableName(value ="mbgk_analysis") @@ -140,23 +139,21 @@ public class Analysis { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", targetId=").append(targetId); - sb.append(", name=").append(name); - sb.append(", type=").append(type); - sb.append(", isTime=").append(isTime); - sb.append(", columnEn=").append(columnEn); - sb.append(", columnCn=").append(columnCn); - sb.append(", showVal=").append(showVal); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", remark=").append(remark); - sb.append(", sql=").append(sql); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", targetId=" + targetId + + ", name=" + name + + ", type=" + type + + ", isTime=" + isTime + + ", columnEn=" + columnEn + + ", columnCn=" + columnCn + + ", showVal=" + showVal + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", remark=" + remark + + ", sql=" + sql + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/Category.java b/src/main/java/iet/ustb/sf/domain/Category.java index 8053ef0..7f240a7 100644 --- a/src/main/java/iet/ustb/sf/domain/Category.java +++ b/src/main/java/iet/ustb/sf/domain/Category.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_category */ @TableName(value ="mbgk_category") @@ -24,7 +23,6 @@ public class Category { /** * 主键 */ - @TableField(value = "id") private String id; /** @@ -108,19 +106,17 @@ public class Category { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", nameEn=").append(nameEn); - sb.append(", nameCn=").append(nameCn); - sb.append(", parentId=").append(parentId); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", topic=").append(topic); - sb.append(", organization=").append(organization); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", nameEn=" + nameEn + + ", nameCn=" + nameCn + + ", parentId=" + parentId + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", topic=" + topic + + ", organization=" + organization + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/Columns.java b/src/main/java/iet/ustb/sf/domain/Columns.java index 1af754e..3dbfb48 100644 --- a/src/main/java/iet/ustb/sf/domain/Columns.java +++ b/src/main/java/iet/ustb/sf/domain/Columns.java @@ -1,13 +1,11 @@ package iet.ustb.sf.domain; -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 lombok.Data; /** * + * @author hyy * @TableName columns */ @TableName(value ="information_schema.columns") @@ -204,35 +202,33 @@ public class Columns { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", tableCatalog=").append(tableCatalog); - sb.append(", tableSchema=").append(tableSchema); - sb.append(", tableName=").append(tableName); - sb.append(", columnName=").append(columnName); - sb.append(", ordinalPosition=").append(ordinalPosition); - sb.append(", columnDefault=").append(columnDefault); - sb.append(", isNullable=").append(isNullable); - sb.append(", dataType=").append(dataType); - sb.append(", characterMaximumLength=").append(characterMaximumLength); - sb.append(", characterOctetLength=").append(characterOctetLength); - sb.append(", numericPrecision=").append(numericPrecision); - sb.append(", numericScale=").append(numericScale); - sb.append(", datetimePrecision=").append(datetimePrecision); - sb.append(", characterSetName=").append(characterSetName); - sb.append(", collationName=").append(collationName); - sb.append(", columnType=").append(columnType); - sb.append(", columnKey=").append(columnKey); - sb.append(", extra=").append(extra); - sb.append(", privileges=").append(privileges); - sb.append(", columnComment=").append(columnComment); - sb.append(", columnSize=").append(columnSize); - sb.append(", decimalDigits=").append(decimalDigits); - sb.append(", generationExpression=").append(generationExpression); - sb.append(", srsId=").append(srsId); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", tableCatalog=" + tableCatalog + + ", tableSchema=" + tableSchema + + ", tableName=" + tableName + + ", columnName=" + columnName + + ", ordinalPosition=" + ordinalPosition + + ", columnDefault=" + columnDefault + + ", isNullable=" + isNullable + + ", dataType=" + dataType + + ", characterMaximumLength=" + characterMaximumLength + + ", characterOctetLength=" + characterOctetLength + + ", numericPrecision=" + numericPrecision + + ", numericScale=" + numericScale + + ", datetimePrecision=" + datetimePrecision + + ", characterSetName=" + characterSetName + + ", collationName=" + collationName + + ", columnType=" + columnType + + ", columnKey=" + columnKey + + ", extra=" + extra + + ", privileges=" + privileges + + ", columnComment=" + columnComment + + ", columnSize=" + columnSize + + ", decimalDigits=" + decimalDigits + + ", generationExpression=" + generationExpression + + ", srsId=" + srsId + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/JobLog.java b/src/main/java/iet/ustb/sf/domain/JobLog.java index f0dd9a5..01cf46a 100644 --- a/src/main/java/iet/ustb/sf/domain/JobLog.java +++ b/src/main/java/iet/ustb/sf/domain/JobLog.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_job_log */ @TableName(value ="mbgk_job_log") @@ -24,7 +23,6 @@ public class JobLog { /** * 主键 */ - @TableField(value = "id") private String id; /** @@ -84,16 +82,14 @@ public class JobLog { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", targetId=").append(targetId); - sb.append(", status=").append(status); - sb.append(", createTime=").append(createTime); - sb.append(", info=").append(info); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", targetId=" + targetId + + ", status=" + status + + ", createTime=" + createTime + + ", info=" + info + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/Monitor.java b/src/main/java/iet/ustb/sf/domain/Monitor.java index 33a8b57..855e48a 100644 --- a/src/main/java/iet/ustb/sf/domain/Monitor.java +++ b/src/main/java/iet/ustb/sf/domain/Monitor.java @@ -1,9 +1,8 @@ package iet.ustb.sf.domain; -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 java.util.Date; import lombok.AllArgsConstructor; @@ -12,10 +11,10 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * + * @author hyy * @TableName mbgk_monitor */ -@TableName(value ="mbgk_monitor") +@TableName(value = "mbgk_monitor") @Data @Builder @AllArgsConstructor @@ -24,7 +23,6 @@ public class Monitor { /** * 主键 */ - @TableField(value = "id") private String id; /** @@ -88,7 +86,7 @@ public class Monitor { private String target; /** - * + * */ @TableField(value = "val") private Double val; @@ -142,23 +140,23 @@ public class Monitor { } Monitor other = (Monitor) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getTargetId() == null ? other.getTargetId() == null : this.getTargetId().equals(other.getTargetId())) - && (this.getRuleId() == null ? other.getRuleId() == null : this.getRuleId().equals(other.getRuleId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) - && (this.getTopic() == null ? other.getTopic() == null : this.getTopic().equals(other.getTopic())) - && (this.getOrganization() == null ? other.getOrganization() == null : this.getOrganization().equals(other.getOrganization())) - && (this.getLevel() == null ? other.getLevel() == null : this.getLevel().equals(other.getLevel())) - && (this.getCycle() == null ? other.getCycle() == null : this.getCycle().equals(other.getCycle())) - && (this.getUnit() == null ? other.getUnit() == null : this.getUnit().equals(other.getUnit())) - && (this.getTarget() == null ? other.getTarget() == null : this.getTarget().equals(other.getTarget())) - && (this.getVal() == null ? other.getVal() == null : this.getVal().equals(other.getVal())) - && (this.getWarnLevel() == null ? other.getWarnLevel() == null : this.getWarnLevel().equals(other.getWarnLevel())) - && (this.getSetDate() == null ? other.getSetDate() == null : this.getSetDate().equals(other.getSetDate())) - && (this.getXShow() == null ? other.getXShow() == null : this.getXShow().equals(other.getXShow())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) - && (this.getWarnType() == null ? other.getWarnType() == null : this.getWarnType().equals(other.getWarnType())); + && (this.getTargetId() == null ? other.getTargetId() == null : this.getTargetId().equals(other.getTargetId())) + && (this.getRuleId() == null ? other.getRuleId() == null : this.getRuleId().equals(other.getRuleId())) + && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) + && (this.getTopic() == null ? other.getTopic() == null : this.getTopic().equals(other.getTopic())) + && (this.getOrganization() == null ? other.getOrganization() == null : this.getOrganization().equals(other.getOrganization())) + && (this.getLevel() == null ? other.getLevel() == null : this.getLevel().equals(other.getLevel())) + && (this.getCycle() == null ? other.getCycle() == null : this.getCycle().equals(other.getCycle())) + && (this.getUnit() == null ? other.getUnit() == null : this.getUnit().equals(other.getUnit())) + && (this.getTarget() == null ? other.getTarget() == null : this.getTarget().equals(other.getTarget())) + && (this.getVal() == null ? other.getVal() == null : this.getVal().equals(other.getVal())) + && (this.getWarnLevel() == null ? other.getWarnLevel() == null : this.getWarnLevel().equals(other.getWarnLevel())) + && (this.getSetDate() == null ? other.getSetDate() == null : this.getSetDate().equals(other.getSetDate())) + && (this.getXShow() == null ? other.getXShow() == null : this.getXShow().equals(other.getXShow())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getWarnType() == null ? other.getWarnType() == null : this.getWarnType().equals(other.getWarnType())); } @Override @@ -188,29 +186,27 @@ public class Monitor { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", targetId=").append(targetId); - sb.append(", ruleId=").append(ruleId); - sb.append(", name=").append(name); - sb.append(", type=").append(type); - sb.append(", topic=").append(topic); - sb.append(", organization=").append(organization); - sb.append(", level=").append(level); - sb.append(", cycle=").append(cycle); - sb.append(", unit=").append(unit); - sb.append(", target=").append(target); - sb.append(", val=").append(val); - sb.append(", warnLevel=").append(warnLevel); - sb.append(", setDate=").append(setDate); - sb.append(", xShow=").append(xShow); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", warnType=").append(warnType); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", targetId=" + targetId + + ", ruleId=" + ruleId + + ", name=" + name + + ", type=" + type + + ", topic=" + topic + + ", organization=" + organization + + ", level=" + level + + ", cycle=" + cycle + + ", unit=" + unit + + ", target=" + target + + ", val=" + val + + ", warnLevel=" + warnLevel + + ", setDate=" + setDate + + ", xShow=" + xShow + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", warnType=" + warnType + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/Rule.java b/src/main/java/iet/ustb/sf/domain/Rule.java index f03c46c..a131da1 100644 --- a/src/main/java/iet/ustb/sf/domain/Rule.java +++ b/src/main/java/iet/ustb/sf/domain/Rule.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_rule */ @TableName(value ="mbgk_rule") @@ -24,7 +23,6 @@ public class Rule { /** * 主键 */ - @TableField(value = "id") private String id; /** @@ -196,30 +194,28 @@ public class Rule { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", name=").append(name); - sb.append(", type=").append(type); - sb.append(", op=").append(op); - sb.append(", target=").append(target); - sb.append(", rate=").append(rate); - sb.append(", warnLevel=").append(warnLevel); - sb.append(", remark=").append(remark); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", targetId=").append(targetId); - sb.append(", cycle=").append(cycle); - sb.append(", unit=").append(unit); - sb.append(", parentId=").append(parentId); - sb.append(", xVar=").append(xVar); - sb.append(", isPush=").append(isPush); - sb.append(", cycleNum=").append(cycleNum); - sb.append(", planLine=").append(planLine); - sb.append(", planArea=").append(planArea); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", name=" + name + + ", type=" + type + + ", op=" + op + + ", target=" + target + + ", rate=" + rate + + ", warnLevel=" + warnLevel + + ", remark=" + remark + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", targetId=" + targetId + + ", cycle=" + cycle + + ", unit=" + unit + + ", parentId=" + parentId + + ", xVar=" + xVar + + ", isPush=" + isPush + + ", cycleNum=" + cycleNum + + ", planLine=" + planLine + + ", planArea=" + planArea + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/TableColumn.java b/src/main/java/iet/ustb/sf/domain/TableColumn.java index d5e765d..7788c3b 100644 --- a/src/main/java/iet/ustb/sf/domain/TableColumn.java +++ b/src/main/java/iet/ustb/sf/domain/TableColumn.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_table_column */ @TableName(value ="mbgk_table_column") @@ -156,25 +155,23 @@ public class TableColumn { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", tableName=").append(tableName); - sb.append(", tableNameCn=").append(tableNameCn); - sb.append(", columnName=").append(columnName); - sb.append(", columnNameCn=").append(columnNameCn); - sb.append(", colnumnType=").append(colnumnType); - sb.append(", schema=").append(schema); - sb.append(", dataSource=").append(dataSource); - sb.append(", isDelete=").append(isDelete); - sb.append(", isPrimary=").append(isPrimary); - sb.append(", op=").append(op); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", sort=").append(sort); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", tableName=" + tableName + + ", tableNameCn=" + tableNameCn + + ", columnName=" + columnName + + ", columnNameCn=" + columnNameCn + + ", colnumnType=" + colnumnType + + ", schema=" + schema + + ", dataSource=" + dataSource + + ", isDelete=" + isDelete + + ", isPrimary=" + isPrimary + + ", op=" + op + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", sort=" + sort + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/Tables.java b/src/main/java/iet/ustb/sf/domain/Tables.java index 3a707a4..1da6426 100644 --- a/src/main/java/iet/ustb/sf/domain/Tables.java +++ b/src/main/java/iet/ustb/sf/domain/Tables.java @@ -1,14 +1,12 @@ package iet.ustb.sf.domain; -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 java.util.Date; import lombok.Data; /** * + * @author hyy * @TableName tables */ @TableName(value ="information_schema.tables") @@ -184,32 +182,30 @@ public class Tables { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", tableCatalog=").append(tableCatalog); - sb.append(", tableSchema=").append(tableSchema); - sb.append(", tableName=").append(tableName); - sb.append(", tableType=").append(tableType); - sb.append(", engine=").append(engine); - sb.append(", version=").append(version); - sb.append(", rowFormat=").append(rowFormat); - sb.append(", tableRows=").append(tableRows); - sb.append(", avgRowLength=").append(avgRowLength); - sb.append(", dataLength=").append(dataLength); - sb.append(", maxDataLength=").append(maxDataLength); - sb.append(", indexLength=").append(indexLength); - sb.append(", dataFree=").append(dataFree); - sb.append(", autoIncrement=").append(autoIncrement); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", checkTime=").append(checkTime); - sb.append(", tableCollation=").append(tableCollation); - sb.append(", checksum=").append(checksum); - sb.append(", createOptions=").append(createOptions); - sb.append(", tableComment=").append(tableComment); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", tableCatalog=" + tableCatalog + + ", tableSchema=" + tableSchema + + ", tableName=" + tableName + + ", tableType=" + tableType + + ", engine=" + engine + + ", version=" + version + + ", rowFormat=" + rowFormat + + ", tableRows=" + tableRows + + ", avgRowLength=" + avgRowLength + + ", dataLength=" + dataLength + + ", maxDataLength=" + maxDataLength + + ", indexLength=" + indexLength + + ", dataFree=" + dataFree + + ", autoIncrement=" + autoIncrement + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", checkTime=" + checkTime + + ", tableCollation=" + tableCollation + + ", checksum=" + checksum + + ", createOptions=" + createOptions + + ", tableComment=" + tableComment + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/Target.java b/src/main/java/iet/ustb/sf/domain/Target.java index 5b5c2b8..b5c4892 100644 --- a/src/main/java/iet/ustb/sf/domain/Target.java +++ b/src/main/java/iet/ustb/sf/domain/Target.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_target */ @TableName(value ="mbgk_target") @@ -24,7 +23,6 @@ public class Target { /** * 主键 */ - @TableField(value = "id") private String id; /** @@ -220,33 +218,31 @@ public class Target { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", name=").append(name); - sb.append(", parentName=").append(parentName); - sb.append(", categoryId=").append(categoryId); - sb.append(", unit=").append(unit); - sb.append(", type=").append(type); - sb.append(", isKey=").append(isKey); - sb.append(", targetInfo=").append(targetInfo); - sb.append(", resultSql=").append(resultSql); - sb.append(", level=").append(level); - sb.append(", parent=").append(parent); - sb.append(", remark=").append(remark); - sb.append(", tableName=").append(tableName); - sb.append(", cycle=").append(cycle); - sb.append(", status=").append(status); - sb.append(", searchSql=").append(searchSql); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", topic=").append(topic); - sb.append(", organization=").append(organization); - sb.append(", jobSql=").append(jobSql); - sb.append(", hisSql=").append(hisSql); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", name=" + name + + ", parentName=" + parentName + + ", categoryId=" + categoryId + + ", unit=" + unit + + ", type=" + type + + ", isKey=" + isKey + + ", targetInfo=" + targetInfo + + ", resultSql=" + resultSql + + ", level=" + level + + ", parent=" + parent + + ", remark=" + remark + + ", tableName=" + tableName + + ", cycle=" + cycle + + ", status=" + status + + ", searchSql=" + searchSql + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", topic=" + topic + + ", organization=" + organization + + ", jobSql=" + jobSql + + ", hisSql=" + hisSql + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/TargetData.java b/src/main/java/iet/ustb/sf/domain/TargetData.java index de068c6..6c52103 100644 --- a/src/main/java/iet/ustb/sf/domain/TargetData.java +++ b/src/main/java/iet/ustb/sf/domain/TargetData.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_target_data */ @TableName(value ="mbgk_target_data") @@ -34,9 +33,8 @@ public class TargetData { private String xShow; /** - * + * 主键 */ - @TableField(value = "id") private String id; /** @@ -116,20 +114,18 @@ public class TargetData { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", targetId=").append(targetId); - sb.append(", xShow=").append(xShow); - sb.append(", id=").append(id); - sb.append(", setDate=").append(setDate); - sb.append(", cycle=").append(cycle); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append(", val=").append(val); - sb.append(", targetCycle=").append(targetCycle); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", targetId=" + targetId + + ", xShow=" + xShow + + ", id=" + id + + ", setDate=" + setDate + + ", cycle=" + cycle + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", val=" + val + + ", targetCycle=" + targetCycle + + "]"; } } \ No newline at end of file diff --git a/src/main/java/iet/ustb/sf/domain/TargetOption.java b/src/main/java/iet/ustb/sf/domain/TargetOption.java index 7681f71..7857672 100644 --- a/src/main/java/iet/ustb/sf/domain/TargetOption.java +++ b/src/main/java/iet/ustb/sf/domain/TargetOption.java @@ -1,8 +1,6 @@ package iet.ustb.sf.domain; -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 java.util.Date; @@ -13,6 +11,7 @@ import lombok.NoArgsConstructor; /** * + * @author hyy * @TableName mbgk_target_option */ @TableName(value ="mbgk_target_option") @@ -24,7 +23,6 @@ public class TargetOption { /** * 主键 */ - @TableField(value = "id") private String id; /** @@ -116,20 +114,18 @@ public class TargetOption { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", targetId=").append(targetId); - sb.append(", columnName=").append(columnName); - sb.append(", type=").append(type); - sb.append(", op=").append(op); - sb.append(", fun=").append(fun); - sb.append(", val=").append(val); - sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); - sb.append("]"); - return sb.toString(); + return getClass().getSimpleName() + + " [" + + "Hash = " + hashCode() + + ", id=" + id + + ", targetId=" + targetId + + ", columnName=" + columnName + + ", type=" + type + + ", op=" + op + + ", fun=" + fun + + ", val=" + val + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + "]"; } } \ No newline at end of file