diff --git a/README.md b/README.md index 17d5ed1..88ea5c6 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ basedemo.md [测试项目](http://git.oschina.net/jueyue/easypoi-test): http://git.oschina.net/jueyue/easypoi-test +!!! 3.0.1 版本开始全新包名和GROUPID cn.afterturn + --------------------------- EasyPoi的主要特点 -------------------------- @@ -69,17 +71,17 @@ https://oss.sonatype.org/content/repositories/snapshots/ org.jeecg easypoi-base - 2.3.1 + 2.4.0 org.jeecg easypoi-web - 2.3.1 + 2.4.0 org.jeecg easypoi-annotation - 2.3.1 + 2.4.0 ``` diff --git a/easypoi-annotation/pom.xml b/easypoi-annotation/pom.xml index ccd9235..f491ce7 100644 --- a/easypoi-annotation/pom.xml +++ b/easypoi-annotation/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jeecg + cn.afterturn easypoi - 2.4.0 + 3.0.1-SNAPSHOT easypoi-annotation 基础注解类,解耦合 diff --git a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java similarity index 95% rename from easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java rename to easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java index 60cd3d5..1b423d1 100644 --- a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java +++ b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/Excel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.annotation; +package cn.afterturn.easypoi.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelCollection.java b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelCollection.java similarity index 94% rename from easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelCollection.java rename to easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelCollection.java index a085e36..d81ffae 100644 --- a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelCollection.java +++ b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelCollection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.annotation; +package cn.afterturn.easypoi.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelEntity.java b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelEntity.java similarity index 93% rename from easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelEntity.java rename to easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelEntity.java index 9d2b1f8..06dfbcf 100644 --- a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelEntity.java +++ b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.annotation; +package cn.afterturn.easypoi.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelIgnore.java b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelIgnore.java similarity index 92% rename from easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelIgnore.java rename to easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelIgnore.java index 8324861..1245898 100644 --- a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelIgnore.java +++ b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelIgnore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.annotation; +package cn.afterturn.easypoi.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelTarget.java b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelTarget.java similarity index 92% rename from easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelTarget.java rename to easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelTarget.java index f948bb5..46dbf2e 100644 --- a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/ExcelTarget.java +++ b/easypoi-annotation/src/main/java/cn/afterturn/easypoi/excel/annotation/ExcelTarget.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.annotation; +package cn.afterturn.easypoi.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easypoi-base/pom.xml b/easypoi-base/pom.xml index d9b29f4..148a1fe 100644 --- a/easypoi-base/pom.xml +++ b/easypoi-base/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jeecg + cn.afterturn easypoi - 2.4.0 + 3.0.1-SNAPSHOT easypoi-base @@ -83,7 +83,7 @@ - org.jeecg + cn.afterturn easypoi-annotation diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/ExcelCache.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/ExcelCache.java index 05076f7..a536cf2 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/ExcelCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.cache; +package cn.aftertrun.easypoi.cache; import java.io.InputStream; import java.util.Arrays; @@ -22,10 +22,11 @@ import java.util.List; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.jeecgframework.poi.cache.manager.POICacheManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.cache.manager.POICacheManager; + /** * Excel类型的缓存 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/HtmlCache.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/HtmlCache.java similarity index 84% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/HtmlCache.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/HtmlCache.java index a4cc1fa..01fcf6c 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/HtmlCache.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/HtmlCache.java @@ -1,14 +1,14 @@ -package org.jeecgframework.poi.cache; +package cn.aftertrun.easypoi.cache; import java.util.concurrent.TimeUnit; -import org.jeecgframework.poi.excel.entity.ExcelToHtmlParams; -import org.jeecgframework.poi.excel.html.ExcelToHtmlServer; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import cn.aftertrun.easypoi.excel.entity.ExcelToHtmlParams; +import cn.aftertrun.easypoi.excel.html.ExcelToHtmlServer; + /** * Excel 转变成为Html 的缓存 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ImageCache.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/ImageCache.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/ImageCache.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/ImageCache.java index ce26584..78cdb66 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ImageCache.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/ImageCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.cache; +package cn.aftertrun.easypoi.cache; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -23,12 +23,13 @@ import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; import org.apache.poi.util.IOUtils; -import org.jeecgframework.poi.cache.manager.POICacheManager; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import cn.aftertrun.easypoi.cache.manager.POICacheManager; + /** * 图片缓存处理 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/WordCache.java similarity index 87% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/WordCache.java index ce57fc9..e0a447b 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/WordCache.java @@ -13,15 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.cache; +package cn.aftertrun.easypoi.cache; import java.io.InputStream; -import org.jeecgframework.poi.cache.manager.POICacheManager; -import org.jeecgframework.poi.word.entity.MyXWPFDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.cache.manager.POICacheManager; +import cn.aftertrun.easypoi.word.entity.MyXWPFDocument; + /** * word 缓存中心 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoadeImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/FileLoadeImpl.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoadeImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/FileLoadeImpl.java index cd40bfe..b438a30 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoadeImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/FileLoadeImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.cache.manager; +package cn.aftertrun.easypoi.cache.manager; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; @@ -21,10 +21,11 @@ import java.io.FileNotFoundException; import java.io.IOException; import org.apache.poi.util.IOUtils; -import org.jeecgframework.poi.util.PoiPublicUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.util.PoiPublicUtil; + /** * 文件加载类,根据路径加载指定文件 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/IFileLoader.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/IFileLoader.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/IFileLoader.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/IFileLoader.java index e8c08ef..fb38716 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/IFileLoader.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/IFileLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.cache.manager; +package cn.aftertrun.easypoi.cache.manager; /** * 缓存读取 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/POICacheManager.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/POICacheManager.java index bd16716..93752e9 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/manager/POICacheManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.cache.manager; +package cn.aftertrun.easypoi.cache.manager; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/package-info.java similarity index 85% rename from easypoi-base/src/main/java/org/jeecgframework/poi/cache/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/package-info.java index b07a167..9867136 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/cache/package-info.java @@ -8,4 +8,4 @@ * 2014年2月10日 * @version 1.0 */ -package org.jeecgframework.poi.cache; \ No newline at end of file +package cn.aftertrun.easypoi.cache; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelExportUtil.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelExportUtil.java index 43d6661..fd96aa8 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelExportUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel; +package cn.aftertrun.easypoi.excel; import java.util.Collection; import java.util.List; @@ -23,13 +23,14 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.TemplateExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.export.ExcelBatchExportServer; -import org.jeecgframework.poi.excel.export.ExcelExportServer; -import org.jeecgframework.poi.excel.export.template.ExcelExportOfTemplateUtil; + +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.entity.TemplateExportParams; +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.export.ExcelBatchExportServer; +import cn.aftertrun.easypoi.excel.export.ExcelExportServer; +import cn.aftertrun.easypoi.excel.export.template.ExcelExportOfTemplateUtil; /** * excel 导出工具类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelImportUtil.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelImportUtil.java index 9987e02..fe5f65f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelImportUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelImportUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel; +package cn.aftertrun.easypoi.excel; import java.io.File; import java.io.FileInputStream; @@ -21,16 +21,17 @@ import java.io.InputStream; import java.util.List; import org.apache.poi.util.IOUtils; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.result.ExcelImportResult; -import org.jeecgframework.poi.excel.imports.ExcelImportServer; -import org.jeecgframework.poi.excel.imports.sax.SaxReadExcel; -import org.jeecgframework.poi.excel.imports.sax.parse.ISaxRowRead; -import org.jeecgframework.poi.exception.excel.ExcelImportException; -import org.jeecgframework.poi.handler.inter.IExcelReadRowHanlder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.entity.ImportParams; +import cn.aftertrun.easypoi.excel.entity.result.ExcelImportResult; +import cn.aftertrun.easypoi.excel.imports.ExcelImportServer; +import cn.aftertrun.easypoi.excel.imports.sax.SaxReadExcel; +import cn.aftertrun.easypoi.excel.imports.sax.parse.ISaxRowRead; +import cn.aftertrun.easypoi.exception.excel.ExcelImportException; +import cn.aftertrun.easypoi.handler.inter.IExcelReadRowHanlder; + /** * Excel 导入工具 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelToHtmlUtil.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelToHtmlUtil.java index d314a39..1372d50 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelToHtmlUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/ExcelToHtmlUtil.java @@ -1,8 +1,9 @@ -package org.jeecgframework.poi.excel; +package cn.aftertrun.easypoi.excel; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.cache.HtmlCache; -import org.jeecgframework.poi.excel.entity.ExcelToHtmlParams; + +import cn.aftertrun.easypoi.cache.HtmlCache; +import cn.aftertrun.easypoi.excel.entity.ExcelToHtmlParams; /** * Excel 变成界面 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlToExcelUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/HtmlToExcelUtil.java similarity index 82% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlToExcelUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/HtmlToExcelUtil.java index 6f96ad7..40afb11 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/HtmlToExcelUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/HtmlToExcelUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel; +package cn.aftertrun.easypoi.excel; import java.io.IOException; import java.io.InputStream; @@ -22,10 +22,11 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.html.HtmlToExcelServer; -import org.jeecgframework.poi.exception.excel.ExcelExportException; -import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum; + +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.html.HtmlToExcelServer; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelExportEnum; /** * 基于Excel和Html的互换 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExcelBaseParams.java similarity index 87% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExcelBaseParams.java index 316785e..d38d961 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExcelBaseParams.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity; +package cn.aftertrun.easypoi.excel.entity; -import org.jeecgframework.poi.handler.inter.IExcelDataHandler; +import cn.aftertrun.easypoi.handler.inter.IExcelDataHandler; /** * 基础参数 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelToHtmlParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExcelToHtmlParams.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelToHtmlParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExcelToHtmlParams.java index e8ba08e..63eaf92 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelToHtmlParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExcelToHtmlParams.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.entity; +package cn.aftertrun.easypoi.excel.entity; import org.apache.poi.ss.usermodel.Workbook; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExportExcelItem.java similarity index 80% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExportExcelItem.java index d2b99b7..ef675e8 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExportExcelItem.java @@ -1,12 +1,12 @@ /** * */ -package org.jeecgframework.poi.excel.entity; +package cn.aftertrun.easypoi.excel.entity; import java.util.List; import java.util.Map; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; /** * @author xfworld diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExportParams.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExportParams.java index 03c654e..7c202d0 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ExportParams.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity; +package cn.aftertrun.easypoi.excel.entity; import org.apache.poi.hssf.util.HSSFColor; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl; + +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.export.styler.ExcelExportStylerDefaultImpl; /** * Excel 导出参数 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ImportParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ImportParams.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ImportParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ImportParams.java index 7b38e42..30ede58 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ImportParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/ImportParams.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity; +package cn.aftertrun.easypoi.excel.entity; -import org.jeecgframework.poi.handler.inter.IExcelVerifyHandler; +import cn.aftertrun.easypoi.handler.inter.IExcelVerifyHandler; /** * 导入参数设置 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/TemplateExportParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/TemplateExportParams.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/TemplateExportParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/TemplateExportParams.java index 4d52207..a8f2ba9 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/TemplateExportParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/TemplateExportParams.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity; +package cn.aftertrun.easypoi.excel.entity; -import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl; +import cn.aftertrun.easypoi.excel.export.styler.ExcelExportStylerDefaultImpl; /** * 模板导出参数设置 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/CellValueType.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/CellValueType.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/CellValueType.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/CellValueType.java index a38b55f..3e54718 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/CellValueType.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/CellValueType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.enmus; +package cn.aftertrun.easypoi.excel.entity.enmus; /** * Cell 值得类型 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/ExcelStyleType.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/ExcelStyleType.java similarity index 78% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/ExcelStyleType.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/ExcelStyleType.java index ce77550..d7f98ec 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/ExcelStyleType.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/ExcelStyleType.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.enmus; +package cn.aftertrun.easypoi.excel.entity.enmus; -import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerBorderImpl; -import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerColorImpl; -import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl; +import cn.aftertrun.easypoi.excel.export.styler.ExcelExportStylerBorderImpl; +import cn.aftertrun.easypoi.excel.export.styler.ExcelExportStylerColorImpl; +import cn.aftertrun.easypoi.excel.export.styler.ExcelExportStylerDefaultImpl; /** * 插件提供的几个默认样式 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/ExcelType.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/ExcelType.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/ExcelType.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/ExcelType.java index 7ebb7d8..f1e9f95 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/enmus/ExcelType.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/enmus/ExcelType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.enmus; +package cn.aftertrun.easypoi.excel.entity.enmus; /** * Excel Type diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelBaseEntity.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelBaseEntity.java index 4eda6fd..a017cfe 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelBaseEntity.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.params; +package cn.aftertrun.easypoi.excel.entity.params; import java.lang.reflect.Method; import java.util.List; -import org.jeecgframework.poi.excel.entity.vo.BaseEntityTypeConstants; +import cn.aftertrun.easypoi.excel.entity.vo.BaseEntityTypeConstants; /** * Excel 导入导出基础对象类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelCollectionParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelCollectionParams.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelCollectionParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelCollectionParams.java index 7cf6caa..3e792e5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelCollectionParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelCollectionParams.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.params; +package cn.aftertrun.easypoi.excel.entity.params; import java.util.Map; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelExportEntity.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelExportEntity.java index 6b90f0b..55128ad 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelExportEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.params; +package cn.aftertrun.easypoi.excel.entity.params; import java.util.List; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelForEachParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelForEachParams.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelForEachParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelForEachParams.java index 52eedf8..76c98f8 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelForEachParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelForEachParams.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.entity.params; +package cn.aftertrun.easypoi.excel.entity.params; import java.io.Serializable; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelImportEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelImportEntity.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelImportEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelImportEntity.java index 312ef41..731148a 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelImportEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/ExcelImportEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.params; +package cn.aftertrun.easypoi.excel.entity.params; import java.util.List; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/MergeEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/MergeEntity.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/MergeEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/MergeEntity.java index 161aa87..e77eaa6 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/MergeEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/params/MergeEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.params; +package cn.aftertrun.easypoi.excel.entity.params; import java.util.List; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/result/ExcelImportResult.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/result/ExcelImportResult.java index 2589cd9..f31deb9 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelImportResult.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/result/ExcelImportResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.result; +package cn.aftertrun.easypoi.excel.entity.result; import java.util.List; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelVerifyHanlderResult.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/result/ExcelVerifyHanlderResult.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelVerifyHanlderResult.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/result/ExcelVerifyHanlderResult.java index b82df41..17b7edf 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/result/ExcelVerifyHanlderResult.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/result/ExcelVerifyHanlderResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.result; +package cn.aftertrun.easypoi.excel.entity.result; /** * Excel导入处理返回结果 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/sax/SaxReadCellEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/sax/SaxReadCellEntity.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/sax/SaxReadCellEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/sax/SaxReadCellEntity.java index db83fd1..63d9cf5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/sax/SaxReadCellEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/sax/SaxReadCellEntity.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.sax; +package cn.aftertrun.easypoi.excel.entity.sax; -import org.jeecgframework.poi.excel.entity.enmus.CellValueType; +import cn.aftertrun.easypoi.excel.entity.enmus.CellValueType; /** * Cell 对象 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/vo/BaseEntityTypeConstants.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/vo/BaseEntityTypeConstants.java similarity index 69% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/vo/BaseEntityTypeConstants.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/vo/BaseEntityTypeConstants.java index bffe8be..26c86fc 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/vo/BaseEntityTypeConstants.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/vo/BaseEntityTypeConstants.java @@ -1,13 +1,13 @@ /** * */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.aftertrun.easypoi.excel.entity.vo; /** * @author xfworld * @since 2015-12-28 * @version 1.0 - * @see org.jeecgframework.poi.excel.entity.vo.BaseEntityTypeConstants + * @see cn.aftertrun.easypoi.excel.entity.vo.BaseEntityTypeConstants * */ public interface BaseEntityTypeConstants { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/vo/PoiBaseConstants.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/vo/PoiBaseConstants.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/vo/PoiBaseConstants.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/vo/PoiBaseConstants.java index f1cf8ac..24ea92d 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/vo/PoiBaseConstants.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/entity/vo/PoiBaseConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.aftertrun.easypoi.excel.entity.vo; /** * 基础常量 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelBatchExportServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/ExcelBatchExportServer.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelBatchExportServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/ExcelBatchExportServer.java index 125d001..f748529 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelBatchExportServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/ExcelBatchExportServer.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.export; +package cn.aftertrun.easypoi.excel.export; import java.lang.reflect.Field; import java.util.ArrayList; @@ -11,14 +11,15 @@ import org.apache.poi.ss.usermodel.Drawing; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.export.styler.IExcelExportStyler; -import org.jeecgframework.poi.exception.excel.ExcelExportException; -import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum; -import org.jeecgframework.poi.util.PoiPublicUtil; + +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.export.styler.IExcelExportStyler; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelExportEnum; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; /** * 提供批次插入服务 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/ExcelExportServer.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/ExcelExportServer.java index 4ff265d..1821fb2 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/ExcelExportServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export; +package cn.aftertrun.easypoi.excel.export; import java.lang.reflect.Field; import java.util.ArrayList; @@ -29,15 +29,16 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellRangeAddress; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.export.base.ExcelExportBase; -import org.jeecgframework.poi.excel.export.styler.IExcelExportStyler; -import org.jeecgframework.poi.exception.excel.ExcelExportException; -import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum; -import org.jeecgframework.poi.util.PoiPublicUtil; + +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.export.base.ExcelExportBase; +import cn.aftertrun.easypoi.excel.export.styler.IExcelExportStyler; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelExportEnum; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; /** * Excel导出服务 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/base/ExcelExportBase.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/base/ExcelExportBase.java index ee6215a..73548fc 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/base/ExcelExportBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.base; +package cn.aftertrun.easypoi.excel.export.base; import java.text.DecimalFormat; import java.util.Collection; @@ -36,14 +36,15 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.jeecgframework.poi.cache.ImageCache; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.vo.BaseEntityTypeConstants; -import org.jeecgframework.poi.excel.entity.vo.PoiBaseConstants; -import org.jeecgframework.poi.excel.export.styler.IExcelExportStyler; -import org.jeecgframework.poi.util.PoiMergeCellUtil; -import org.jeecgframework.poi.util.PoiPublicUtil; + +import cn.aftertrun.easypoi.cache.ImageCache; +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.entity.vo.BaseEntityTypeConstants; +import cn.aftertrun.easypoi.excel.entity.vo.PoiBaseConstants; +import cn.aftertrun.easypoi.excel.export.styler.IExcelExportStyler; +import cn.aftertrun.easypoi.util.PoiMergeCellUtil; +import cn.aftertrun.easypoi.util.PoiPublicUtil; /** * 提供POI基础操作服务 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/base/ExportBase.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/base/ExportBase.java index a900ed2..39fd8a3 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/base/ExportBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.base; +package cn.aftertrun.easypoi.excel.export.base; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -28,18 +28,19 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; -import org.jeecgframework.poi.excel.annotation.ExcelEntity; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.vo.PoiBaseConstants; -import org.jeecgframework.poi.handler.inter.IExcelDataHandler; -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.util.PoiReflectorUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.entity.vo.PoiBaseConstants; +import cn.aftertrun.easypoi.handler.inter.IExcelDataHandler; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.util.PoiReflectorUtil; +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import cn.afterturn.easypoi.excel.annotation.ExcelEntity; + /** * 导出基础处理,不设计POI,只设计对象,保证复用性 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/AbstractExcelExportStyler.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/AbstractExcelExportStyler.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/AbstractExcelExportStyler.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/AbstractExcelExportStyler.java index 4845c44..8fc7f34 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/AbstractExcelExportStyler.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/AbstractExcelExportStyler.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.styler; +package cn.aftertrun.easypoi.excel.export.styler; import org.apache.poi.ss.usermodel.BuiltinFormats; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.params.ExcelForEachParams; + +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.entity.params.ExcelForEachParams; /** * 抽象接口提供两个公共方法 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerBorderImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerBorderImpl.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerBorderImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerBorderImpl.java index d1ffae6..ab9072d 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerBorderImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerBorderImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.styler; +package cn.aftertrun.easypoi.excel.export.styler; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerColorImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerColorImpl.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerColorImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerColorImpl.java index 440abd7..5e26d85 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerColorImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerColorImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.styler; +package cn.aftertrun.easypoi.excel.export.styler; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerDefaultImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerDefaultImpl.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerDefaultImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerDefaultImpl.java index 2ca2ce3..5b31876 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/ExcelExportStylerDefaultImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/ExcelExportStylerDefaultImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.styler; +package cn.aftertrun.easypoi.excel.export.styler; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/IExcelExportStyler.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/IExcelExportStyler.java similarity index 85% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/IExcelExportStyler.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/IExcelExportStyler.java index 447f855..300de97 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/styler/IExcelExportStyler.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/styler/IExcelExportStyler.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.styler; +package cn.aftertrun.easypoi.excel.export.styler; import org.apache.poi.ss.usermodel.CellStyle; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.params.ExcelForEachParams; + +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.entity.params.ExcelForEachParams; /** * Excel导出样式接口 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java index 9fa97f5..7495b6a 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.export.template; +package cn.aftertrun.easypoi.excel.export.template; + +import static cn.aftertrun.easypoi.util.PoiElUtil.*; import java.lang.reflect.Field; import java.util.ArrayList; @@ -35,26 +37,24 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.cache.ExcelCache; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.TemplateExportParams; -import org.jeecgframework.poi.excel.entity.enmus.ExcelType; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.params.ExcelForEachParams; -import org.jeecgframework.poi.excel.export.base.ExcelExportBase; -import org.jeecgframework.poi.excel.export.styler.IExcelExportStyler; -import org.jeecgframework.poi.excel.export.template.TemplateSumHanlder.TemplateSumEntity; -import org.jeecgframework.poi.excel.html.helper.MergedRegionHelper; -import org.jeecgframework.poi.exception.excel.ExcelExportException; -import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum; - -import static org.jeecgframework.poi.util.PoiElUtil.*; - -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.util.PoiSheetUtility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.cache.ExcelCache; +import cn.aftertrun.easypoi.excel.entity.TemplateExportParams; +import cn.aftertrun.easypoi.excel.entity.enmus.ExcelType; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.entity.params.ExcelForEachParams; +import cn.aftertrun.easypoi.excel.export.base.ExcelExportBase; +import cn.aftertrun.easypoi.excel.export.styler.IExcelExportStyler; +import cn.aftertrun.easypoi.excel.export.template.TemplateSumHanlder.TemplateSumEntity; +import cn.aftertrun.easypoi.excel.html.helper.MergedRegionHelper; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelExportEnum; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.util.PoiSheetUtility; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; + /** * Excel 导出根据模板导出 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/TemplateSumHanlder.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/template/TemplateSumHanlder.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/TemplateSumHanlder.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/template/TemplateSumHanlder.java index 467f26a..eedd432 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/TemplateSumHanlder.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/export/template/TemplateSumHanlder.java @@ -1,4 +1,6 @@ -package org.jeecgframework.poi.excel.export.template; +package cn.aftertrun.easypoi.excel.export.template; + +import static cn.aftertrun.easypoi.util.PoiElUtil.*; import java.util.ArrayList; import java.util.HashMap; @@ -9,9 +11,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; -import org.jeecgframework.poi.util.PoiCellUtil; -import static org.jeecgframework.poi.util.PoiElUtil.*; +import cn.aftertrun.easypoi.util.PoiCellUtil; /** * 针对模板统计问题做统一处理 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/builder/ExcelChartBuildService.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/builder/ExcelChartBuildService.java index 7e302fd..1f6f836 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/builder/ExcelChartBuildService.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.excel.graph.builder; +package cn.aftertrun.easypoi.excel.graph.builder; import java.util.List; @@ -22,16 +22,17 @@ import org.apache.poi.ss.usermodel.charts.LineChartData; import org.apache.poi.ss.usermodel.charts.ScatterChartData; import org.apache.poi.ss.usermodel.charts.ValueAxis; import org.apache.poi.ss.util.CellRangeAddress; -import org.jeecgframework.poi.excel.graph.constant.ExcelGraphElementType; -import org.jeecgframework.poi.excel.graph.constant.ExcelGraphType; -import org.jeecgframework.poi.excel.graph.entity.ExcelGraph; -import org.jeecgframework.poi.excel.graph.entity.ExcelGraphElement; -import org.jeecgframework.poi.excel.graph.entity.ExcelTitleCell; -import org.jeecgframework.poi.util.PoiCellUtil; -import org.jeecgframework.poi.util.PoiExcelGraphDataUtil; import com.google.common.collect.Lists; +import cn.aftertrun.easypoi.excel.graph.constant.ExcelGraphElementType; +import cn.aftertrun.easypoi.excel.graph.constant.ExcelGraphType; +import cn.aftertrun.easypoi.excel.graph.entity.ExcelGraph; +import cn.aftertrun.easypoi.excel.graph.entity.ExcelGraphElement; +import cn.aftertrun.easypoi.excel.graph.entity.ExcelTitleCell; +import cn.aftertrun.easypoi.util.PoiCellUtil; +import cn.aftertrun.easypoi.util.PoiExcelGraphDataUtil; + /** * @author xfworld * @since 2015-12-30 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/constant/ExcelGraphElementType.java similarity index 81% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/constant/ExcelGraphElementType.java index db85314..bc83020 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphElementType.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/constant/ExcelGraphElementType.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.excel.graph.constant; +package cn.aftertrun.easypoi.excel.graph.constant; /** * @author xfworld diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/constant/ExcelGraphType.java similarity index 80% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/constant/ExcelGraphType.java index 627797e..fb09e6f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/constant/ExcelGraphType.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/constant/ExcelGraphType.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.excel.graph.constant; +package cn.aftertrun.easypoi.excel.graph.constant; /** * @author xfworld diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraph.java similarity index 88% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraph.java index 169f0e2..769ded9 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraph.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraph.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.excel.graph.entity; +package cn.aftertrun.easypoi.excel.graph.entity; import java.util.List; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraphDefined.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraphDefined.java index 3729c16..84d5c99 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphDefined.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraphDefined.java @@ -1,14 +1,14 @@ /** * */ -package org.jeecgframework.poi.excel.graph.entity; +package cn.aftertrun.easypoi.excel.graph.entity; import java.util.List; -import org.jeecgframework.poi.excel.graph.constant.ExcelGraphType; - import com.google.common.collect.Lists; +import cn.aftertrun.easypoi.excel.graph.constant.ExcelGraphType; + /** * @author xfworld * @since 2015-12-30 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraphElement.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraphElement.java index 2fe5f36..59470b4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelGraphElement.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelGraphElement.java @@ -1,9 +1,9 @@ /** * */ -package org.jeecgframework.poi.excel.graph.entity; +package cn.aftertrun.easypoi.excel.graph.entity; -import org.jeecgframework.poi.excel.graph.constant.ExcelGraphElementType; +import cn.aftertrun.easypoi.excel.graph.constant.ExcelGraphElementType; /** diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelTitleCell.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelTitleCell.java index 8a90431..57c6d0a 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/entity/ExcelTitleCell.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/entity/ExcelTitleCell.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.excel.graph.entity; +package cn.aftertrun.easypoi.excel.graph.entity; /** * @author xfowrld diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/package-info.java similarity index 66% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/package-info.java index 4a10b91..1ae9ef5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/graph/package-info.java @@ -7,4 +7,4 @@ * @version 1.0 * Excel 图形构造服务 */ -package org.jeecgframework.poi.excel.graph; \ No newline at end of file +package cn.aftertrun.easypoi.excel.graph; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/ExcelToHtmlServer.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/ExcelToHtmlServer.java index 0500f96..79ac5b4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/ExcelToHtmlServer.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.html; +package cn.aftertrun.easypoi.excel.html; import java.io.File; import java.io.FileOutputStream; @@ -20,14 +20,15 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.excel.entity.ExcelToHtmlParams; -import org.jeecgframework.poi.excel.html.helper.CellValueHelper; -import org.jeecgframework.poi.excel.html.helper.MergedRegionHelper; -import org.jeecgframework.poi.excel.html.helper.StylerHelper; -import org.jeecgframework.poi.util.PoiPublicUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.entity.ExcelToHtmlParams; +import cn.aftertrun.easypoi.excel.html.helper.CellValueHelper; +import cn.aftertrun.easypoi.excel.html.helper.MergedRegionHelper; +import cn.aftertrun.easypoi.excel.html.helper.StylerHelper; +import cn.aftertrun.easypoi.util.PoiPublicUtil; + /** * Excel转换成Html 服务 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/HtmlToExcelServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/HtmlToExcelServer.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/HtmlToExcelServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/HtmlToExcelServer.java index 0da6ca4..f0c0a17 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/HtmlToExcelServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/HtmlToExcelServer.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.html; +package cn.aftertrun.easypoi.excel.html; import java.util.Map; import java.util.List; @@ -11,6 +11,20 @@ import java.util.HashMap; import java.util.LinkedList; import org.slf4j.LoggerFactory; + +import cn.aftertrun.easypoi.excel.export.styler.ExcelExportStylerDefaultImpl; +import cn.aftertrun.easypoi.excel.html.css.CssParseServer; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.impl.AlignCssConvertImpl; +import cn.aftertrun.easypoi.excel.html.css.impl.BackgroundCssConvertImpl; +import cn.aftertrun.easypoi.excel.html.css.impl.BorderCssConverImpl; +import cn.aftertrun.easypoi.excel.html.css.impl.HeightCssConverImpl; +import cn.aftertrun.easypoi.excel.html.css.impl.TextCssConvertImpl; +import cn.aftertrun.easypoi.excel.html.css.impl.WidthCssConverImpl; +import cn.aftertrun.easypoi.excel.html.entity.ExcelCssConstant; +import cn.aftertrun.easypoi.excel.html.entity.HtmlCssConstant; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; + import org.jsoup.nodes.Element; import org.jsoup.select.Elements; @@ -23,18 +37,6 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.util.CellRangeAddress; -import org.jeecgframework.poi.excel.export.styler.ExcelExportStylerDefaultImpl; -import org.jeecgframework.poi.excel.html.css.CssParseServer; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.impl.AlignCssConvertImpl; -import org.jeecgframework.poi.excel.html.css.impl.BackgroundCssConvertImpl; -import org.jeecgframework.poi.excel.html.css.impl.BorderCssConverImpl; -import org.jeecgframework.poi.excel.html.css.impl.HeightCssConverImpl; -import org.jeecgframework.poi.excel.html.css.impl.TextCssConvertImpl; -import org.jeecgframework.poi.excel.html.css.impl.WidthCssConverImpl; -import org.jeecgframework.poi.excel.html.entity.ExcelCssConstant; -import org.jeecgframework.poi.excel.html.entity.HtmlCssConstant; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; /** * 读取Table数据生成Excel diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/CssParseServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/CssParseServer.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/CssParseServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/CssParseServer.java index 0c069ee..92e2dca 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/CssParseServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/CssParseServer.java @@ -1,6 +1,6 @@ -package org.jeecgframework.poi.excel.html.css; +package cn.aftertrun.easypoi.excel.html.css; -import static org.jeecgframework.poi.excel.html.entity.HtmlCssConstant.*; +import static cn.aftertrun.easypoi.excel.html.entity.HtmlCssConstant.*; import java.util.HashMap; import java.util.HashSet; @@ -11,13 +11,14 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleBorderEntity; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; -import org.jeecgframework.poi.excel.html.entity.style.CssStyleFontEnity; -import org.jeecgframework.poi.util.PoiCssUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleBorderEntity; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; +import cn.aftertrun.easypoi.excel.html.entity.style.CssStyleFontEnity; +import cn.aftertrun.easypoi.util.PoiCssUtils; + /** * 把Css样式解析成对应的Model * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/ICssConvertToExcel.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/ICssConvertToExcel.java similarity index 87% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/ICssConvertToExcel.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/ICssConvertToExcel.java index 03b783e..1415531 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/ICssConvertToExcel.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/ICssConvertToExcel.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.css; +package cn.aftertrun.easypoi.excel.html.css; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; + +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; /** * CSS Cell Style 转换类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/ICssConvertToHtml.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/ICssConvertToHtml.java similarity index 86% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/ICssConvertToHtml.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/ICssConvertToHtml.java index 20c103b..ca1f9dd 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/ICssConvertToHtml.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/ICssConvertToHtml.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.css; +package cn.aftertrun.easypoi.excel.html.css; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; + +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; /** * CSS Cell Style 转换类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/AlignCssConvertImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/AlignCssConvertImpl.java similarity index 81% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/AlignCssConvertImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/AlignCssConvertImpl.java index 35adf5c..4e60346 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/AlignCssConvertImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/AlignCssConvertImpl.java @@ -1,11 +1,12 @@ -package org.jeecgframework.poi.excel.html.css.impl; +package cn.aftertrun.easypoi.excel.html.css.impl; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.ICssConvertToHtml; -import org.jeecgframework.poi.excel.html.entity.HtmlCssConstant; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; + +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToHtml; +import cn.aftertrun.easypoi.excel.html.entity.HtmlCssConstant; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; public class AlignCssConvertImpl implements ICssConvertToExcel, ICssConvertToHtml { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/BackgroundCssConvertImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/BackgroundCssConvertImpl.java similarity index 78% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/BackgroundCssConvertImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/BackgroundCssConvertImpl.java index 81a4564..2e1f224 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/BackgroundCssConvertImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/BackgroundCssConvertImpl.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.html.css.impl; +package cn.aftertrun.easypoi.excel.html.css.impl; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -7,10 +7,11 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCellStyle; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.ICssConvertToHtml; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; -import org.jeecgframework.poi.util.PoiCssUtils; + +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToHtml; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; +import cn.aftertrun.easypoi.util.PoiCssUtils; public class BackgroundCssConvertImpl implements ICssConvertToExcel, ICssConvertToHtml { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/BorderCssConverImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/BorderCssConverImpl.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/BorderCssConverImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/BorderCssConverImpl.java index e10a174..85a3fc1 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/BorderCssConverImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/BorderCssConverImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.css.impl; +package cn.aftertrun.easypoi.excel.html.css.impl; -import static org.jeecgframework.poi.excel.html.entity.HtmlCssConstant.*; +import static cn.aftertrun.easypoi.excel.html.entity.HtmlCssConstant.*; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -27,14 +27,15 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFColor; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.ICssConvertToHtml; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleBorderEntity; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; -import org.jeecgframework.poi.util.PoiCssUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToHtml; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleBorderEntity; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; +import cn.aftertrun.easypoi.util.PoiCssUtils; + /** * 边框转换实现类 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/HeightCssConverImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/HeightCssConverImpl.java similarity index 81% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/HeightCssConverImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/HeightCssConverImpl.java index 417ff90..abe8524 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/HeightCssConverImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/HeightCssConverImpl.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.css.impl; +package cn.aftertrun.easypoi.excel.html.css.impl; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Row; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.ICssConvertToHtml; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; -import org.jeecgframework.poi.util.PoiCssUtils; + +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToHtml; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; +import cn.aftertrun.easypoi.util.PoiCssUtils; /** diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/TextCssConvertImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/TextCssConvertImpl.java similarity index 84% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/TextCssConvertImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/TextCssConvertImpl.java index 7743b1c..9177dc4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/TextCssConvertImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/TextCssConvertImpl.java @@ -1,6 +1,6 @@ -package org.jeecgframework.poi.excel.html.css.impl; +package cn.aftertrun.easypoi.excel.html.css.impl; -import static org.jeecgframework.poi.excel.html.entity.HtmlCssConstant.*; +import static cn.aftertrun.easypoi.excel.html.entity.HtmlCssConstant.*; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -13,10 +13,11 @@ import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFColor; import org.apache.poi.xssf.usermodel.XSSFFont; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.ICssConvertToHtml; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; -import org.jeecgframework.poi.util.PoiCssUtils; + +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToHtml; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; +import cn.aftertrun.easypoi.util.PoiCssUtils; public class TextCssConvertImpl implements ICssConvertToExcel, ICssConvertToHtml { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/WidthCssConverImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/WidthCssConverImpl.java similarity index 82% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/WidthCssConverImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/WidthCssConverImpl.java index da05362..4eb77f1 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/css/impl/WidthCssConverImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/css/impl/WidthCssConverImpl.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.css.impl; +package cn.aftertrun.easypoi.excel.html.css.impl; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Sheet; -import org.jeecgframework.poi.excel.html.css.ICssConvertToExcel; -import org.jeecgframework.poi.excel.html.css.ICssConvertToHtml; -import org.jeecgframework.poi.excel.html.entity.style.CellStyleEntity; -import org.jeecgframework.poi.util.PoiCssUtils; + +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToExcel; +import cn.aftertrun.easypoi.excel.html.css.ICssConvertToHtml; +import cn.aftertrun.easypoi.excel.html.entity.style.CellStyleEntity; +import cn.aftertrun.easypoi.util.PoiCssUtils; /** * 列宽转换实现类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/ExcelCssConstant.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/ExcelCssConstant.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/ExcelCssConstant.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/ExcelCssConstant.java index d68996e..59f09fe 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/ExcelCssConstant.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/ExcelCssConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.entity; +package cn.aftertrun.easypoi.excel.html.entity; /** * Excel 自定义处理的自定义Html标签 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/HtmlCssConstant.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/HtmlCssConstant.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/HtmlCssConstant.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/HtmlCssConstant.java index 5611165..c0e8b62 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/HtmlCssConstant.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/HtmlCssConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.entity; +package cn.aftertrun.easypoi.excel.html.entity; public interface HtmlCssConstant { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CellStyleBorderEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CellStyleBorderEntity.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CellStyleBorderEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CellStyleBorderEntity.java index 82401b0..455aef5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CellStyleBorderEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CellStyleBorderEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.entity.style; +package cn.aftertrun.easypoi.excel.html.entity.style; /** * 边框样式 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CellStyleEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CellStyleEntity.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CellStyleEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CellStyleEntity.java index e0d68b9..fc75a8b 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CellStyleEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CellStyleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.entity.style; +package cn.aftertrun.easypoi.excel.html.entity.style; /** * Cell 具有的样式 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CssStyleFontEnity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CssStyleFontEnity.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CssStyleFontEnity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CssStyleFontEnity.java index 059d05b..78caa53 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/entity/style/CssStyleFontEnity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/entity/style/CssStyleFontEnity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.html.entity.style; +package cn.aftertrun.easypoi.excel.html.entity.style; /** * 字体样式 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/CellValueHelper.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/CellValueHelper.java similarity index 96% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/CellValueHelper.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/CellValueHelper.java index 2cd7adb..b54d632 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/CellValueHelper.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/CellValueHelper.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.html.helper; +package cn.aftertrun.easypoi.excel.html.helper; import java.util.HashMap; import java.util.Map; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/MergedRegionHelper.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/MergedRegionHelper.java index 49c5ae2..8810311 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/MergedRegionHelper.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/MergedRegionHelper.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.html.helper; +package cn.aftertrun.easypoi.excel.html.helper; import java.util.HashMap; import java.util.HashSet; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/StylerHelper.java similarity index 96% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/StylerHelper.java index 1008c2c..ce14e6c 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/StylerHelper.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.excel.html.helper; +package cn.aftertrun.easypoi.excel.html.helper; import static org.apache.poi.ss.usermodel.CellStyle.ALIGN_CENTER; import static org.apache.poi.ss.usermodel.CellStyle.ALIGN_CENTER_SELECTION; @@ -34,7 +34,8 @@ import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.apache.poi.xssf.usermodel.XSSFColor; import org.apache.poi.xssf.usermodel.XSSFFont; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.util.PoiPublicUtil; + +import cn.aftertrun.easypoi.util.PoiPublicUtil; /** * 样式帮助类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/excelStyle.css b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/excelStyle.css similarity index 100% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/helper/excelStyle.css rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/html/helper/excelStyle.css diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/CellValueServer.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/CellValueServer.java index b666580..57b7a0f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/CellValueServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports; +package cn.aftertrun.easypoi.excel.imports; import java.lang.reflect.Method; import java.lang.reflect.Type; @@ -30,15 +30,16 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.DateUtil; -import org.jeecgframework.poi.excel.entity.params.ExcelImportEntity; -import org.jeecgframework.poi.excel.entity.sax.SaxReadCellEntity; -import org.jeecgframework.poi.exception.excel.ExcelImportException; -import org.jeecgframework.poi.exception.excel.enums.ExcelImportEnum; -import org.jeecgframework.poi.handler.inter.IExcelDataHandler; -import org.jeecgframework.poi.util.PoiPublicUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.entity.params.ExcelImportEntity; +import cn.aftertrun.easypoi.excel.entity.sax.SaxReadCellEntity; +import cn.aftertrun.easypoi.exception.excel.ExcelImportException; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelImportEnum; +import cn.aftertrun.easypoi.handler.inter.IExcelDataHandler; +import cn.aftertrun.easypoi.util.PoiPublicUtil; + /** * Cell 取值服务 * 判断类型处理数据 1.判断Excel中的类型 2.根据replace替换值 3.handler处理数据 4.判断返回类型转化数据返回 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/ExcelImportServer.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/ExcelImportServer.java index 5b5c8fe..0c565ea 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/ExcelImportServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports; +package cn.aftertrun.easypoi.excel.imports; import java.io.File; import java.io.FileOutputStream; @@ -46,23 +46,24 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.params.ExcelCollectionParams; -import org.jeecgframework.poi.excel.entity.params.ExcelImportEntity; -import org.jeecgframework.poi.excel.entity.result.ExcelImportResult; -import org.jeecgframework.poi.excel.entity.result.ExcelVerifyHanlderResult; -import org.jeecgframework.poi.excel.imports.base.ImportBaseService; -import org.jeecgframework.poi.exception.excel.ExcelImportException; -import org.jeecgframework.poi.exception.excel.enums.ExcelImportEnum; -import org.jeecgframework.poi.handler.inter.IExcelModel; -import org.jeecgframework.poi.util.PoiCellUtil; -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.util.PoiReflectorUtil; -import org.jeecgframework.poi.util.PoiValidationUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.entity.ImportParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelCollectionParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelImportEntity; +import cn.aftertrun.easypoi.excel.entity.result.ExcelImportResult; +import cn.aftertrun.easypoi.excel.entity.result.ExcelVerifyHanlderResult; +import cn.aftertrun.easypoi.excel.imports.base.ImportBaseService; +import cn.aftertrun.easypoi.exception.excel.ExcelImportException; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelImportEnum; +import cn.aftertrun.easypoi.handler.inter.IExcelModel; +import cn.aftertrun.easypoi.util.PoiCellUtil; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.util.PoiReflectorUtil; +import cn.aftertrun.easypoi.util.PoiValidationUtil; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; + /** * Excel 导入服务 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/base/ImportBaseService.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/base/ImportBaseService.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/base/ImportBaseService.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/base/ImportBaseService.java index 82d4e06..7dda8a7 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/base/ImportBaseService.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/base/ImportBaseService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports.base; +package cn.aftertrun.easypoi.excel.imports.base; import java.io.File; import java.io.FileOutputStream; @@ -32,14 +32,15 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; -import org.jeecgframework.poi.excel.annotation.ExcelEntity; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.params.ExcelCollectionParams; -import org.jeecgframework.poi.excel.entity.params.ExcelImportEntity; -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.util.PoiReflectorUtil; + +import cn.aftertrun.easypoi.excel.entity.ImportParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelCollectionParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelImportEntity; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.util.PoiReflectorUtil; +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import cn.afterturn.easypoi.excel.annotation.ExcelEntity; /** * 导入基础和,普通方法和Sax共用 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/package-info.java similarity index 60% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/package-info.java index 5305395..10d03ec 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/package-info.java @@ -3,4 +3,4 @@ * @author JueYue * 2014年6月23日 下午11:05:59 */ -package org.jeecgframework.poi.excel.imports; \ No newline at end of file +package cn.aftertrun.easypoi.excel.imports; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/SaxReadExcel.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/SaxReadExcel.java similarity index 88% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/SaxReadExcel.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/SaxReadExcel.java index 441d3fb..703845a 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/SaxReadExcel.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/SaxReadExcel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports.sax; +package cn.aftertrun.easypoi.excel.imports.sax; import java.io.InputStream; import java.util.Iterator; @@ -22,11 +22,6 @@ import java.util.List; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xssf.eventusermodel.XSSFReader; import org.apache.poi.xssf.model.SharedStringsTable; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.imports.sax.parse.ISaxRowRead; -import org.jeecgframework.poi.excel.imports.sax.parse.SaxRowRead; -import org.jeecgframework.poi.exception.excel.ExcelImportException; -import org.jeecgframework.poi.handler.inter.IExcelReadRowHanlder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.ContentHandler; @@ -35,6 +30,12 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; +import cn.aftertrun.easypoi.excel.entity.ImportParams; +import cn.aftertrun.easypoi.excel.imports.sax.parse.ISaxRowRead; +import cn.aftertrun.easypoi.excel.imports.sax.parse.SaxRowRead; +import cn.aftertrun.easypoi.exception.excel.ExcelImportException; +import cn.aftertrun.easypoi.handler.inter.IExcelReadRowHanlder; + /** * 基于SAX Excel大数据读取,读取Excel 07版本,不支持图片读取 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/SheetHandler.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/SheetHandler.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/SheetHandler.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/SheetHandler.java index 2b339ac..b0709ae 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/SheetHandler.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/SheetHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports.sax; +package cn.aftertrun.easypoi.excel.imports.sax; import java.math.BigDecimal; import java.util.Date; @@ -22,15 +22,16 @@ import java.util.List; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.xssf.model.SharedStringsTable; import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.jeecgframework.poi.excel.entity.enmus.CellValueType; -import org.jeecgframework.poi.excel.entity.sax.SaxReadCellEntity; -import org.jeecgframework.poi.excel.imports.sax.parse.ISaxRowRead; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; import com.google.common.collect.Lists; +import cn.aftertrun.easypoi.excel.entity.enmus.CellValueType; +import cn.aftertrun.easypoi.excel.entity.sax.SaxReadCellEntity; +import cn.aftertrun.easypoi.excel.imports.sax.parse.ISaxRowRead; + /** * 回调接口 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/ISaxRowRead.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/parse/ISaxRowRead.java similarity index 85% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/ISaxRowRead.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/parse/ISaxRowRead.java index cb01c32..1632dd3 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/ISaxRowRead.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/parse/ISaxRowRead.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports.sax.parse; +package cn.aftertrun.easypoi.excel.imports.sax.parse; import java.util.List; -import org.jeecgframework.poi.excel.entity.sax.SaxReadCellEntity; +import cn.aftertrun.easypoi.excel.entity.sax.SaxReadCellEntity; public interface ISaxRowRead { /** diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/parse/SaxRowRead.java similarity index 88% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/parse/SaxRowRead.java index b30b8f1..aaba8b6 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/imports/sax/parse/SaxRowRead.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.imports.sax.parse; +package cn.aftertrun.easypoi.excel.imports.sax.parse; import java.lang.reflect.Field; import java.util.ArrayList; @@ -23,22 +23,23 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.entity.params.ExcelCollectionParams; -import org.jeecgframework.poi.excel.entity.params.ExcelImportEntity; -import org.jeecgframework.poi.excel.entity.sax.SaxReadCellEntity; -import org.jeecgframework.poi.excel.imports.CellValueServer; -import org.jeecgframework.poi.excel.imports.base.ImportBaseService; -import org.jeecgframework.poi.exception.excel.ExcelImportException; -import org.jeecgframework.poi.handler.inter.IExcelReadRowHanlder; -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.util.PoiReflectorUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; +import cn.aftertrun.easypoi.excel.entity.ImportParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelCollectionParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelImportEntity; +import cn.aftertrun.easypoi.excel.entity.sax.SaxReadCellEntity; +import cn.aftertrun.easypoi.excel.imports.CellValueServer; +import cn.aftertrun.easypoi.excel.imports.base.ImportBaseService; +import cn.aftertrun.easypoi.exception.excel.ExcelImportException; +import cn.aftertrun.easypoi.handler.inter.IExcelReadRowHanlder; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.util.PoiReflectorUtil; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; + /** * 当行读取数据 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/package-info.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/excel/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/package-info.java index 5a8b7f1..953e978 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/excel/package-info.java @@ -18,4 +18,4 @@ * @author JueYue * 2014年6月20日 上午12:08:09 */ -package org.jeecgframework.poi.excel; \ No newline at end of file +package cn.aftertrun.easypoi.excel; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/ExcelExportException.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/ExcelExportException.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/ExcelExportException.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/ExcelExportException.java index 90108cd..cf57fa3 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/ExcelExportException.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/ExcelExportException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.exception.excel; +package cn.aftertrun.easypoi.exception.excel; -import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelExportEnum; /** * 导出异常 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/ExcelImportException.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/ExcelImportException.java similarity index 89% rename from easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/ExcelImportException.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/ExcelImportException.java index 74d268d..ef79483 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/ExcelImportException.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/ExcelImportException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.exception.excel; +package cn.aftertrun.easypoi.exception.excel; -import org.jeecgframework.poi.exception.excel.enums.ExcelImportEnum; +import cn.aftertrun.easypoi.exception.excel.enums.ExcelImportEnum; /** * 导入异常 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/enums/ExcelExportEnum.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/enums/ExcelExportEnum.java index 536f0ec..1afea55 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelExportEnum.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/enums/ExcelExportEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.exception.excel.enums; +package cn.aftertrun.easypoi.exception.excel.enums; /** * 导出异常类型枚举 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/enums/ExcelImportEnum.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/enums/ExcelImportEnum.java index 8273b05..5f1e1fd 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/excel/enums/ExcelImportEnum.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/excel/enums/ExcelImportEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.exception.excel.enums; +package cn.aftertrun.easypoi.exception.excel.enums; /** * 导出异常类型枚举 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/word/WordExportException.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/word/WordExportException.java similarity index 87% rename from easypoi-base/src/main/java/org/jeecgframework/poi/exception/word/WordExportException.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/word/WordExportException.java index fbff787..eef4a0b 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/word/WordExportException.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/word/WordExportException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.exception.word; +package cn.aftertrun.easypoi.exception.word; -import org.jeecgframework.poi.exception.word.enmus.WordExportEnum; +import cn.aftertrun.easypoi.exception.word.enmus.WordExportEnum; /** * word导出异常 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/word/enmus/WordExportEnum.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/word/enmus/WordExportEnum.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/exception/word/enmus/WordExportEnum.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/word/enmus/WordExportEnum.java index 142b8b9..d0ac832 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/exception/word/enmus/WordExportEnum.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/exception/word/enmus/WordExportEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.exception.word.enmus; +package cn.aftertrun.easypoi.exception.word.enmus; /** * 导出异常枚举 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/impl/ExcelDataHandlerDefaultImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/impl/ExcelDataHandlerDefaultImpl.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/impl/ExcelDataHandlerDefaultImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/impl/ExcelDataHandlerDefaultImpl.java index aed953f..3fb0527 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/impl/ExcelDataHandlerDefaultImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/impl/ExcelDataHandlerDefaultImpl.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.handler.impl; +package cn.aftertrun.easypoi.handler.impl; import java.util.Map; import org.apache.poi.ss.usermodel.CreationHelper; import org.apache.poi.ss.usermodel.Hyperlink; -import org.jeecgframework.poi.handler.inter.IExcelDataHandler; + +import cn.aftertrun.easypoi.handler.inter.IExcelDataHandler; /** * 数据处理默认实现,返回空 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/impl/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/impl/package-info.java similarity index 72% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/impl/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/impl/package-info.java index 815016d..27540ef 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/impl/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/impl/package-info.java @@ -3,4 +3,4 @@ * @author JueYue * 2014年6月20日 上午12:09:27 */ -package org.jeecgframework.poi.handler.impl; \ No newline at end of file +package cn.aftertrun.easypoi.handler.impl; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelDataHandler.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelDataHandler.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelDataHandler.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelDataHandler.java index 7b24393..a822f00 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelDataHandler.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelDataHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.handler.inter; +package cn.aftertrun.easypoi.handler.inter; import java.util.Map; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelExportServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelExportServer.java similarity index 77% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelExportServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelExportServer.java index e15104b..d47d408 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelExportServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelExportServer.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.handler.inter; +package cn.aftertrun.easypoi.handler.inter; import java.util.List; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelModel.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelModel.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelModel.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelModel.java index e63ae58..792bb81 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelModel.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.handler.inter; +package cn.aftertrun.easypoi.handler.inter; /** * Excel标记类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelReadRowHanlder.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelReadRowHanlder.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelReadRowHanlder.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelReadRowHanlder.java index 585120c..52ac266 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelReadRowHanlder.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelReadRowHanlder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.handler.inter; +package cn.aftertrun.easypoi.handler.inter; /** * 接口自定义处理类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelVerifyHandler.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelVerifyHandler.java similarity index 85% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelVerifyHandler.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelVerifyHandler.java index 8e3a074..7e65896 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/inter/IExcelVerifyHandler.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/inter/IExcelVerifyHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.handler.inter; +package cn.aftertrun.easypoi.handler.inter; -import org.jeecgframework.poi.excel.entity.result.ExcelVerifyHanlderResult; +import cn.aftertrun.easypoi.excel.entity.result.ExcelVerifyHanlderResult; /** * 导入校验接口 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/package-info.java similarity index 72% rename from easypoi-base/src/main/java/org/jeecgframework/poi/handler/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/package-info.java index 70e7e15..f60aaf5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/handler/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/handler/package-info.java @@ -3,4 +3,4 @@ * @author JueYue * 2014年6月20日 上午12:08:09 */ -package org.jeecgframework.poi.handler; \ No newline at end of file +package cn.aftertrun.easypoi.handler; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/PdfExportUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/PdfExportUtil.java similarity index 87% rename from easypoi-base/src/main/java/org/jeecgframework/poi/pdf/PdfExportUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/PdfExportUtil.java index 065126b..7c003ab 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/PdfExportUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/PdfExportUtil.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.pdf; +package cn.aftertrun.easypoi.pdf; import java.io.OutputStream; import java.util.Collection; import java.util.List; import java.util.Map; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.pdf.entity.PdfExportParams; -import org.jeecgframework.poi.pdf.export.PdfExportServer; - import com.itextpdf.text.Document; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.pdf.entity.PdfExportParams; +import cn.aftertrun.easypoi.pdf.export.PdfExportServer; + /** * PDF 导出工具类 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/entity/PdfExportParams.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/entity/PdfExportParams.java similarity index 90% rename from easypoi-base/src/main/java/org/jeecgframework/poi/pdf/entity/PdfExportParams.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/entity/PdfExportParams.java index 75ebd9c..29cc3fb 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/entity/PdfExportParams.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/entity/PdfExportParams.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.pdf.entity; +package cn.aftertrun.easypoi.pdf.entity; -import org.jeecgframework.poi.excel.entity.ExcelBaseParams; -import org.jeecgframework.poi.pdf.styler.IPdfExportStyler; +import cn.aftertrun.easypoi.excel.entity.ExcelBaseParams; +import cn.aftertrun.easypoi.pdf.styler.IPdfExportStyler; /** * PDF 导出参数设置 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/export/PdfExportServer.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/export/PdfExportServer.java index ab57cff..e85a0e4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/export/PdfExportServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.pdf.export; +package cn.aftertrun.easypoi.pdf.export; import java.io.IOException; import java.io.OutputStream; @@ -25,14 +25,6 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.jeecgframework.poi.cache.ImageCache; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.export.base.ExportBase; -import org.jeecgframework.poi.pdf.entity.PdfExportParams; -import org.jeecgframework.poi.pdf.styler.IPdfExportStyler; -import org.jeecgframework.poi.pdf.styler.PdfExportStylerDefaultImpl; -import org.jeecgframework.poi.util.PoiPublicUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +38,15 @@ import com.itextpdf.text.pdf.PdfPCell; import com.itextpdf.text.pdf.PdfPTable; import com.itextpdf.text.pdf.PdfWriter; +import cn.aftertrun.easypoi.cache.ImageCache; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.export.base.ExportBase; +import cn.aftertrun.easypoi.pdf.entity.PdfExportParams; +import cn.aftertrun.easypoi.pdf.styler.IPdfExportStyler; +import cn.aftertrun.easypoi.pdf.styler.PdfExportStylerDefaultImpl; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; + /** * PDF导出服务,基于Excel基础的导出 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/package-info.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/pdf/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/package-info.java index da62e6e..a9c1bc6 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/package-info.java @@ -18,4 +18,4 @@ * @author JueYue * 2015年10月6日 下午8:13:19 */ -package org.jeecgframework.poi.pdf; \ No newline at end of file +package cn.aftertrun.easypoi.pdf; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/styler/IPdfExportStyler.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/styler/IPdfExportStyler.java similarity index 88% rename from easypoi-base/src/main/java/org/jeecgframework/poi/pdf/styler/IPdfExportStyler.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/styler/IPdfExportStyler.java index d2def67..55f4d1f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/styler/IPdfExportStyler.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/styler/IPdfExportStyler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.pdf.styler; - -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; +package cn.aftertrun.easypoi.pdf.styler; import com.itextpdf.text.Document; import com.itextpdf.text.Font; import com.itextpdf.text.pdf.PdfPCell; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; + /** * PDF导出样式设置 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/styler/PdfExportStylerDefaultImpl.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/styler/PdfExportStylerDefaultImpl.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/pdf/styler/PdfExportStylerDefaultImpl.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/styler/PdfExportStylerDefaultImpl.java index 634cfa2..001d453 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/styler/PdfExportStylerDefaultImpl.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/pdf/styler/PdfExportStylerDefaultImpl.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.pdf.styler; +package cn.aftertrun.easypoi.pdf.styler; import java.io.IOException; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,6 +29,8 @@ import com.itextpdf.text.Font.FontFamily; import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.PdfPCell; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; + /** * 默认的PDFstyler 实现 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiCellUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiCellUtil.java similarity index 97% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiCellUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiCellUtil.java index 0e42d24..c6ac646 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiCellUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiCellUtil.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -12,7 +12,7 @@ import org.apache.poi.ss.util.CellRangeAddress; * @author xfworld * @since 2015-12-28 * @version 1.0 - * @see org.jeecgframework.poi.util.PoiCellUtil + * @see cn.aftertrun.easypoi.util.PoiCellUtil * 获取单元格的值 */ public class PoiCellUtil { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiCssUtils.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiCssUtils.java similarity index 99% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiCssUtils.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiCssUtils.java index 53dd6f0..f5d7c19 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiCssUtils.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiCssUtils.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.util.Map; import java.awt.Color; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiElUtil.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiElUtil.java index ca81793..9329614 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiElUtil.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.util.Map; -import org.jeecgframework.poi.exception.excel.ExcelExportException; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; /** * EasyPoi的el 表达式支持工具类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiExcelGraphDataUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiExcelGraphDataUtil.java similarity index 88% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiExcelGraphDataUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiExcelGraphDataUtil.java index 69600a4..1d06d34 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiExcelGraphDataUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiExcelGraphDataUtil.java @@ -1,13 +1,14 @@ /** * */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.util.List; import org.apache.poi.ss.usermodel.Sheet; -import org.jeecgframework.poi.excel.graph.entity.ExcelGraph; -import org.jeecgframework.poi.excel.graph.entity.ExcelGraphElement; + +import cn.aftertrun.easypoi.excel.graph.entity.ExcelGraph; +import cn.aftertrun.easypoi.excel.graph.entity.ExcelGraphElement; /** * @author xfworld diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiFunctionUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiFunctionUtil.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiFunctionUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiFunctionUtil.java index 630a6ae..19cf23e 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiFunctionUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiFunctionUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.lang.reflect.Array; import java.text.DecimalFormat; @@ -21,7 +21,7 @@ import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Map; -import org.jeecgframework.poi.exception.excel.ExcelExportException; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; /** * if else,length,for each,fromatNumber,formatDate diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiMergeCellUtil.java similarity index 95% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiMergeCellUtil.java index 3f09802..dc139fb 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiMergeCellUtil.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.util.ArrayList; import java.util.HashMap; @@ -11,8 +11,9 @@ 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; -import org.jeecgframework.poi.excel.entity.params.MergeEntity; -import org.jeecgframework.poi.exception.excel.ExcelExportException; + +import cn.aftertrun.easypoi.excel.entity.params.MergeEntity; +import cn.aftertrun.easypoi.exception.excel.ExcelExportException; /** * 纵向合并单元格工具类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiPublicUtil.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiPublicUtil.java index 18338a4..02a8164 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiPublicUtil.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; -import static org.jeecgframework.poi.util.PoiElUtil.*; +import static cn.aftertrun.easypoi.util.PoiElUtil.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -48,16 +48,17 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFRun; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; -import org.jeecgframework.poi.excel.annotation.ExcelEntity; -import org.jeecgframework.poi.excel.annotation.ExcelIgnore; -import org.jeecgframework.poi.word.entity.WordImageEntity; -import org.jeecgframework.poi.word.entity.params.ExcelListEntity; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.word.entity.WordImageEntity; +import cn.aftertrun.easypoi.word.entity.params.ExcelListEntity; +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import cn.afterturn.easypoi.excel.annotation.ExcelEntity; +import cn.afterturn.easypoi.excel.annotation.ExcelIgnore; + /** * EASYPOI 的公共基础类 * @author JueYue diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiReflectorUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiReflectorUtil.java similarity index 97% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiReflectorUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiReflectorUtil.java index 92dd081..03c2d6d 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiReflectorUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiReflectorUtil.java @@ -1,4 +1,4 @@ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiSheetUtility.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiSheetUtility.java similarity index 96% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiSheetUtility.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiSheetUtility.java index f3585fa..44d67f9 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiSheetUtility.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiSheetUtility.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiValidationUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiValidationUtil.java similarity index 94% rename from easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiValidationUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiValidationUtil.java index 6bff160..e092315 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiValidationUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/util/PoiValidationUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.util; +package cn.aftertrun.easypoi.util; import java.util.Set; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/WordExportUtil.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/WordExportUtil.java index 427582f..05b09ea 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/WordExportUtil.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/WordExportUtil.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word; +package cn.aftertrun.easypoi.word; import java.util.Map; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.jeecgframework.poi.word.parse.ParseWord07; + +import cn.aftertrun.easypoi.word.parse.ParseWord07; /** * Word使用模板导出工具类 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/MyXWPFDocument.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/MyXWPFDocument.java similarity index 96% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/MyXWPFDocument.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/MyXWPFDocument.java index b4bdafa..cf5d27e 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/MyXWPFDocument.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/MyXWPFDocument.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.entity; +package cn.aftertrun.easypoi.word.entity; import java.io.InputStream; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/WordImageEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/WordImageEntity.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/WordImageEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/WordImageEntity.java index 10868af..d206fc7 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/WordImageEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/WordImageEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.entity; +package cn.aftertrun.easypoi.word.entity; /** * word导出,图片设置和图片信息 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/params/ExcelListEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/params/ExcelListEntity.java similarity index 88% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/params/ExcelListEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/params/ExcelListEntity.java index 3c93a80..e7fe2e3 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/params/ExcelListEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/params/ExcelListEntity.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.entity.params; +package cn.aftertrun.easypoi.word.entity.params; import java.util.List; -import org.jeecgframework.poi.excel.entity.ExcelBaseParams; -import org.jeecgframework.poi.handler.inter.IExcelDataHandler; +import cn.aftertrun.easypoi.excel.entity.ExcelBaseParams; +import cn.aftertrun.easypoi.handler.inter.IExcelDataHandler; /** * Excel 导出对象 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/params/ListParamEntity.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/params/ListParamEntity.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/params/ListParamEntity.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/params/ListParamEntity.java index 1637022..08ffe1f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/entity/params/ListParamEntity.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/entity/params/ListParamEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.entity.params; +package cn.aftertrun.easypoi.word.entity.params; /** * Excel 对象导出结构 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/package-info.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/package-info.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/package-info.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/package-info.java index 6f662b5..2dabba0 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/package-info.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/package-info.java @@ -18,4 +18,4 @@ * @author JueYue * 2014年6月20日 上午12:08:09 */ -package org.jeecgframework.poi.word; \ No newline at end of file +package cn.aftertrun.easypoi.word; \ No newline at end of file diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/ParseWord07.java similarity index 92% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/ParseWord07.java index a6299e1..aede7ea 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/ParseWord07.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.parse; +package cn.aftertrun.easypoi.word.parse; -import static org.jeecgframework.poi.util.PoiElUtil.*; +import static cn.aftertrun.easypoi.util.PoiElUtil.*; import java.util.ArrayList; import java.util.Iterator; @@ -31,16 +31,17 @@ import org.apache.poi.xwpf.usermodel.XWPFRun; import org.apache.poi.xwpf.usermodel.XWPFTable; import org.apache.poi.xwpf.usermodel.XWPFTableCell; import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.jeecgframework.poi.cache.WordCache; -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.word.entity.MyXWPFDocument; -import org.jeecgframework.poi.word.entity.WordImageEntity; -import org.jeecgframework.poi.word.entity.params.ExcelListEntity; -import org.jeecgframework.poi.word.parse.excel.ExcelEntityParse; -import org.jeecgframework.poi.word.parse.excel.ExcelMapParse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.cache.WordCache; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.word.entity.MyXWPFDocument; +import cn.aftertrun.easypoi.word.entity.WordImageEntity; +import cn.aftertrun.easypoi.word.entity.params.ExcelListEntity; +import cn.aftertrun.easypoi.word.parse.excel.ExcelEntityParse; +import cn.aftertrun.easypoi.word.parse.excel.ExcelMapParse; + /** * 解析07版的Word,替换文字,生成表格,生成图片 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/excel/ExcelEntityParse.java similarity index 91% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/excel/ExcelEntityParse.java index a0744d0..3876fc5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/excel/ExcelEntityParse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.parse.excel; +package cn.aftertrun.easypoi.word.parse.excel; import java.lang.reflect.Field; import java.util.ArrayList; @@ -27,16 +27,17 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFTable; import org.apache.poi.xwpf.usermodel.XWPFTableCell; import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.jeecgframework.poi.excel.annotation.ExcelTarget; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.export.base.ExportBase; -import org.jeecgframework.poi.exception.word.WordExportException; -import org.jeecgframework.poi.exception.word.enmus.WordExportEnum; -import org.jeecgframework.poi.util.PoiPublicUtil; -import org.jeecgframework.poi.word.entity.params.ExcelListEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.export.base.ExportBase; +import cn.aftertrun.easypoi.exception.word.WordExportException; +import cn.aftertrun.easypoi.exception.word.enmus.WordExportEnum; +import cn.aftertrun.easypoi.util.PoiPublicUtil; +import cn.aftertrun.easypoi.word.entity.params.ExcelListEntity; +import cn.afterturn.easypoi.excel.annotation.ExcelTarget; + /** * 解析实体类对象 复用注解 * diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelMapParse.java b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/excel/ExcelMapParse.java similarity index 93% rename from easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelMapParse.java rename to easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/excel/ExcelMapParse.java index c97e1de..f5e7cf2 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelMapParse.java +++ b/easypoi-base/src/main/java/cn/aftertrun/easypoi/word/parse/excel/ExcelMapParse.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.word.parse.excel; +package cn.aftertrun.easypoi.word.parse.excel; -import static org.jeecgframework.poi.util.PoiElUtil.*; +import static cn.aftertrun.easypoi.util.PoiElUtil.*; import java.util.List; import java.util.Map; @@ -24,10 +24,11 @@ import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.apache.poi.xwpf.usermodel.XWPFTable; import org.apache.poi.xwpf.usermodel.XWPFTableCell; import org.apache.poi.xwpf.usermodel.XWPFTableRow; -import org.jeecgframework.poi.util.PoiPublicUtil; import com.google.common.collect.Maps; +import cn.aftertrun.easypoi.util.PoiPublicUtil; + /** * 处理和生成Map 类型的数据变成表格 * @author JueYue diff --git a/easypoi-web/pom.xml b/easypoi-web/pom.xml index b5c6d22..fa3f016 100644 --- a/easypoi-web/pom.xml +++ b/easypoi-web/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jeecg + cn.afterturn easypoi - 2.4.0 + 3.0.1-SNAPSHOT easypoi-web @@ -36,7 +36,7 @@ - org.jeecg + cn.afterturn easypoi-base diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/BasePOIConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/BasePOIConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/BasePOIConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/BasePOIConstants.java index 11bc3fa..e135f86 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/BasePOIConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/BasePOIConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; /** * 基础POI常量 diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/BigExcelConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/BigExcelConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/BigExcelConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/BigExcelConstants.java index 646dbd1..aa5ef62 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/BigExcelConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/BigExcelConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; /** * 正常导出Excel diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/MapExcelConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/MapExcelConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/MapExcelConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/MapExcelConstants.java index 73e2d63..060aa96 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/MapExcelConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/MapExcelConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; /** * 正常导出Excel diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/MapExcelGraphConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/MapExcelGraphConstants.java similarity index 85% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/MapExcelGraphConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/MapExcelGraphConstants.java index 7b72d14..a3752c0 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/MapExcelGraphConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/MapExcelGraphConstants.java @@ -1,7 +1,7 @@ /** * */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/NormalExcelConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/NormalExcelConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/NormalExcelConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/NormalExcelConstants.java index 83ce6a5..da82e60 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/NormalExcelConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/NormalExcelConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; /** * 正常导出Excel diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/PDFTemplateConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/PDFTemplateConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/PDFTemplateConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/PDFTemplateConstants.java index 93048ee..39f2b7f 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/PDFTemplateConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/PDFTemplateConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; public interface PDFTemplateConstants extends BasePOIConstants { diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/TemplateExcelConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/TemplateExcelConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/TemplateExcelConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/TemplateExcelConstants.java index ac52e41..38ac0fc 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/TemplateExcelConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/TemplateExcelConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; /** * 模板Excel导出常量 diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/TemplateWordConstants.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/TemplateWordConstants.java similarity index 92% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/TemplateWordConstants.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/TemplateWordConstants.java index efc3bd6..a093c75 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/entity/vo/TemplateWordConstants.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/entity/vo/TemplateWordConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.entity.vo; +package cn.afterturn.easypoi.entity.vo; /** * Word 导出模板常量 diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/BigExcelExportView.java similarity index 89% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/BigExcelExportView.java index ecf4963..ec064b1 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/BigExcelExportView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/BigExcelExportView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.Collections; import java.util.List; @@ -25,12 +25,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.vo.BigExcelConstants; -import org.jeecgframework.poi.handler.inter.IExcelExportServer; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.excel.ExcelExportUtil; +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.handler.inter.IExcelExportServer; +import cn.afterturn.easypoi.entity.vo.BigExcelConstants; + /** * @author JueYue on 14-3-8. Excel 生成解析器,减少用户操作 */ diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgMapExcelView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgMapExcelView.java similarity index 87% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgMapExcelView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgMapExcelView.java index 290951c..a1db803 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgMapExcelView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgMapExcelView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.Collection; import java.util.List; @@ -25,12 +25,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.vo.MapExcelConstants; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.excel.ExcelExportUtil; +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.afterturn.easypoi.entity.vo.MapExcelConstants; + /** * Map 对象接口 * diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgSingleExcelView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgSingleExcelView.java similarity index 90% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgSingleExcelView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgSingleExcelView.java index ae70239..296a1cd 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgSingleExcelView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgSingleExcelView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.Collection; import java.util.List; @@ -25,12 +25,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.export.ExcelExportServer; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.excel.ExcelExportUtil; +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.export.ExcelExportServer; +import cn.afterturn.easypoi.entity.vo.NormalExcelConstants; + /** * @author JueYue on 14-3-8. Excel 生成解析器,减少用户操作 */ diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgTemplateExcelView.java similarity index 87% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgTemplateExcelView.java index cacb13c..c4e6885 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgTemplateExcelView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.List; import java.util.Map; @@ -24,12 +24,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.TemplateExportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.excel.ExcelExportUtil; +import cn.aftertrun.easypoi.excel.entity.TemplateExportParams; +import cn.afterturn.easypoi.entity.vo.NormalExcelConstants; +import cn.afterturn.easypoi.entity.vo.TemplateExcelConstants; + /** * Excel模板视图 * diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateWordView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgTemplateWordView.java similarity index 91% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateWordView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgTemplateWordView.java index b4574a6..31c1d65 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateWordView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/JeecgTemplateWordView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.Map; @@ -22,10 +22,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.jeecgframework.poi.excel.entity.vo.TemplateWordConstants; -import org.jeecgframework.poi.word.WordExportUtil; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.word.WordExportUtil; +import cn.afterturn.easypoi.entity.vo.TemplateWordConstants; + /** * Word模板视图 * diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/MapGraphExcelView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/MapGraphExcelView.java similarity index 83% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/MapGraphExcelView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/MapGraphExcelView.java index 8597caa..896d848 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/MapGraphExcelView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/MapGraphExcelView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.List; import java.util.Map; @@ -24,15 +24,16 @@ import javax.servlet.http.HttpServletResponse; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.jeecgframework.poi.excel.ExcelExportUtil; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.vo.MapExcelGraphConstants; -import org.jeecgframework.poi.excel.graph.builder.ExcelChartBuildService; -import org.jeecgframework.poi.excel.graph.entity.ExcelGraph; -import org.jeecgframework.poi.excel.view.MiniAbstractExcelView; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.excel.ExcelExportUtil; +import cn.aftertrun.easypoi.excel.entity.ExportParams; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.excel.graph.builder.ExcelChartBuildService; +import cn.aftertrun.easypoi.excel.graph.entity.ExcelGraph; +import cn.afterturn.easypoi.entity.vo.MapExcelGraphConstants; +import cn.afterturn.easypoi.view.MiniAbstractExcelView; + /** * Map 对象接口 * diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/MiniAbstractExcelView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/MiniAbstractExcelView.java similarity index 93% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/MiniAbstractExcelView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/MiniAbstractExcelView.java index 155e8be..5b8f48f 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/MiniAbstractExcelView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/MiniAbstractExcelView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; /** * 基础抽象Excel View diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PDFTemplateView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/PDFTemplateView.java similarity index 88% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PDFTemplateView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/PDFTemplateView.java index 16030b6..a5e7afe 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PDFTemplateView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/PDFTemplateView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.io.ByteArrayOutputStream; import java.util.Collection; @@ -24,12 +24,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; -import org.jeecgframework.poi.excel.entity.vo.PDFTemplateConstants; -import org.jeecgframework.poi.pdf.PdfExportUtil; -import org.jeecgframework.poi.pdf.entity.PdfExportParams; import org.springframework.stereotype.Controller; +import cn.aftertrun.easypoi.excel.entity.params.ExcelExportEntity; +import cn.aftertrun.easypoi.pdf.PdfExportUtil; +import cn.aftertrun.easypoi.pdf.entity.PdfExportParams; +import cn.afterturn.easypoi.entity.vo.PDFTemplateConstants; + /** * PDF 导出 View * @author JueYue diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/PoiBaseView.java similarity index 84% rename from easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java rename to easypoi-web/src/main/java/cn/afterturn/easypoi/view/PoiBaseView.java index 0e80554..6f5fdc7 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/PoiBaseView.java +++ b/easypoi-web/src/main/java/cn/afterturn/easypoi/view/PoiBaseView.java @@ -13,22 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jeecgframework.poi.excel.view; +package cn.afterturn.easypoi.view; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jeecgframework.poi.excel.entity.vo.BigExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.MapExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.MapExcelGraphConstants; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.view.AbstractView; +import cn.afterturn.easypoi.entity.vo.BigExcelConstants; +import cn.afterturn.easypoi.entity.vo.MapExcelConstants; +import cn.afterturn.easypoi.entity.vo.MapExcelGraphConstants; +import cn.afterturn.easypoi.entity.vo.NormalExcelConstants; +import cn.afterturn.easypoi.entity.vo.TemplateExcelConstants; + /** * 提供一些通用结构 */ diff --git a/pom.xml b/pom.xml index 134ee57..f5f5f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - org.jeecg + cn.afterturn easypoi - 2.4.0 + 3.0.1-SNAPSHOT pom easypoi @@ -38,7 +38,7 @@ - 2.4.0 + 3.0.1-SNAPSHOT 3.15 2.9.1 16.0.1 @@ -168,12 +168,12 @@ - org.jeecg + cn.afterturn easypoi-base ${sub.version} - org.jeecg + cn.afterturn easypoi-annotation ${sub.version}