From 26f0c5b2a0a79cb3522fb2eedc7ee9ea4ad7da59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 27 Mar 2023 04:04:20 +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 --- .../controller/OtaBaCxJsfzbacsController.java | 24 +++++++++++ .../ota/service/IOtaBaCxJsfzbacsService.java | 7 ++++ .../service/impl/OtaBaCxJbxxServiceImpl.java | 15 +++++-- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 40 +++++++++++++++++++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java index e47925a95..d25c3563d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java @@ -18,6 +18,7 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -184,4 +185,27 @@ public class OtaBaCxJsfzbacsController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut, + @RequestParam(value = "otaId", required = false) String otaId) throws Exception { + try { + this.otaBaCxJsfzbacsService.importData(file, otaId, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK(); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java index fffadf575..71172b045 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java @@ -3,7 +3,10 @@ package com.jero.modules.ota.service; import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -61,4 +64,8 @@ public interface IOtaBaCxJsfzbacsService extends IService { List queryList(); JSONObject queryByOtaId(String otaId, String otaIdT); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + void importData(MultipartFile file, String otaId, String cut) throws Exception; } 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 7507212fb..aef65ed64 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 @@ -163,13 +163,22 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File upFile = null; + for (File f : upLoadFiles) { + if (f.getName().equals("可在线升级的系统名称与参数.xlsx")) { + upFile = f; + } + } + if (null == upFile) { + throw new JeroBootException("请上传正确的文件"); + } + OtaBaCxJbxx jbxx = parseFile(upFile, cut); jbxx.setOtaId(otaId); return add(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 ad1f79ba7..c0cb5daae 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; import com.jero.modules.ota.entity.OtaBaCxSjmk; import com.jero.modules.ota.entity.OtaBaCxTxjl; @@ -14,11 +15,17 @@ import com.jero.modules.ota.service.IOtaBaCxJsfzbacsService; import com.jero.modules.ota.service.IOtaBaCxSjmkService; import com.jero.modules.ota.service.IOtaBaCxTxjlService; import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.ota.utils.ImportFileUtil; import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.lang.reflect.Field; import java.util.*; @@ -31,6 +38,12 @@ import java.util.*; @Service public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl implements IOtaBaCxJsfzbacsService { + @Value(value = "${ota.templatePath}") + private String templatePath; + + @Value(value = "${ota.uploadPath}") + private String uploadPath; + @Autowired private IOtaBaCxTxjlService otaBaCxTxjlService; @@ -221,5 +234,32 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); + File upFile = null; + for (File f : upLoadFiles) { + if (f.getName().equals("驾驶辅助系统基础备案参数.xlsx")) { + upFile = f; + } + } + if (null == upFile) { + throw new JeroBootException("请上传正确的文件"); + } + JSONObject json = parseFile(upFile, otaId, cut); + } + + private JSONObject parseFile(File upFile, String otaId, String cut) { + JSONObject jsonObj = new JSONObject(); + jsonObj.put("otaId",otaId); + + + + return jsonObj; + } }