tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pom

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 2c00819896
commit 84c7e539c9
4 changed files with 90 additions and 60 deletions
Show Stats Download Patch File Download Diff File

5
admin-core/pom.xml
Unescape Escape View File

@ -197,5 +197,10 @@
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</project>

15
admin-core/src/main/java/com/ibeetl/admin/core/util/ExcelUtil.java
Unescape Escape View File

@ -8,7 +8,6 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.assertj.core.util.Lists;
import org.beetl.sql.annotation.entity.AssignID;
import org.springframework.web.multipart.MultipartFile;
@ -187,7 +186,7 @@ public class ExcelUtil {
list.addAll(extendsData);
}
list.forEach(item -> {
List<Object> itemList = Lists.newArrayList();
List<Object> itemList = new ArrayList<>();
for (String head : heads) {
itemList.add(ObjectUtils.defaultIfNull(item.get(head), ""));
}
@ -232,9 +231,9 @@ public class ExcelUtil {
* @return
*/
public static List<List<String>> heads(Collection<String> heads) {
List<List<String>> list = Lists.newArrayList();
List<List<String>> list = new ArrayList<>();
for (String head : heads) {
list.add(Lists.newArrayList(head));
list.add(new ArrayList<>(Collections.singleton(head)));
}
return list;
}
@ -299,7 +298,9 @@ public class ExcelUtil {
.sheet(sheetName);
// 注册转换器
Optional.ofNullable(converters).ifPresent(e -> e.forEach(sheet::registerConverter));
if (isFreezeHead) sheet.registerWriteHandler(new FreezeAndFilter());
if (isFreezeHead) {
sheet.registerWriteHandler(new FreezeAndFilter());
}
sheet.doWrite(data);
}
@ -330,7 +331,9 @@ public class ExcelUtil {
.sheet(sheetName);
// 注册转换器
Optional.ofNullable(converters).ifPresent(e -> e.forEach(sheet::registerConverter));
if (isFreezeHead) sheet.registerWriteHandler(new FreezeAndFilter());
if (isFreezeHead) {
sheet.registerWriteHandler(new FreezeAndFilter());
}
sheet.doWrite(data);
}

123
pom.xml
Unescape Escape View File

@ -23,60 +23,79 @@
<version>2.5.2</version>
</parent>
<!-- Add typical dependencies for a web application -->
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-core</artifactId>
<version>1.3.1</version>
</dependency>
<!-- admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-console</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-test</artifactId>
<version>1.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.56</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.56</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.4.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.4.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>

7
web/pom.xml
Unescape Escape View File

@ -20,13 +20,16 @@
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-core</artifactId>
<version>1.3.1</version>
</dependency>
<!-- admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-console</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>com.ibeetl</groupId>
<artifactId>admin-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>

Write Preview
Loading…
Cancel
Save