From 74802d4a1793f106955e52ed58f9898f46c7becd Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 16 Aug 2021 14:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=97=E6=AE=B5=E5=B8=A6?=
=?UTF-8?q?=E6=9C=89=E5=AF=8C=E6=96=87=E6=9C=AC=E9=A1=B5=E9=9D=A2=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 12 ++
.../code/factory/enums/FormFieldTypeEnum.java | 117 +++++-------------
.../factory/ChoiceBoxTableCellFactory.java | 2 +-
.../code/factory/service/FieldService.java | 4 +-
.../ink/wgink/code/factory/vos/FieldVO.java | 17 +--
src/main/resources/log4j.properties | 8 ++
6 files changed, 60 insertions(+), 100 deletions(-)
create mode 100644 src/main/resources/log4j.properties
diff --git a/pom.xml b/pom.xml
index f7759dc..d5c5673 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,12 +56,24 @@
+
+ log4j
+ log4j
+ 1.2.17
+
+
org.slf4j
slf4j-api
1.7.30
+
+ org.slf4j
+ slf4j-log4j12
+ 1.7.30
+
+
org.projectlombok
lombok
diff --git a/src/main/java/ink/wgink/code/factory/enums/FormFieldTypeEnum.java b/src/main/java/ink/wgink/code/factory/enums/FormFieldTypeEnum.java
index 0c73a6e..2705ce9 100644
--- a/src/main/java/ink/wgink/code/factory/enums/FormFieldTypeEnum.java
+++ b/src/main/java/ink/wgink/code/factory/enums/FormFieldTypeEnum.java
@@ -12,103 +12,42 @@ package ink.wgink.code.factory.enums;
**/
public enum FormFieldTypeEnum {
- /**
- * 文本
- */
- TEXT("text"),
- /**
- * 时间戳
- */
- DATETIME("datetime"),
- /**
- * 日期
- */
- DATE("date"),
- /**
- * 整形
- */
- NUMBER("number"),
- /**
- * 双精度
- */
- DOUBLE("double"),
- /**
- * 文本域
- */
- TEXTAREA("textarea"),
- /**
- * 富文本
- */
- RICH_TEXT("richText"),
- /**
- * ID 选择
- */
- ID_SELECT("idSelect"),
- /**
- * 下拉选择
- */
- SELECT("select"),
- /**
- * 复选
- */
- CHECKBOX("checkbox"),
- /**
- * 单选
- */
- RADIO("radio"),
- /**
- * 选择人员
- */
- SELECT_USER("selectUser"),
- /**
- * 选择部门
- */
- SELECT_DEPARTMENT("selectDepartment"),
- /**
- * 文件
- */
- FILE("file"),
- /**
- * 图片
- */
- IMAGE("image"),
- /**
- * 视频
- */
- VIDEO("video"),
- /**
- * 音频
- */
- AUDIO("audio"),
- /**
- * 当前用户
- */
- CURRENT_USER("currentUser"),
- /**
- * 当前部门
- */
- CURRENT_DEPARTMENT("currentDepartment"),
- /**
- * 当前角色
- */
- CURRENT_ROLE("currentRole"),
- /**
- * 当前组
- */
- CURRENT_GROUP("currentGroup"),
- /**
- * 当前职位
- */
- CURRENT_POSITION("currentPosition");
+ TEXT("text", "文本"),
+ DATETIME("datetime", "时间戳"),
+ DATE("date", "日期"),
+ NUMBER("number", "整形"),
+ DOUBLE("double", "双精度"),
+ TEXTAREA("textarea", "文本域"),
+ RICH_TEXT("richText", "富文本"),
+ ID_SELECT("idSelect", "ID 选择"),
+ SELECT("select", "下拉选择"),
+ CHECKBOX("checkbox", "复选"),
+ RADIO("radio", "单选"),
+ SELECT_USER("selectUser", "选择人员"),
+ SELECT_DEPARTMENT("selectDepartment", "选择部门"),
+ FILE("file", "文件"),
+ IMAGE("image", "图片"),
+ VIDEO("video", "视频"),
+ AUDIO("audio", "音频"),
+ CURRENT_USER("currentUser", "当前用户"),
+ CURRENT_DEPARTMENT("currentDepartment", "当前部门"),
+ CURRENT_ROLE("currentRole", "当前角色"),
+ CURRENT_GROUP("currentGroup", "当前组"),
+ CURRENT_POSITION("currentPosition", "当前职位");
private String value;
+ private String summary;
- FormFieldTypeEnum(String value) {
+ FormFieldTypeEnum(String value, String summary) {
this.value = value;
+ this.summary = summary;
}
public String getValue() {
return value == null ? "" : value.trim();
}
+ public String getSummary() {
+ return summary == null ? "" : summary.trim();
+ }
}
diff --git a/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java b/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java
index eade985..36bbe2d 100644
--- a/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java
+++ b/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java
@@ -26,7 +26,7 @@ public class ChoiceBoxTableCellFactory implements Callback normalSelect = FXCollections.observableArrayList(
"", FormFieldTypeEnum.TEXT.getValue(), FormFieldTypeEnum.NUMBER.getValue(),
- FormFieldTypeEnum.DOUBLE.getValue(), FormFieldTypeEnum.TEXTAREA.getValue(),
+ FormFieldTypeEnum.DOUBLE.getValue(), FormFieldTypeEnum.TEXTAREA.getValue(), FormFieldTypeEnum.RICH_TEXT.getValue(),
FormFieldTypeEnum.SELECT_USER.getValue(), FormFieldTypeEnum.SELECT_DEPARTMENT.getValue(),
FormFieldTypeEnum.FILE.getValue(), FormFieldTypeEnum.IMAGE.getValue(),
FormFieldTypeEnum.AUDIO.getValue(), FormFieldTypeEnum.VIDEO.getValue(),
diff --git a/src/main/java/ink/wgink/code/factory/service/FieldService.java b/src/main/java/ink/wgink/code/factory/service/FieldService.java
index 2d7baa6..6ed8c48 100644
--- a/src/main/java/ink/wgink/code/factory/service/FieldService.java
+++ b/src/main/java/ink/wgink/code/factory/service/FieldService.java
@@ -70,7 +70,7 @@ public class FieldService {
} else if (StringUtils.equalsIgnoreCase(ColumnDataTypeEnum.TEXT.getValue(), columnDataType)) {
return FormFieldTypeEnum.TEXTAREA.getValue();
} else if (StringUtils.equalsIgnoreCase(ColumnDataTypeEnum.LONGTEXT.getValue(), columnDataType)) {
- return FormFieldTypeEnum.RICH_TEXT.getValue();
+ return FormFieldTypeEnum.RICH_TEXT.getValue();
} else if (StringUtils.equalsIgnoreCase(ColumnDataTypeEnum.CHAR.getValue(), columnDataType)) {
return FormFieldTypeEnum.ID_SELECT.getValue();
}
@@ -121,7 +121,7 @@ public class FieldService {
fieldVO.setColumnName(columnName);
fieldVO.setColumnType(field.get("COLUMN_TYPE").toString());
fieldVO.setDataType(field.get("DATA_TYPE").toString());
- fieldVO.setCharacterMaximum(field.get("CHARACTER_MAXIMUM_LENGTH") == null ? 0 : Integer.valueOf(field.get("CHARACTER_MAXIMUM_LENGTH").toString()));
+ fieldVO.setCharacterMaximum(field.get("CHARACTER_MAXIMUM_LENGTH") == null ? 0 : Long.valueOf(field.get("CHARACTER_MAXIMUM_LENGTH").toString()));
fieldVO.setNumericPrecision(field.get("NUMERIC_PRECISION") == null ? 0 : Integer.valueOf(field.get("NUMERIC_PRECISION").toString()));
fieldVO.setNumericScale(field.get("NUMERIC_SCALE") == null ? 0 : Integer.valueOf(field.get("NUMERIC_SCALE").toString()));
fieldVO.setColumnComment(field.get("COLUMN_COMMENT") == null ? "" : field.get("COLUMN_COMMENT").toString());
diff --git a/src/main/java/ink/wgink/code/factory/vos/FieldVO.java b/src/main/java/ink/wgink/code/factory/vos/FieldVO.java
index 0713354..96557cf 100644
--- a/src/main/java/ink/wgink/code/factory/vos/FieldVO.java
+++ b/src/main/java/ink/wgink/code/factory/vos/FieldVO.java
@@ -1,6 +1,7 @@
package ink.wgink.code.factory.vos;
import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleLongProperty;
import javafx.beans.property.SimpleStringProperty;
/**
@@ -21,12 +22,12 @@ public class FieldVO {
private SimpleStringProperty columnDefault;
private String dataType;
private SimpleStringProperty columnType;
- private Integer characterMaximum;
+ private Long characterMaximum;
private Integer numericPrecision;
private Integer numericScale;
private SimpleStringProperty propertyName;
private SimpleStringProperty propertyType;
- private SimpleIntegerProperty propertyLength;
+ private SimpleLongProperty propertyLength;
private String formFieldType;
private String formFieldValue;
private Boolean isFormShow;
@@ -43,7 +44,7 @@ public class FieldVO {
this.columnType = new SimpleStringProperty();
this.propertyName = new SimpleStringProperty();
this.propertyType = new SimpleStringProperty();
- this.propertyLength = new SimpleIntegerProperty(0);
+ this.propertyLength = new SimpleLongProperty(0);
}
public int getRowNumber() {
@@ -114,11 +115,11 @@ public class FieldVO {
this.columnType.set(columnType);
}
- public Integer getCharacterMaximum() {
+ public Long getCharacterMaximum() {
return characterMaximum;
}
- public void setCharacterMaximum(Integer characterMaximum) {
+ public void setCharacterMaximum(Long characterMaximum) {
this.characterMaximum = characterMaximum;
}
@@ -162,15 +163,15 @@ public class FieldVO {
this.propertyType.set(propertyType);
}
- public int getPropertyLength() {
+ public long getPropertyLength() {
return propertyLength.get();
}
- public SimpleIntegerProperty propertyLengthProperty() {
+ public SimpleLongProperty propertyLengthProperty() {
return propertyLength;
}
- public void setPropertyLength(int propertyLength) {
+ public void setPropertyLength(long propertyLength) {
this.propertyLength.set(propertyLength);
}
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..2d94363
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,8 @@
+log4j.logger.info=debug
+log4j.appender.info=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.info.layout=org.apache.log4j.PatternLayout
+log4j.appender.info.layout.ConversionPattern=%d{yyyy-MM-dd-HH-mm} [%t] [%c] [%p] - %m%n
+log4j.appender.info.datePattern='.'yyyy-MM-dd
+log4j.appender.info.Threshold = info
+log4j.appender.info.append=true
+# log4j.appender.info.File=/mylog/info.log
\ No newline at end of file