Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
8597907f
Commit
8597907f
authored
Jun 13, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(大编辑):bug修复
1.比较
parent
e97c1d15
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
DiffUtils.java
...yeejoin/amos/boot/module/jg/biz/edit/utils/DiffUtils.java
+5
-1
JsonDiffUtil.java
...join/amos/boot/module/jg/biz/edit/utils/JsonDiffUtil.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/utils/DiffUtils.java
View file @
8597907f
...
...
@@ -8,6 +8,8 @@ import java.util.Objects;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.function.BiPredicate
;
import
static
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
edit
.
utils
.
JsonDiffUtil
.
isNullOrEmpty
;
public
class
DiffUtils
{
private
static
final
Map
<
String
,
BiPredicate
<
String
,
String
>>
diffCache
=
new
ConcurrentHashMap
<>();
...
...
@@ -25,7 +27,9 @@ public class DiffUtils {
}
public
static
boolean
compare
(
String
type
,
String
newValue
,
String
oldValue
)
{
if
(
type
==
null
||
newValue
==
null
||
oldValue
==
null
)
{
if
(
isNullOrEmpty
(
newValue
)
&&
isNullOrEmpty
(
oldValue
))
return
true
;
if
(
isNullOrEmpty
(
newValue
)
||
isNullOrEmpty
(
oldValue
))
return
true
;
if
(
type
==
null
)
{
return
Objects
.
equals
(
newValue
,
oldValue
);
}
return
diffCache
.
getOrDefault
(
type
,
Objects:
:
equals
).
test
(
newValue
,
oldValue
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/utils/JsonDiffUtil.java
View file @
8597907f
...
...
@@ -114,7 +114,7 @@ public class JsonDiffUtil {
}
}
p
rivate
static
boolean
isNullOrEmpty
(
String
str
)
{
p
ublic
static
boolean
isNullOrEmpty
(
String
str
)
{
return
str
==
null
||
str
.
trim
().
isEmpty
()
||
"null"
.
equals
(
str
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment