Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
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
haoban3.0
haoban-manage3.0
Commits
2dfe89d4
Commit
2dfe89d4
authored
Jul 11, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log
parent
d251009f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
10 deletions
+7
-10
HmLinkController.java
...gic/haoban/manage/web/controller/hm/HmLinkController.java
+7
-10
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
View file @
2dfe89d4
...
@@ -200,19 +200,18 @@ public class HmLinkController {
...
@@ -200,19 +200,18 @@ public class HmLinkController {
// 层级一-
// 层级一-
HmLinkStoreSettingDTO
oldFwStore
=
oldStoreRuleObj
.
getObject
(
"fw_store"
,
HmLinkStoreSettingDTO
.
class
);
HmLinkStoreSettingDTO
oldFwStore
=
oldStoreRuleObj
.
getObject
(
"fw_store"
,
HmLinkStoreSettingDTO
.
class
);
HmLinkStoreSettingDTO
newFwStore
=
newStoreRuleObj
.
getObject
(
"fw_store"
,
HmLinkStoreSettingDTO
.
class
);
HmLinkStoreSettingDTO
newFwStore
=
newStoreRuleObj
.
getObject
(
"fw_store"
,
HmLinkStoreSettingDTO
.
class
);
ruleLog
(
oldFwStore
,
newFwStore
,
sb
,
1
);
sb
.
append
(
ruleLog
(
oldFwStore
,
newFwStore
,
1
)
);
// 层级二
// 层级二
HmLinkStoreSettingDTO
oldXgStore
=
oldStoreRuleObj
.
getObject
(
"xg_store"
,
HmLinkStoreSettingDTO
.
class
);
HmLinkStoreSettingDTO
oldXgStore
=
oldStoreRuleObj
.
getObject
(
"xg_store"
,
HmLinkStoreSettingDTO
.
class
);
HmLinkStoreSettingDTO
newXgStore
=
newStoreRuleObj
.
getObject
(
"xg_store"
,
HmLinkStoreSettingDTO
.
class
);
HmLinkStoreSettingDTO
newXgStore
=
newStoreRuleObj
.
getObject
(
"xg_store"
,
HmLinkStoreSettingDTO
.
class
);
ruleLog
(
oldXgStore
,
newXgStore
,
sb
,
2
);
sb
.
append
(
ruleLog
(
oldXgStore
,
newXgStore
,
2
)
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
if
(
type
==
4
)
{
if
(
type
==
4
)
{
JSONObject
oldStoreRuleObj
=
JSONObject
.
parseObject
(
oldValue
);
JSONObject
oldStoreRuleObj
=
JSONObject
.
parseObject
(
oldValue
);
JSONObject
newStoreRuleObj
=
JSONObject
.
parseObject
(
newValue
);
JSONObject
newStoreRuleObj
=
JSONObject
.
parseObject
(
newValue
);
logger
.
info
(
"{},{}"
,
oldStoreRuleObj
,
newStoreRuleObj
);
logger
.
info
(
"{},{}"
,
oldStoreRuleObj
,
newStoreRuleObj
);
otherStoreRuleLog
(
oldStoreRuleObj
,
newStoreRuleObj
);
return
otherStoreRuleLog
(
oldStoreRuleObj
,
newStoreRuleObj
);
return
sb
.
toString
();
}
}
return
null
;
return
null
;
}
}
...
@@ -317,8 +316,7 @@ public class HmLinkController {
...
@@ -317,8 +316,7 @@ public class HmLinkController {
}
}
private
static
String
ruleLog
(
HmLinkStoreSettingDTO
oldStore
,
HmLinkStoreSettingDTO
newStore
,
StringBuilder
sb
,
private
static
String
ruleLog
(
HmLinkStoreSettingDTO
oldStore
,
HmLinkStoreSettingDTO
newStore
,
int
level
)
{
int
level
)
{
StringBuilder
tempSb
=
new
StringBuilder
();
StringBuilder
tempSb
=
new
StringBuilder
();
int
oldOpenFlag
=
oldStore
.
getOpen
();
int
oldOpenFlag
=
oldStore
.
getOpen
();
int
newOpenFlag
=
newStore
.
getOpen
();
int
newOpenFlag
=
newStore
.
getOpen
();
...
@@ -364,14 +362,13 @@ public class HmLinkController {
...
@@ -364,14 +362,13 @@ public class HmLinkController {
if
(
newOpenFlag
==
1
)
{
if
(
newOpenFlag
==
1
)
{
if
(!
oldTitle
.
equals
(
newTitle
))
{
if
(!
oldTitle
.
equals
(
newTitle
))
{
if
(
oldOpenFlag
==
0
)
{
if
(
oldOpenFlag
==
0
)
{
s
b
.
append
(
"开启"
).
append
(
"「"
).
append
(
title
).
append
(
"-"
).
append
(
newTitle
).
append
(
"」"
);
tempS
b
.
append
(
"开启"
).
append
(
"「"
).
append
(
title
).
append
(
"-"
).
append
(
newTitle
).
append
(
"」"
);
}
else
{
}
else
{
sb
.
append
(
"分配规则"
).
append
(
"「"
).
append
(
title
).
append
(
"-"
).
append
(
oldTitle
).
append
(
"」"
).
append
(
"变更为
"
)
tempSb
.
append
(
"分配规则"
).
append
(
"「"
).
append
(
title
).
append
(
"-"
).
append
(
oldTitle
).
append
(
"」
"
)
.
append
(
"「"
).
append
(
title
).
append
(
"-"
).
append
(
newTitle
).
append
(
"」"
);
.
append
(
"
变更为"
).
append
(
"
「"
).
append
(
title
).
append
(
"-"
).
append
(
newTitle
).
append
(
"」"
);
}
}
}
}
}
}
sb
.
append
(
tempSb
);
return
tempSb
.
toString
();
return
tempSb
.
toString
();
}
}
...
...
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