@@ -0,0 +1,31 @@ | |||
apply plugin : "java" | |||
apply plugin : 'eclipse' | |||
allprojects { | |||
apply plugin: 'maven' | |||
group = 'org.jeecg' | |||
version = '2.1.7-SNAPSHOT' | |||
} | |||
subprojects { | |||
apply plugin: 'java' | |||
sourceCompatibility = 1.7 | |||
targetCompatibility = 1.7 | |||
[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' | |||
task packageSources(type: Jar) { | |||
classifier = 'sources' | |||
from sourceSets.main.allSource | |||
} | |||
artifacts.archives packageSources | |||
repositories { | |||
mavenLocal() | |||
maven { url 'http://maven.oschina.net/content/groups/public/' } | |||
} | |||
} |
@@ -0,0 +1,2 @@ | |||
apply plugin: "java" | |||
description = '' |
@@ -0,0 +1,18 @@ | |||
apply plugin: "java" | |||
description = '' | |||
dependencies { | |||
compile group: 'org.apache.poi', name: 'poi', version:'3.9' | |||
compile group: 'org.apache.poi', name: 'poi-ooxml', version:'3.9' | |||
compile(group: 'org.apache.poi', name: 'poi-ooxml-schemas', version:'3.9') { | |||
exclude(module: 'xercesImpl') | |||
} | |||
compile group: 'xerces', name: 'xercesImpl', version:'2.9.1' | |||
compile group: 'org.apache.poi', name: 'poi-scratchpad', version:'3.9' | |||
compile group: 'com.itextpdf', name: 'itextpdf', version:'5.5.6' | |||
compile group: 'com.itextpdf', name: 'itext-asian', version:'5.2.0' | |||
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 project(':easypoi-annotation') | |||
} |
@@ -191,5 +191,28 @@ public class ExcelExportEntity extends ExcelBaseEntity implements Comparable<Exc | |||
public int compareTo(ExcelExportEntity prev) { | |||
return this.getOrderNum() - prev.getOrderNum(); | |||
} | |||
@Override | |||
public int hashCode() | |||
{ | |||
final int prime = 31; | |||
int result = 1; | |||
result = prime * result + ((key == null) ? 0 : key.hashCode()); | |||
return result; | |||
} | |||
@Override | |||
public boolean equals(Object obj) | |||
{ | |||
if (this == obj) return true; | |||
if (obj == null) return false; | |||
if (getClass() != obj.getClass()) return false; | |||
ExcelExportEntity other = (ExcelExportEntity) obj; | |||
if (key == null) | |||
{ | |||
if (other.key != null) return false; | |||
} | |||
else if (!key.equals(other.key)) return false; | |||
return true; | |||
} | |||
} |
@@ -93,10 +93,12 @@ public abstract class ExcelExportBase extends ExportBase { | |||
if (entity.getList() != null) { | |||
Collection<?> list = getListCellValue(entity, t); | |||
int listC = 0; | |||
for (Object obj : list) { | |||
createListCells(patriarch, index + listC, cellNum, obj, entity.getList(), sheet, | |||
workbook); | |||
listC++; | |||
if(list!=null&&list.size()>0){ | |||
for (Object obj : list) { | |||
createListCells(patriarch, index + listC, cellNum, obj, entity.getList(), sheet, | |||
workbook); | |||
listC++; | |||
} | |||
} | |||
cellNum += entity.getList().size(); | |||
if (list != null && list.size() > maxHeight) { | |||
@@ -197,8 +199,7 @@ public abstract class ExcelExportBase extends ExportBase { | |||
} | |||
private int createIndexCell(Row row, int index, ExcelExportEntity excelExportEntity) { | |||
if (excelExportEntity.getName().equals("序号") | |||
&& excelExportEntity.getFormat().equals(PoiBaseConstants.IS_ADD_INDEX)) { | |||
if (excelExportEntity.getName().equals("序号")&&excelExportEntity.getFormat()!=null&&excelExportEntity.getFormat().equals(PoiBaseConstants.IS_ADD_INDEX)) { | |||
createStringCell(row, 0, currentIndex + "", | |||
index % 2 == 0 ? getStyles(false, null) : getStyles(true, null), null); | |||
currentIndex = currentIndex + 1; | |||
@@ -0,0 +1,128 @@ | |||
/** | |||
* | |||
*/ | |||
package org.jeecgframework.poi.util; | |||
import org.apache.poi.ss.usermodel.Cell; | |||
import org.apache.poi.ss.usermodel.Row; | |||
import org.apache.poi.ss.usermodel.Sheet; | |||
import org.apache.poi.ss.util.CellRangeAddress; | |||
/** | |||
* @author xfworld | |||
* @since 2015-12-28 | |||
* @version 1.0 | |||
* @see org.jeecgframework.poi.util.PoiCellUtil | |||
* 获取单元格的值 | |||
*/ | |||
public class PoiCellUtil | |||
{ | |||
/** | |||
* 读取单元格的值 | |||
* @param sheet | |||
* @param row | |||
* @param column | |||
* @return | |||
*/ | |||
public static String getCellValue(Sheet sheet ,int row , int column) | |||
{ | |||
String value=null; | |||
if(isMergedRegion(sheet ,row ,column)){ | |||
value=getMergedRegionValue(sheet ,row ,column); | |||
}else{ | |||
Row rowData=sheet.getRow(row); | |||
Cell cell=rowData.getCell(column); | |||
value=getCellValue(cell); | |||
} | |||
return value; | |||
} | |||
/** | |||
* 获取合并单元格的值 | |||
* @param sheet | |||
* @param row | |||
* @param column | |||
* @return | |||
*/ | |||
public static String getMergedRegionValue(Sheet sheet ,int row , int column){ | |||
int sheetMergeCount = sheet.getNumMergedRegions(); | |||
for(int i = 0 ; i < sheetMergeCount ; i++){ | |||
CellRangeAddress ca = sheet.getMergedRegion(i); | |||
int firstColumn = ca.getFirstColumn(); | |||
int lastColumn = ca.getLastColumn(); | |||
int firstRow = ca.getFirstRow(); | |||
int lastRow = ca.getLastRow(); | |||
if(row >= firstRow && row <= lastRow){ | |||
if(column >= firstColumn && column <= lastColumn){ | |||
Row fRow = sheet.getRow(firstRow); | |||
Cell fCell = fRow.getCell(firstColumn); | |||
return getCellValue(fCell) ; | |||
} | |||
} | |||
} | |||
return null ; | |||
} | |||
/** | |||
* 判断指定的单元格是否是合并单元格 | |||
* @param sheet | |||
* @param row | |||
* @param column | |||
* @return | |||
*/ | |||
public static boolean isMergedRegion(Sheet sheet , int row , int column){ | |||
int sheetMergeCount = sheet.getNumMergedRegions(); | |||
for(int i = 0 ; i < sheetMergeCount ; i++ ){ | |||
CellRangeAddress ca = sheet.getMergedRegion(i); | |||
int firstColumn = ca.getFirstColumn(); | |||
int lastColumn = ca.getLastColumn(); | |||
int firstRow = ca.getFirstRow(); | |||
int lastRow = ca.getLastRow(); | |||
if(row >= firstRow && row <= lastRow){ | |||
if(column >= firstColumn && column <= lastColumn){ | |||
return true ; | |||
} | |||
} | |||
} | |||
return false ; | |||
} | |||
/** | |||
* 获取单元格的值 | |||
* @param cell | |||
* @return | |||
*/ | |||
public static String getCellValue(Cell cell){ | |||
if(cell == null) return ""; | |||
if(cell.getCellType() == Cell.CELL_TYPE_STRING){ | |||
return cell.getStringCellValue(); | |||
}else if(cell.getCellType() == Cell.CELL_TYPE_BOOLEAN){ | |||
return String.valueOf(cell.getBooleanCellValue()); | |||
}else if(cell.getCellType() == Cell.CELL_TYPE_FORMULA){ | |||
return cell.getCellFormula() ; | |||
}else if(cell.getCellType() == Cell.CELL_TYPE_NUMERIC){ | |||
return String.valueOf(cell.getNumericCellValue()); | |||
} | |||
return ""; | |||
} | |||
} |
@@ -163,7 +163,7 @@ public final class PoiMergeCellUtil { | |||
if (delys == null || delys.length == 0) { | |||
return mergeEntity.getText().equals(text); | |||
} | |||
// 存在依赖关系 | |||
// 存在依赖关系 测试 | |||
if (mergeEntity.getText().equals(text)) { | |||
for (int i = 0; i < delys.length; i++) { | |||
if (mergeEntity.getRelyList().get(i) ==null || !mergeEntity.getRelyList().get(i).equals(getCellNotNullText(cell, delys[i], rowNum))) { | |||
@@ -0,0 +1,13 @@ | |||
apply plugin: "java" | |||
description = '' | |||
dependencies { | |||
compile group: 'org.springframework', name: 'spring-web', version:'3.1.1.RELEASE' | |||
compile group: 'org.springframework', name: 'spring-webmvc', version:'3.1.1.RELEASE' | |||
compile group: 'org.springframework', name: 'spring-core', version:'3.1.1.RELEASE' | |||
compile project(':easypoi-base') | |||
compile(group: 'javax.servlet', name: 'servlet-api', version:'2.5') { | |||
/* This dependency was originally in the Maven provided scope, but the project was not of type war. | |||
This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. | |||
Please review and delete this closure when resolved. */ | |||
} | |||
} |
@@ -0,0 +1,6 @@ | |||
#Tue Dec 15 22:20:53 CST 2015 | |||
distributionBase=GRADLE_USER_HOME | |||
distributionPath=wrapper/dists | |||
zipStoreBase=GRADLE_USER_HOME | |||
zipStorePath=wrapper/dists | |||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip |
@@ -0,0 +1,160 @@ | |||
#!/usr/bin/env bash | |||
############################################################################## | |||
## | |||
## Gradle start up script for UN*X | |||
## | |||
############################################################################## | |||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | |||
DEFAULT_JVM_OPTS="" | |||
APP_NAME="Gradle" | |||
APP_BASE_NAME=`basename "$0"` | |||
# Use the maximum available, or set MAX_FD != -1 to use that value. | |||
MAX_FD="maximum" | |||
warn ( ) { | |||
echo "$*" | |||
} | |||
die ( ) { | |||
echo | |||
echo "$*" | |||
echo | |||
exit 1 | |||
} | |||
# OS specific support (must be 'true' or 'false'). | |||
cygwin=false | |||
msys=false | |||
darwin=false | |||
case "`uname`" in | |||
CYGWIN* ) | |||
cygwin=true | |||
;; | |||
Darwin* ) | |||
darwin=true | |||
;; | |||
MINGW* ) | |||
msys=true | |||
;; | |||
esac | |||
# Attempt to set APP_HOME | |||
# Resolve links: $0 may be a link | |||
PRG="$0" | |||
# Need this for relative symlinks. | |||
while [ -h "$PRG" ] ; do | |||
ls=`ls -ld "$PRG"` | |||
link=`expr "$ls" : '.*-> \(.*\)$'` | |||
if expr "$link" : '/.*' > /dev/null; then | |||
PRG="$link" | |||
else | |||
PRG=`dirname "$PRG"`"/$link" | |||
fi | |||
done | |||
SAVED="`pwd`" | |||
cd "`dirname \"$PRG\"`/" >&- | |||
APP_HOME="`pwd -P`" | |||
cd "$SAVED" >&- | |||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | |||
# Determine the Java command to use to start the JVM. | |||
if [ -n "$JAVA_HOME" ] ; then | |||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | |||
# IBM's JDK on AIX uses strange locations for the executables | |||
JAVACMD="$JAVA_HOME/jre/sh/java" | |||
else | |||
JAVACMD="$JAVA_HOME/bin/java" | |||
fi | |||
if [ ! -x "$JAVACMD" ] ; then | |||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME | |||
Please set the JAVA_HOME variable in your environment to match the | |||
location of your Java installation." | |||
fi | |||
else | |||
JAVACMD="java" | |||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | |||
Please set the JAVA_HOME variable in your environment to match the | |||
location of your Java installation." | |||
fi | |||
# Increase the maximum file descriptors if we can. | |||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then | |||
MAX_FD_LIMIT=`ulimit -H -n` | |||
if [ $? -eq 0 ] ; then | |||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then | |||
MAX_FD="$MAX_FD_LIMIT" | |||
fi | |||
ulimit -n $MAX_FD | |||
if [ $? -ne 0 ] ; then | |||
warn "Could not set maximum file descriptor limit: $MAX_FD" | |||
fi | |||
else | |||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" | |||
fi | |||
fi | |||
# For Darwin, add options to specify how the application appears in the dock | |||
if $darwin; then | |||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" | |||
fi | |||
# For Cygwin, switch paths to Windows format before running java | |||
if $cygwin ; then | |||
APP_HOME=`cygpath --path --mixed "$APP_HOME"` | |||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` | |||
JAVACMD=`cygpath --unix "$JAVACMD"` | |||
# We build the pattern for arguments to be converted via cygpath | |||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` | |||
SEP="" | |||
for dir in $ROOTDIRSRAW ; do | |||
ROOTDIRS="$ROOTDIRS$SEP$dir" | |||
SEP="|" | |||
done | |||
OURCYGPATTERN="(^($ROOTDIRS))" | |||
# Add a user-defined pattern to the cygpath arguments | |||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then | |||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" | |||
fi | |||
# Now convert the arguments - kludge to limit ourselves to /bin/sh | |||
i=0 | |||
for arg in "$@" ; do | |||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` | |||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option | |||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition | |||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` | |||
else | |||
eval `echo args$i`="\"$arg\"" | |||
fi | |||
i=$((i+1)) | |||
done | |||
case $i in | |||
(0) set -- ;; | |||
(1) set -- "$args0" ;; | |||
(2) set -- "$args0" "$args1" ;; | |||
(3) set -- "$args0" "$args1" "$args2" ;; | |||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; | |||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | |||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | |||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | |||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | |||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | |||
esac | |||
fi | |||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules | |||
function splitJvmOpts() { | |||
JVM_OPTS=("$@") | |||
} | |||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS | |||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" | |||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" |
@@ -0,0 +1,90 @@ | |||
@if "%DEBUG%" == "" @echo off | |||
@rem ########################################################################## | |||
@rem | |||
@rem Gradle startup script for Windows | |||
@rem | |||
@rem ########################################################################## | |||
@rem Set local scope for the variables with windows NT shell | |||
if "%OS%"=="Windows_NT" setlocal | |||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | |||
set DEFAULT_JVM_OPTS= | |||
set DIRNAME=%~dp0 | |||
if "%DIRNAME%" == "" set DIRNAME=. | |||
set APP_BASE_NAME=%~n0 | |||
set APP_HOME=%DIRNAME% | |||
@rem Find java.exe | |||
if defined JAVA_HOME goto findJavaFromJavaHome | |||
set JAVA_EXE=java.exe | |||
%JAVA_EXE% -version >NUL 2>&1 | |||
if "%ERRORLEVEL%" == "0" goto init | |||
echo. | |||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | |||
echo. | |||
echo Please set the JAVA_HOME variable in your environment to match the | |||
echo location of your Java installation. | |||
goto fail | |||
:findJavaFromJavaHome | |||
set JAVA_HOME=%JAVA_HOME:"=% | |||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe | |||
if exist "%JAVA_EXE%" goto init | |||
echo. | |||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% | |||
echo. | |||
echo Please set the JAVA_HOME variable in your environment to match the | |||
echo location of your Java installation. | |||
goto fail | |||
:init | |||
@rem Get command-line arguments, handling Windowz variants | |||
if not "%OS%" == "Windows_NT" goto win9xME_args | |||
if "%@eval[2+2]" == "4" goto 4NT_args | |||
:win9xME_args | |||
@rem Slurp the command line arguments. | |||
set CMD_LINE_ARGS= | |||
set _SKIP=2 | |||
:win9xME_args_slurp | |||
if "x%~1" == "x" goto execute | |||
set CMD_LINE_ARGS=%* | |||
goto execute | |||
:4NT_args | |||
@rem Get arguments from the 4NT Shell from JP Software | |||
set CMD_LINE_ARGS=%$ | |||
:execute | |||
@rem Setup the command line | |||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar | |||
@rem Execute Gradle | |||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% | |||
:end | |||
@rem End local scope for the variables with windows NT shell | |||
if "%ERRORLEVEL%"=="0" goto mainEnd | |||
:fail | |||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of | |||
rem the _cmd.exe /c_ return code! | |||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 | |||
exit /b 1 | |||
:mainEnd | |||
if "%OS%"=="Windows_NT" endlocal | |||
:omega |
@@ -0,0 +1,8 @@ | |||
rootProject.name = 'easypoi' | |||
include ':easypoi-base' | |||
include ':easypoi-web' | |||
include ':easypoi-annotation' | |||
project(':easypoi-base').projectDir = "$rootDir/easypoi-base" as File | |||
project(':easypoi-web').projectDir = "$rootDir/easypoi-web" as File | |||
project(':easypoi-annotation').projectDir = "$rootDir/easypoi-annotation" as File |