From b0bd52c32136759b5d3ba49460848cd990bfc9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 30 Mar 2023 19:33:03 +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-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaBaCxAqcsServiceImpl.java  | 14 +++++++++-----
 .../ota/service/impl/OtaBaCxJbxxServiceImpl.java  |  3 ++-
 .../service/impl/OtaBaCxJsfzbacsServiceImpl.java  |  3 +++
 .../service/impl/OtaBaCxKsjjsmccsServiceImpl.java | 11 ++++++++---
 .../service/impl/OtaBaCxKsjxtmccsServiceImpl.java |  5 ++++-
 .../service/impl/OtaBaCxZxsjyqServiceImpl.java    |  3 +++
 .../jero/modules/ota/utils/ComparisonUtil.java    | 15 +++++++++++++++
 7 files changed, 44 insertions(+), 10 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 849cc8289..ea7cf9adf 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
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Date;
@@ -89,9 +90,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
             if (ObjectUtils.isNotEmpty(otaBaCxAqcsOld) && StringUtils.isNotEmpty(otaBaCxAqcsOld.getZmcl())) {
                 List<AttachmentEO> aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class);
                 otaBaCxAqcsOld.setZmclList(aeoList);
+                deleteById(otaBaCxAqcsOld.getId());
             }
             deleteById(otaBaCxAqcs.getId());
-            deleteById(otaBaCxAqcsOld.getId());
             saveOrUpdate(otaBaCxAqcs);
             ComparisonUtil cu = new ComparisonUtil();
             if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) {
@@ -278,19 +279,20 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
 
             Row row = s.getRow(2);
             Cell cell = row.getCell(2);
-            cell.setCellValue(sysDictService.queryDictItemByValue("protection_mechanism", aqcs.getBhjz(), cut));
+
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("protection_mechanism", aqcs.getBhjz(), sysDictService));
 
             row = s.getRow(3);
             cell = row.getCell(2);
-            cell.setCellValue(sysDictService.queryDictItemByValue("fail_safe_mechanism", aqcs.getFsxjz(), cut));
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("fail_safe_mechanism", aqcs.getFsxjz(), sysDictService));
 
             row = s.getRow(4);
             cell = row.getCell(2);
-            cell.setCellValue(sysDictService.queryDictItemByValue("upgrade_failure", aqcs.getSjsbcs(), cut));
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("upgrade_failure", aqcs.getSjsbcs(), sysDictService));
 
             row = s.getRow(5);
             cell = row.getCell(2);
-            cell.setCellValue(sysDictService.queryDictItemByValue("Information_security_mechanism", aqcs.getXxaqjz(), cut));
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("Information_security_mechanism", aqcs.getXxaqjz(), sysDictService));
 
             row = s.getRow(2);
             cell = row.getCell(3);
@@ -313,6 +315,8 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
                 }
             }
             cell.setCellValue(sb.toString());
+            wb.write(new FileOutputStream(file));
+            wb.close();
         }
     }
 }
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 a8dc2d4c2..db580562c 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
@@ -286,7 +286,8 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             cell.setCellValue(jbxx.getDllx2());
             row = s.getRow(10);
             cell = row.getCell(1);
-            cell.setCellValue(sysDictService.queryDictTextByKey("communication_terminal", jbxx.getTxzd()));
+            String str = jbxx.getTxzd();
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("communication_terminal", str, sysDictService));
             row = s.getRow(11);
             cell = row.getCell(1);
             cell.setCellValue(jbxx.getCdotasj());
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 0d9029e94..8f7ac7343 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
@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.lang.reflect.Field;
 import java.util.*;
 
@@ -872,6 +873,8 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
                 cell.setCellValue(sjmk.getBzwz());
                 startRow++;
             }
+            wb.write(new FileOutputStream(file));
+            wb.close();
         }
     }
 }
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 275353fe4..387898a15 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
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.*;
@@ -340,7 +341,8 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
         Workbook wb = ImportFileUtil.readExcel(file);
         Sheet s = wb.getSheetAt(0);
         int startRow = 3;
-        for (OtaBaCxKsjjsmccs mccs : mccsList) {
+        for (int i = 0; i < mccsList.size(); i++) {
+            OtaBaCxKsjjsmccs mccs = mccsList.get(i);
             Row row = s.getRow(startRow);
             Cell cell = row.createCell(0);
             cell.setCellValue(mccs.getGnmc());
@@ -370,11 +372,12 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
             cell.setCellValue(mccs.getCzxtbbh());
             cell = row.createCell(13);
             cell.setCellValue(mccs.getCsyzsj());
+            startRow++;
         }
-        Row row = s.getRow(startRow);
+        Row row = s.createRow(startRow);
         Cell cell = row.createCell(0);
         cell.setCellValue("证明材料");
-        cell = row.getCell(1);
+        cell = row.createCell(1);
         OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
         if (ObjectUtils.isNotEmpty(otaBaCxList)) {
             StringBuilder sb = new StringBuilder();
@@ -396,5 +399,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 cell.setCellValue(sb.toString());
             }
         }
+        wb.write(new FileOutputStream(file));
+        wb.close();
     }
 }
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 08e7f3c69..c025fbfa9 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
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.*;
@@ -471,7 +472,7 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
         }
         Cell cell = row.createCell(0);
         cell.setCellValue("证明材料");
-        cell = row.getCell(1);
+        cell = row.createCell(1);
         OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId);
         if (ObjectUtils.isNotEmpty(otaBaCxList)) {
             StringBuilder sb = new StringBuilder();
@@ -493,6 +494,8 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
                 cell.setCellValue(sb.toString());
             }
         }
+        wb.write(new FileOutputStream(file));
+        wb.close();
     }
 
 }
\ No newline at end of file
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 3abfdc679..58c8f7936 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
@@ -31,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
@@ -332,6 +333,8 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
                 }
             }
             cell.setCellValue(sb.toString());
+            wb.write(new FileOutputStream(file));
+            wb.close();
         }
     }
 }
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 bd956e9a8..4061f8312 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
@@ -212,6 +212,21 @@ public class ComparisonUtil<T> {
         return resList;
     }
 
+    public static String queryDictTextByKey(String dictKey, String str, ISysDictService sysDictService) {
+        StringBuilder sb = new StringBuilder();
+        if (StringUtils.isNotEmpty(str)) {
+            String[] strs = str.split(",");
+            for (int i = 0; i < strs.length; i++) {
+                if (i >= strs.length - 1) {
+                    sb.append(sysDictService.queryDictTextByKey(dictKey, strs[i]));
+                } else {
+                    sb.append(sysDictService.queryDictTextByKey(dictKey, strs[i])).append(",");
+                }
+            }
+        }
+        return sb.toString();
+    }
+
     private String parseDictText(OtaTitleEnum ote, Field field, T clazz, ISysDictService sysDictService) {
         String res = "空";
         try {