From 917337506930d4c3b8851c8e3de9f98918e60cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 13 Apr 2023 18:36:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../library/docDetail/index.vue | 83 ++++++++++++------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 7d1380177..e9fad8099 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -43,7 +43,7 @@ -
+
@@ -168,14 +168,14 @@
-
-
- {{item.name}} -
-
+ + + + + + + +
\ No newline at end of file From 68ed12cb9b68040855e012830c59c866a6b726c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 13 Apr 2023 19:00:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/ota/entity/OtaBaCxJbxx.java | 2 ++ .../java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java | 2 ++ .../java/com/jero/modules/ota/enums/OtaTitleEnum.java | 4 ++-- .../modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java index 45a78473a..0f480e27c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java @@ -110,11 +110,13 @@ public class OtaBaCxJbxx implements Serializable { /**车辆动力类型1*/ @Excel(name = "车辆动力类型1", width = 15) @ApiModelProperty(value = "车辆动力类型1") + @Dict(dicCode = "vehicle_dynamic_type") private java.lang.String dllx1; /**车辆动力类型2*/ @Excel(name = "车辆动力类型2", width = 15) @ApiModelProperty(value = "车辆动力类型2") + @Dict(dicCode = "vehicle_dynamic_type1") private java.lang.String dllx2; /**通信终端*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java index 44921fc95..f8bc02a51 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java @@ -104,11 +104,13 @@ public class OtaBaSjSjmbcx implements Serializable { /**车辆动力类型1*/ @Excel(name = "车辆动力类型1", width = 15) @ApiModelProperty(value = "车辆动力类型1") + @Dict(dicCode = "vehicle_dynamic_type") private java.lang.String dllx1; /**车辆动力类型2*/ @Excel(name = "车辆动力类型2", width = 15) @ApiModelProperty(value = "车辆动力类型2") + @Dict(dicCode = "vehicle_dynamic_type1") private java.lang.String dllx2; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index d27d120b5..4b5e5cad3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -17,8 +17,8 @@ public enum OtaTitleEnum { // QYMC("qymc", "企业名称", "0","enterprise name ",0), DJBH("djbh", "产品登记编号", "0", "Product Registration Number ", 500), CPLB("cplb", "产品类别", "product_category", "Product category", 0), - DLLX1("dllx1", "车辆动力类型", "0", "Vehicle Power Type", 50), - DLLX2("dllx2", "车辆动力类型", "0", "Vehicle Power Type", 50), + DLLX1("dllx1", "车辆动力类型", "vehicle_dynamic_type", "Vehicle Power Type", 50), + DLLX2("dllx2", "车辆动力类型", "vehicle_dynamic_type1", "Vehicle Power Type", 50), TXZD("txzd", "通信终端", "communication_terminal", "communication terminal", 0), CDOTASJ("cdotasj", "车端OTA升级管理系统", "0", "OTA Upgrade Management System", 500), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index bef8b2448..db91dd7aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -268,10 +268,10 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl Date: Thu, 13 Apr 2023 19:21:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/controller/OtaBaCxAqcsController.java | 6 +++++- .../modules/ota/controller/OtaBaCxJbxxController.java | 6 +++++- .../ota/controller/OtaBaCxJsfzbacsController.java | 6 +++++- .../ota/controller/OtaBaCxKsjjsmccsController.java | 6 +++++- .../ota/controller/OtaBaCxKsjxtmccsController.java | 6 +++++- .../modules/ota/controller/OtaBaCxListController.java | 6 +++++- .../ota/controller/OtaBaCxZxsjyqController.java | 7 +++++-- .../ota/controller/OtaBaSjGgnrfsController.java | 6 +++++- .../modules/ota/controller/OtaBaSjListController.java | 6 +++++- .../ota/controller/OtaBaSjSjfzbhController.java | 6 +++++- .../ota/controller/OtaBaSjSjmbclController.java | 6 +++++- .../ota/controller/OtaBaSjSjmbcxController.java | 6 +++++- .../ota/controller/OtaBaSjSjxtbhController.java | 6 +++++- .../ota/controller/OtaBaSjSjyxpgController.java | 10 +++++++--- 14 files changed, 72 insertions(+), 17 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 42067c84f..f4d652ed7 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 @@ -214,7 +214,11 @@ public class OtaBaCxAqcsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, @@ -213,7 +213,11 @@ public class OtaBaSjSjyxpgController extends JeroController Date: Thu, 13 Apr 2023 19:35:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxAqcsServiceImpl.java | 2 +- .../service/impl/OtaBaCxJbxxServiceImpl.java | 2 +- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 4 +-- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 2 +- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 2 +- .../impl/OtaBaCxZxsjyqServiceImpl.java | 2 +- .../impl/OtaBaSjSjfzbhServiceImpl.java | 7 ++--- .../impl/OtaBaSjSjmbcxServiceImpl.java | 2 +- .../impl/OtaBaSjSjxtbhServiceImpl.java | 2 +- .../modules/ota/utils/ComparisonUtil.java | 26 +++++++++++++++---- 10 files changed, 34 insertions(+), 17 deletions(-) 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 bdeb49541..e6736d272 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 @@ -257,7 +257,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl setDefault(String otaId) { List list = this.getByOtaId(otaId); Date now = new Date(); @@ -224,7 +225,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut,errMsg); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override @@ -243,7 +244,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl(); } - List newList = parseFile(upFile, otaId, cut,errMsg); + List newList = parseFile(upFile, otaId, cut, errMsg); ComparisonUtil cu = new ComparisonUtil(); List reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); deleteByOtaId(otaId); @@ -283,7 +284,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl { } } - public void checkError(T clazz, StringBuilder errMsg, ISysDictService sysDictService, String cut) { + public void checkError(T clazz, StringBuilder errMsg, ISysDictService sysDictService, String cut,int row) { Field[] fields = clazz.getClass().getDeclaredFields(); for (Field field : fields) { OtaTitleEnum ote = OtaTitleEnum.getOtaTitleEnum(field.getName()); @@ -200,17 +200,29 @@ public class ComparisonUtil { String str = val.toString(); if ("0".equals(ote.getType())) { if (str.length() > ote.getLen()) { - errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 的长度超过了 " + ote.getLen() + ", "); + } else { + errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); + } field.set(clazz, null); } } else if ("1".equals(ote.getType())) { if (!"1".equals(str) && !"2".equals(str)) { - errMsg.append(title + " 必须填写有或无, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 必须填写有或无, "); + }else{ + errMsg.append(title + " 必须填写有或无, "); + } field.set(clazz, null); } } else if ("2".equals(ote.getType())) { if (!"1".equals(str) && !"2".equals(str)) { - errMsg.append(title + " 必须填写是或否, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 必须填写是或否, "); + }else{ + errMsg.append(title + " 必须填写是或否, "); + } field.set(clazz, null); } } else if ("3".equals(ote.getType())) { @@ -220,7 +232,11 @@ public class ComparisonUtil { for (String s : strs) { String res = sysDictService.queryDictTextByKeyEn(ote.getType(), s, cut); if (StringUtils.isEmpty(res)) { - errMsg.append(title + " 填写了无法识别的选项, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 填写了无法识别的选项, "); + }else{ + errMsg.append(title + " 填写了无法识别的选项, "); + } field.set(clazz, null); } } From b1935d3af1332f110dadf7ba926d6d763c3cedf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 13 Apr 2023 20:09:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OtaBaCxJbxxServiceImpl.java | 2 +- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 4 +-- .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 4 +-- .../service/impl/OtaBaCxQtServiceImpl.java | 1 + .../impl/OtaBaSjQtsjxxServiceImpl.java | 1 - .../modules/ota/utils/ImportFileUtil.java | 34 +++++++++++++------ 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 7defa88e6..5e85ddd36 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -301,7 +301,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl 0) { + errMsg.append("第" + row + "行 " + title + " 找不到文件:" + strs[i] + ", "); + } else { + errMsg.append(title + " 找不到文件:" + strs[i] + ", "); + } continue; } if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf") && !file.getName().endsWith(".DOC") && !file.getName().endsWith(".DOCX") && !file.getName().endsWith(".PDF")) { - errMsg.append(title + " 只支持doc/docx/pdf格式, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 只支持doc/docx/pdf格式, "); + } else { + errMsg.append(title + " 只支持doc/docx/pdf格式, "); + } continue; } if (file.length() > 50 * 1024 * 1024) { - errMsg.append(title + " 上传文件不可以超过50MB, "); + if (row > 0) { + errMsg.append("第" + row + "行 " + title + " 上传文件不可以超过50MB, "); + } else { + errMsg.append(title + " 上传文件不可以超过50MB, "); + } continue; } OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(file), "", null, null);