WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开发OTA备案工具-导入导出

Browse Source
This commit is contained in:
高嵩
2023-03-27 11:40:16 +08:00
parent d57248b15b
commit dc92697f3e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+7 -7
View File
@@ -38,7 +38,7 @@ public class ComparisonUtil<T> {
String newStr = parseDictText(ote, field, newClazz, sysDictService); String newStr = parseDictText(ote, field, newClazz, sysDictService);
String oldStr = parseDictText(ote, field, oldClazz, sysDictService); String oldStr = parseDictText(ote, field, oldClazz, sysDictService);
if (!newStr.equals(oldStr)) { if (!newStr.equals(oldStr)) {
String content = "由" + title + "的" + oldStr + "改为" + newStr; String content = "将" + title + "的'" + oldStr + "'改为'" + newStr + "'";
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
} }
} }
@@ -56,7 +56,7 @@ public class ComparisonUtil<T> {
if (ObjectUtils.isEmpty(id)) { if (ObjectUtils.isEmpty(id)) {
Field tableField = newObj.getClass().getDeclaredField(tableTitle); Field tableField = newObj.getClass().getDeclaredField(tableTitle);
tableField.setAccessible(true); tableField.setAccessible(true);
String content = "新增了一条" + tableField.get(newObj).toString(); String content = "新增了一条'" + tableField.get(newObj).toString() + "'";
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
Field[] fields = newObj.getClass().getDeclaredFields(); Field[] fields = newObj.getClass().getDeclaredFields();
for (Field field : fields) { for (Field field : fields) {
@@ -68,12 +68,12 @@ public class ComparisonUtil<T> {
title = ote.getValue(); title = ote.getValue();
field.setAccessible(true); field.setAccessible(true);
Object newVal = field.get(newObj); Object newVal = field.get(newObj);
String newStr = "空"; String newStr = "";
if (ObjectUtils.isNotEmpty(newVal)) { if (ObjectUtils.isNotEmpty(newVal)) {
newStr = newVal.toString(); newStr = newVal.toString();
content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'";
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
} }
content = "增加" + tableField.get(newObj).toString() + "中" + title + "为" + newStr;
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
} }
} else { } else {
for (T oldObj : oldList) { for (T oldObj : oldList) {
@@ -105,7 +105,7 @@ public class ComparisonUtil<T> {
if (ObjectUtils.isNotEmpty(tableTitleObj)) { if (ObjectUtils.isNotEmpty(tableTitleObj)) {
tableTitleObjStr = tableTitleObj.toString(); tableTitleObjStr = tableTitleObj.toString();
} }
String content = "删除了" + tableTitleObjStr; String content = "删除了'" + tableTitleObjStr + "'";
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
} }
} }
@@ -143,7 +143,7 @@ public class ComparisonUtil<T> {
newTitleStr = newTitleVal.toString(); newTitleStr = newTitleVal.toString();
} }
} }
String content = newTitleStr + "的" + title + "由" + oldStr + "改为" + newStr; String content = newTitleStr + "-" + title + "由'" + oldStr + "'改为'" + newStr + "'";
resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
} }
} catch (IllegalAccessException | NoSuchFieldException e) { } catch (IllegalAccessException | NoSuchFieldException e) {