Commit 2dfe89d4 by 徐高华

log

parent d251009f
...@@ -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) {
sb.append("开启").append("「").append(title).append("-").append(newTitle).append("」"); tempSb.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();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment