diff --git a/easypoi-base/build.gradle b/easypoi-base/build.gradle
index 6c49d1a..d0bcc87 100644
--- a/easypoi-base/build.gradle
+++ b/easypoi-base/build.gradle
@@ -14,6 +14,6 @@ exclude(module: 'xercesImpl')
compile group: 'com.google.guava', name: 'guava', version:'16.0.1'
compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.2.1'
compile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.1'
- compile group: 'org.hibernate', name: 'hibernate-validator', version:'5.1.3.Final'
+ compile group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final'
compile project(':easypoi-annotation')
}
diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml
index 1b7d006..4c176cb 100644
--- a/easypoi-base/pom.xml
+++ b/easypoi-base/pom.xml
@@ -71,8 +71,8 @@
- org.hibernate
- hibernate-validator
+ javax.validation
+ validation-api
diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java
index e89cfff..13d6802 100644
--- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java
+++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java
@@ -10,6 +10,8 @@ package org.jeecgframework.poi.excel.graph.constant;
* 定义元素类型
*/
public interface ExcelGraphElementType {
+
public static final Integer STRING_TYPE = 1;
+
public static final Integer NUMERIC_TYPE = 2;
}
diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java
index b8f4e29..33a68f1 100644
--- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java
+++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java
@@ -10,7 +10,9 @@ package org.jeecgframework.poi.excel.graph.constant;
* 定义图形类型
*/
public interface ExcelGraphType {
+
public static final Integer LINE_CHART = 1;
+
public static final Integer SCATTER_CHART = 2;
}
diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java
index f2c53c5..f005197 100644
--- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java
+++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java
@@ -16,11 +16,16 @@ import com.google.common.collect.Lists;
*
*/
public class ExcelGraphDefined implements ExcelGraph {
+
private ExcelGraphElement category;
- public List valueList = Lists.newArrayList();
- public List titleCell = Lists.newArrayList();
+
+ private List valueList = Lists.newArrayList();
+
+ private List titleCell = Lists.newArrayList();
+
private Integer graphType = ExcelGraphType.LINE_CHART;
- public List title = Lists.newArrayList();
+
+ private List title = Lists.newArrayList();
public ExcelGraphElement getCategory() {
return category;
diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java
index 737b081..6cbd286 100644
--- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java
+++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java
@@ -12,10 +12,15 @@ import org.jeecgframework.poi.excel.graph.constant.ExcelGraphElementType;
*
*/
public class ExcelGraphElement {
+
private Integer startRowNum;
+
private Integer endRowNum;
+
private Integer startColNum;
+
private Integer endColNum;
+
private Integer elementType = ExcelGraphElementType.STRING_TYPE;
public Integer getStartRowNum() {
diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java
index 4d2af00..ec78f3b 100644
--- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java
+++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java
@@ -10,7 +10,9 @@ package org.jeecgframework.poi.excel.graph.entity;
*
*/
public class ExcelTitleCell {
+
private Integer row;
+
private Integer col;
public ExcelTitleCell() {
diff --git a/pom.xml b/pom.xml
index 8fd07fb..6a73ed4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
provided
true
-
+
com.itextpdf
@@ -153,10 +153,9 @@
- org.hibernate
- hibernate-validator
- 5.1.3.Final
- true
+ javax.validation
+ validation-api
+ 1.1.0.Final