Skip to content

Commit 886d918

Browse files
committed
refactor: 优化
1 parent b6510fe commit 886d918

3 files changed

Lines changed: 45 additions & 2 deletions

File tree

jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/crud/FastObjectPropertyOperator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.hswebframework.ezorm.core.ObjectPropertyOperator;
2323
import org.hswebframework.web.bean.FastBeanCopier;
2424
import org.hswebframework.web.bean.SingleValueMap;
25+
import org.jetlinks.reactor.ql.utils.CompareUtils;
2526
import org.springframework.stereotype.Component;
2627

2728
import java.util.Map;
@@ -50,9 +51,14 @@ private static SingleValueMap<Object, Object> take() {
5051
return new SingleValueMap<>();
5152
}
5253

54+
@Override
55+
public int compare(Object left, Object right) {
56+
return CompareUtils.compare(left, right);
57+
}
58+
5359
@Override
5460
public Optional<Object> getProperty(Object source, String key) {
55-
if (key.contains(".") || key.contains("[")) {
61+
if (key.contains(".") || key.contains("[") || source instanceof Enum<?>) {
5662
return ApacheCommonPropertyOperator.INSTANCE.getProperty(source, key);
5763
}
5864
if (source instanceof Map) {

jetlinks-components/io-component/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.alibaba</groupId>
3131
<artifactId>easyexcel</artifactId>
32-
<version>3.1.1</version>
32+
<version>3.3.2</version>
3333
<exclusions>
3434
<exclusion>
3535
<groupId>org.apache.poi</groupId>

pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<rsocket.version>1.1.4</rsocket.version>
7070
<micrometer.version>1.14.1</micrometer.version>
7171
<alibaba.cloud.version>2023.0.3.2</alibaba.cloud.version>
72+
<poi.version>5.2.3</poi.version>
7273
</properties>
7374

7475

@@ -307,6 +308,42 @@
307308
<version>${project.version}</version>
308309
</dependency>
309310

311+
<dependency>
312+
<groupId>org.apache.poi</groupId>
313+
<artifactId>poi</artifactId>
314+
<version>${poi.version}</version>
315+
</dependency>
316+
317+
<dependency>
318+
<groupId>org.apache.poi</groupId>
319+
<artifactId>poi-excelant</artifactId>
320+
<version>${poi.version}</version>
321+
</dependency>
322+
323+
<dependency>
324+
<groupId>org.apache.poi</groupId>
325+
<artifactId>poi-ooxml</artifactId>
326+
<version>${poi.version}</version>
327+
</dependency>
328+
329+
<dependency>
330+
<groupId>org.apache.poi</groupId>
331+
<artifactId>poi-ooxml-full</artifactId>
332+
<version>${poi.version}</version>
333+
</dependency>
334+
335+
<dependency>
336+
<groupId>org.apache.poi</groupId>
337+
<artifactId>poi-ooxml-lite</artifactId>
338+
<version>${poi.version}</version>
339+
</dependency>
340+
341+
<dependency>
342+
<groupId>org.apache.poi</groupId>
343+
<artifactId>poi-scratchpad</artifactId>
344+
<version>${poi.version}</version>
345+
</dependency>
346+
310347
<dependency>
311348
<groupId>org.springframework</groupId>
312349
<artifactId>spring-framework-bom</artifactId>

0 commit comments

Comments
 (0)