From 7570bb5d1b6131b78090cf90d3c219cee30b4a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 13:36:25 +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/OtaBaCxAqcsController.java | 5 +- .../ota/controller/OtaBaCxJbxxController.java | 3 + .../controller/OtaBaCxJsfzbacsController.java | 3 + .../OtaBaCxKsjjsmccsController.java | 3 + .../OtaBaCxKsjxtmccsController.java | 3 + .../controller/OtaBaCxZxsjyqController.java | 3 + .../modules/ota/entity/OtaBaCxJsfzbacs.java | 88 ++--- .../jero/modules/ota/enums/OtaTitleEnum.java | 10 +- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 327 +++++++++++++++++- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 4 +- .../modules/ota/utils/ComparisonUtil.java | 4 +- 11 files changed, 391 insertions(+), 62 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java index db5503637..f61314193 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java @@ -204,7 +204,10 @@ public class OtaBaCxAqcsController extends JeroController reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, basc, sysDictService); + saveOrUpdate(basc); + + List oldList = OtaBaCxSjmkService.queryByOtaId(otaId); + OtaBaCxSjmkService.deleteByOtaId(otaId); + List sjmkList = parseList(upFile, otaId, cut); + reList.addAll(cu.comparisonListRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, OtaTitleEnum.BJMC.getName(), oldList, sjmkList, sysDictService)); + OtaBaCxSjmkService.saveOrUpdateBatch(sjmkList); + otaBaCxTxjlService.saveBatch(reList); } - private JSONObject parseFile(File upFile, String otaId, String cut) { - JSONObject jsonObj = new JSONObject(); - jsonObj.put("otaId",otaId); + private List parseList(File upFile, String otaId, String cut) throws Exception { + Date now = new Date(); + List sjmkList = new ArrayList<>(); + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + int rows = s.getPhysicalNumberOfRows(); + for (int i = 63; i < rows; i++) { + Row row = s.getRow(i); + Cell cell = row.getCell(0); + String str = ImportFileUtil.getCellValue(cell, wb); + OtaBaCxSjmk sjmk = new OtaBaCxSjmk(); + if (StringUtils.isEmpty(str)) { + //列表数据数量，部件名称为空时结束 + break; + } else { + sjmk.setOtaId(otaId); + sjmk.setCreateTime(now); + sjmk.setBjmc(str); + cell = row.getCell(1); + sjmk.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb)); + cell = row.getCell(2); + sjmk.setKzqmc(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(3); + sjmk.setYjggxh(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(4); + sjmk.setYjscqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(5); + sjmk.setRjbb(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(6); + sjmk.setRjkfqy(ImportFileUtil.getCellValue(cell, wb)); + cell = row.getCell(7); + sjmk.setBzwz(ImportFileUtil.getCellValue(cell, wb)); + sjmkList.add(sjmk); + } + } + return sjmkList; + } + + private OtaBaCxJsfzbacs parseFile(File upFile, String otaId, String cut) throws Exception { + Workbook wb = ImportFileUtil.readExcel(upFile); + Sheet s = wb.getSheetAt(0); + OtaBaCxJsfzbacs bass = new OtaBaCxJsfzbacs(); + bass.setOtaId(otaId); + + Row row = s.getRow(2); + Cell cell = row.getCell(2); + bass.setJsfzczjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(2); + cell = row.getCell(4); + bass.setJgldSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(3); + cell = row.getCell(4); + bass.setJgldBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(4); + cell = row.getCell(4); + bass.setJgldGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(5); + cell = row.getCell(4); + bass.setJgldScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(6); + cell = row.getCell(2); + bass.setHmbldPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(6); + cell = row.getCell(4); + bass.setHmbldSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(7); + cell = row.getCell(4); + bass.setHmbldBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(8); + cell = row.getCell(4); + bass.setHmbldGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(9); + cell = row.getCell(4); + bass.setHmbldScqy(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(10); + cell = row.getCell(2); + bass.setCsbldPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(10); + cell = row.getCell(4); + bass.setCsbldSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(11); + cell = row.getCell(4); + bass.setCsbldBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(12); + cell = row.getCell(4); + bass.setCsbldGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(13); + cell = row.getCell(4); + bass.setCsbldScqy(ImportFileUtil.getCellValue(cell, wb)); - return jsonObj; + + row = s.getRow(14); + cell = row.getCell(2); + bass.setSxthsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(14); + cell = row.getCell(4); + bass.setSxthsSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(15); + cell = row.getCell(4); + bass.setSxthsBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(16); + cell = row.getCell(4); + bass.setSxthsGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(17); + cell = row.getCell(4); + bass.setSxthsScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(18); + cell = row.getCell(2); + bass.setSxtdsdPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(18); + cell = row.getCell(4); + bass.setSxtdsdSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(19); + cell = row.getCell(4); + bass.setSxtdsdBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(20); + cell = row.getCell(4); + bass.setSxtdsdGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(21); + cell = row.getCell(4); + bass.setSxtdsdScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(22); + cell = row.getCell(2); + bass.setJsyjkPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(22); + cell = row.getCell(4); + bass.setJsyjkSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(23); + cell = row.getCell(4); + bass.setJsyjkBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(24); + cell = row.getCell(4); + bass.setJsyjkGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(25); + cell = row.getCell(4); + bass.setJsyjkScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(26); + cell = row.getCell(2); + bass.setJsyhwPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(26); + cell = row.getCell(4); + bass.setJsyhwSl(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(27); + cell = row.getCell(4); + bass.setJsyhwBzwz(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(28); + cell = row.getCell(4); + bass.setJsyhwGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(29); + cell = row.getCell(4); + bass.setJsyhwScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(30); + cell = row.getCell(2); + bass.setCzwxdwPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(30); + cell = row.getCell(4); + bass.setCzwxdwGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(31); + cell = row.getCell(4); + bass.setCzwxdwScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(32); + cell = row.getCell(2); + bass.setGxdhPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(32); + cell = row.getCell(4); + bass.setGxdhGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(33); + cell = row.getCell(4); + bass.setGxdhScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(34); + cell = row.getCell(2); + bass.setLsjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(34); + cell = row.getCell(4); + bass.setLsjGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(35); + cell = row.getCell(4); + bass.setLsjScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(36); + cell = row.getCell(2); + bass.setGjddtPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(36); + cell = row.getCell(4); + bass.setGjddtGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(37); + cell = row.getCell(4); + bass.setGjddtScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(38); + cell = row.getCell(2); + bass.setDzwlPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(38); + cell = row.getCell(4); + bass.setDzwlDxxgcs(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(39); + cell = row.getCell(2); + bass.setCztxPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(39); + cell = row.getCell(4); + bass.setCztxXtmc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(40); + cell = row.getCell(4); + bass.setCztxGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(41); + cell = row.getCell(4); + bass.setCztxScqy(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(42); + cell = row.getCell(4); + bass.setCztxBbh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(43); + cell = row.getCell(4); + bass.setCztxKfqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(44); + cell = row.getCell(2); + bass.setJsfzczjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(44); + cell = row.getCell(4); + bass.setJsfzczjMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(45); + cell = row.getCell(4); + bass.setJsfzczjYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(46); + cell = row.getCell(4); + bass.setJsfzczjScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(47); + cell = row.getCell(2); + bass.setJsfzzsqPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(47); + cell = row.getCell(4); + bass.setJsfzzsqMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(48); + cell = row.getCell(4); + bass.setJsfzzsqYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(49); + cell = row.getCell(4); + bass.setJsfzzsqScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(50); + cell = row.getCell(2); + bass.setFxptstsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(50); + cell = row.getCell(4); + bass.setFxptstsMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(51); + cell = row.getCell(4); + bass.setFxptstsYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(52); + cell = row.getCell(4); + bass.setFxptstsScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(53); + cell = row.getCell(2); + bass.setJsyzyltsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(53); + cell = row.getCell(4); + bass.setJsyzyltsMc(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(54); + cell = row.getCell(4); + bass.setJsyzyltsYjxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(55); + cell = row.getCell(4); + bass.setJsyzyltsScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(56); + cell = row.getCell(2); + bass.setDssadPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(56); + cell = row.getCell(4); + bass.setDssadGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(57); + cell = row.getCell(4); + bass.setDssadScqy(ImportFileUtil.getCellValue(cell, wb)); + + row = s.getRow(58); + cell = row.getCell(2); + bass.setEdrPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb))); + row = s.getRow(58); + cell = row.getCell(4); + bass.setEdrGgxh(ImportFileUtil.getCellValue(cell, wb)); + row = s.getRow(59); + cell = row.getCell(4); + bass.setEdrScqy(ImportFileUtil.getCellValue(cell, wb)); + return bass; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 6526cea06..c10a5ea65 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -98,6 +98,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl(); + } ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); @@ -278,7 +281,6 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl { field.setAccessible(true); Object newVal = field.get(newObj); String newStr = ""; - if (ObjectUtils.isNotEmpty(newVal)) { + if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) { newStr = newVal.toString(); content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'"; resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content)); @@ -93,7 +93,7 @@ public class ComparisonUtil { for (T newObj : newList) { if (ObjectUtils.isNotEmpty(newObj)) { Object newId = idField.get(newObj); - if (ObjectUtils.isNotEmpty(newObj) && oldId.equals(newId.toString())) { + if (ObjectUtils.isNotEmpty(newId) && oldId.equals(newId.toString())) { break; } }