From 0754af609c50ab0d8512ae8baad00186acdc14fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 27 Mar 2023 00:52:08 +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/OtaBaCxJbxxController.java |  8 +-
 .../ota/service/IOtaBaCxJbxxService.java      | 74 +++++++++----------
 .../service/impl/OtaBaCxJbxxServiceImpl.java  |  7 +-
 3 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
index 4bacf2384..34827abf4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
@@ -194,14 +194,16 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
     @PostMapping(value = "/importData")
 //	@RequiresPermissions("otaBaCx:importData")
     public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
-                                @RequestParam(value = "cut", required = false) String cut) throws Exception {
+                                @RequestParam(value = "cut", required = false) String cut,
+                                @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
+        OtaBaCxJbxx res;
         try {
-            this.otaBaCxJbxxService.importData(file, cut);
+            res = this.otaBaCxJbxxService.importData(file, otaId, cut);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK("导入成功");
+        return Result.OK(res);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java
index 08df90efc..a66b9e207 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java
@@ -11,61 +11,61 @@ import java.util.List;
 /**
  * @Description: 车型备案-车型基本信息
  * @Author: jero-boot
- * @Date:   2023-03-17
+ * @Date: 2023-03-17
  * @Version: V1.0
  */
 public interface IOtaBaCxJbxxService extends IService<OtaBaCxJbxx> {
 
-	/**
-	 * 保存
-	 *
-	 * @param otaBaCxJbxx
-	 * @return
-	 */
-	OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx);
+    /**
+     * 保存
+     *
+     * @param otaBaCxJbxx
+     * @return
+     */
+    OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx);
 
-	/**
-	 * 更新
-	 *
-	 * @param otaBaCxJbxx
-	 * @return
-	 */
+    /**
+     * 更新
+     *
+     * @param otaBaCxJbxx
+     * @return
+     */
     void editById(OtaBaCxJbxx otaBaCxJbxx);
 
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
     void deleteById(String id);
 
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
     void deleteByIds(List<String> ids);
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     OtaBaCxJbxx queryById(String id);
 
     /**
-	 * 列表查询
-	 *
-	 * @return
-	 */
+     * 列表查询
+     *
+     * @return
+     */
     List<OtaBaCxJbxx> queryList();
 
     OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT);
 
     void exportTemplate(HttpServletResponse response, HttpServletRequest request);
 
-	void importData(MultipartFile file, String cut);
+    OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut);
 }
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 672d2e660..fbd93af1e 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
@@ -166,10 +166,11 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
     }
 
     @Override
-    public void importData(MultipartFile file, String cut) {
+    public OtaBaCxJbxx importData(MultipartFile file, String otaId, String cut) {
         File upLoadFile = ImportFileUtil.importFile(file, cut, uploadPath, "xlsx");
         OtaBaCxJbxx jbxx = parseFile(upLoadFile, cut);
-        add(jbxx);
+        jbxx.setOtaId(otaId);
+        return add(jbxx);
     }
 
     public static String getCellValue(Cell cell, Workbook workbook) {
@@ -220,7 +221,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             row = s.getRow(11);
             cell = row.getCell(1);
             jbxx.setCdotasj(getCellValue(cell, wb));
-        } catch (IndexOutOfBoundsException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return jbxx;