From 448b5f73fe4766fdc13a3359f2f9f6f7683d39ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 23:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxLsjlController.java | 1 + .../ota/controller/OtaBaCxTxjlController.java | 1 + .../ota/controller/OtaBaSjListController.java | 1 + .../ota/controller/OtaBaSjLsjlController.java | 1 + .../service/impl/OtaBaCxAqcsServiceImpl.java | 2 +- .../modules/ota/utils/ComparisonUtil.java | 24 +++++++++++-------- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java index 3ea1ea7aa..15c0c3e2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java @@ -53,6 +53,7 @@ public class OtaBaCxLsjlController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxLsjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaCxLsjlService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java index 39a914252..0f395f100 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java @@ -53,6 +53,7 @@ public class OtaBaCxTxjlController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaCxTxjlService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index b46297dca..c35f95389 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -54,6 +54,7 @@ public class OtaBaSjListController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjList, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaSjListService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java index a4f8a0dbc..e8d5cf35b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjLsjlController.java @@ -53,6 +53,7 @@ public class OtaBaSjLsjlController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjLsjl, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = otaBaSjLsjlService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 832a0a33a..d77a727dd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -86,7 +86,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaCxAqcsOld.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); + List reList = cu.comparisonRecord(otaBaCxAqcs.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaCxAqcsOld, otaBaCxAqcs, sysDictService); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java index b2c244750..f50ccfbed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java @@ -70,7 +70,7 @@ public class ComparisonUtil { Object newVal = field.get(newObj); String newStr = ""; if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) { - newStr = newVal.toString(); + newStr = parseDictText(ote, field, newObj, sysDictService); content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } @@ -86,6 +86,7 @@ public class ComparisonUtil { } } for (T oldObj : oldList) { + boolean flag = true; if (ObjectUtils.isNotEmpty(oldObj)) { Field idField = oldObj.getClass().getDeclaredField("id"); idField.setAccessible(true); @@ -94,19 +95,22 @@ public class ComparisonUtil { if (ObjectUtils.isNotEmpty(newObj)) { Object newId = idField.get(newObj); if (ObjectUtils.isNotEmpty(newId) && oldId.equals(newId.toString())) { + flag = false; break; } } } - Field tableTitleField = oldObj.getClass().getDeclaredField(tableTitle); - tableTitleField.setAccessible(true); - Object tableTitleObj = tableTitleField.get(oldObj); - String tableTitleObjStr = "空"; - if (ObjectUtils.isNotEmpty(tableTitleObj)) { - tableTitleObjStr = tableTitleObj.toString(); + if (flag) { + Field tableTitleField = oldObj.getClass().getDeclaredField(tableTitle); + tableTitleField.setAccessible(true); + Object tableTitleObj = tableTitleField.get(oldObj); + String tableTitleObjStr = "空"; + if (ObjectUtils.isNotEmpty(tableTitleObj)) { + tableTitleObjStr = tableTitleObj.toString(); + } + String content = "删除了'" + tableTitleObjStr + "'"; + resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } - String content = "删除了'" + tableTitleObjStr + "'"; - resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); } } } catch (IllegalAccessException | NoSuchFieldException e) { @@ -136,7 +140,7 @@ public class ComparisonUtil { Object newVal = field.get(newClazz); String newTitleStr = "空"; if (ObjectUtils.isNotEmpty(newVal)) { - Field tableField = newVal.getClass().getDeclaredField(tableTitle); + Field tableField = newClazz.getClass().getDeclaredField(tableTitle); tableField.setAccessible(true); Object newTitleVal = tableField.get(newVal); if (ObjectUtils.isNotEmpty(newTitleVal)) {