From 15e6ff6f0639c2cac25e0be596da8d1a0a18dc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 13 Apr 2023 19:35:56 +0800
Subject: [PATCH] =?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<OtaBaCxAqcsMapper, OtaBa
         aqcs.setXxaqjz(ImportFileUtil.getCellValueDict(cell, wb, "Information_security_mechanism", sysDictService, cut));
 
         ComparisonUtil cu = new ComparisonUtil();
-        cu.checkError(aqcs, errMsg, sysDictService, cut);
+        cu.checkError(aqcs, errMsg, sysDictService, cut, 0);
 
         row = s.getRow(2);
         cell = row.getCell(3);
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 db91dd7aa..7defa88e6 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
@@ -280,7 +280,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
         jbxx.setCdotasj(ImportFileUtil.getCellValue(cell, wb));
 
         ComparisonUtil cu = new ComparisonUtil();
-        cu.checkError(jbxx, errMsg, sysDictService, cut);
+        cu.checkError(jbxx, errMsg, sysDictService, cut, 0);
         return jbxx;
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
index cf1a655bb..b45ceda41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
@@ -343,7 +343,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
                 cell = row.getCell(7);
                 sjmk.setBzwz(ImportFileUtil.getCellValue(cell, wb));
                 ComparisonUtil cu = new ComparisonUtil();
-                cu.checkError(sjmk, errMsg, sysDictService, cut);
+                cu.checkError(sjmk, errMsg, sysDictService, cut, i + 1);
                 sjmkList.add(sjmk);
             }
         }
@@ -608,7 +608,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
         cell = row.getCell(4);
         bass.setEdrScqy(ImportFileUtil.getCellValue(cell, wb));
         ComparisonUtil cu = new ComparisonUtil();
-        cu.checkError(bass, errMsg, sysDictService, cut);
+        cu.checkError(bass, errMsg, sysDictService, cut, 0);
         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 2137f28ca..a7dee3d8e 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
@@ -328,7 +328,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 mssc.setCreateTime(now);
 
                 ComparisonUtil cu = new ComparisonUtil();
-                cu.checkError(mssc, errMsg, sysDictService, cut);
+                cu.checkError(mssc, errMsg, sysDictService, cut, i + 1);
                 mccsList.add(mssc);
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
index 42fc50f27..1354dbdde 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
@@ -401,7 +401,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
                 mssc.setUpdateTime(now);
 
                 ComparisonUtil cu = new ComparisonUtil();
-                cu.checkError(mssc, errMsg, sysDictService, cut);
+                cu.checkError(mssc, errMsg, sysDictService, cut, i + 1);
                 mccsList.add(mssc);
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
index 8a65776b1..0ea5e2320 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java
@@ -273,7 +273,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
         otaBaCxZxsjyq.setSjzt(ImportFileUtil.getCellValueYesOrNo(cell, wb));
 
         ComparisonUtil cu = new ComparisonUtil();
-        cu.checkError(otaBaCxZxsjyq, errMsg, sysDictService, cut);
+        cu.checkError(otaBaCxZxsjyq, errMsg, sysDictService, cut, 0);
 
         row = s.getRow(2);
         cell = row.getCell(3);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
index 2246a8c73..0f026ef16 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
@@ -115,6 +115,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
 
         }
     }
+
     public List<OtaBaSjSjfzbh> setDefault(String otaId) {
         List<OtaBaSjSjfzbh> list = this.getByOtaId(otaId);
         Date now = new Date();
@@ -224,7 +225,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
     @Override
     public void importData(MultipartFile file, String otaId, String cut, StringBuilder errMsg) throws Exception {
         List<File> 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<OtaBaSjSjfzbhMapper, O
         if (ObjectUtils.isEmpty(oldList)) {
             oldList = new ArrayList<>();
         }
-        List<OtaBaSjSjfzbh> newList = parseFile(upFile, otaId, cut,errMsg);
+        List<OtaBaSjSjfzbh> newList = parseFile(upFile, otaId, cut, errMsg);
         ComparisonUtil cu = new ComparisonUtil();
         List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService);
         deleteByOtaId(otaId);
@@ -283,7 +284,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
             fzbh.setCreateTime(now);
             fzbh.setUpdateTime(now);
             ComparisonUtil cu = new ComparisonUtil();
-            cu.checkError(fzbh, errMsg, sysDictService, cut);
+            cu.checkError(fzbh, errMsg, sysDictService, cut, i + 1);
 
             fzbhList.add(fzbh);
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
index e8372affe..1469ad627 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
@@ -246,7 +246,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
             mbcx.setDllx2(jbxx.getDllx2());
         }
         ComparisonUtil cu = new ComparisonUtil();
-        cu.checkError(mbcx, errMsg, sysDictService, cut);
+        cu.checkError(mbcx, errMsg, sysDictService, cut, 0);
         return mbcx;
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
index 856a3b529..f60660bda 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
@@ -271,7 +271,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
             cell = row.getCell(10);
             xtbh.setSfcfsj(ImportFileUtil.getCellValueYesOrNo(cell, wb));
             ComparisonUtil cu = new ComparisonUtil();
-            cu.checkError(xtbh, errMsg, sysDictService, cut);
+            cu.checkError(xtbh, errMsg, sysDictService, cut, i + 1);
             if (xtbh.isNull()) {
                 break;
             }
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 575b3243c..ceb65f45e 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
@@ -185,7 +185,7 @@ public class ComparisonUtil<T> {
         }
     }
 
-    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<T> {
                     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<T> {
                         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);
                             }
                         }