mlx

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/ExcelController.java

@@ -1,6 +1,8 @@
 package com.css.simulation.resource.common.controller;
 
+import api.common.pojo.common.ResponseBodyVO;
 import api.common.util.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.http.MediaType;
@@ -11,20 +13,23 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("/excel")
 public class ExcelController {
 
     @PostMapping(value = "/parse", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public List<List<String>> parseExcel(@RequestPart("excel") MultipartFile excel) {
+    public ResponseBodyVO<List<List<String>>> parseExcel(@RequestPart("excel") MultipartFile excel) {
         try {
-            String suffix = excel.getName().split("\\.")[1];
+            String originalFilename = excel.getOriginalFilename();
+            log.info("parseExcel() excel 名称为：" + originalFilename);
+            String suffix = originalFilename.split("\\.")[1];
             InputStream inputStream = excel.getInputStream();
             Workbook workbook = ExcelUtil.getExcel(inputStream, suffix);
             Sheet sheet = ExcelUtil.getSheetByIndex(workbook, 0);
             List<List<String>> table = ExcelUtil.getTable(sheet, 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
             workbook.close();
-            return table;
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, table);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/VehicleService.java

@@ -51,8 +51,6 @@ public class VehicleService {
 
     public VehiclePO saveVehicle(VehicleVO vehicleVO) {
         try {
-            //1 判断参数是 1 vtd 还是 2 carsim
-            String parameterType = vehicleVO.getParameterType();
 
             VehiclePO vehiclePO = new VehiclePO();
             ObjectUtil.voToPo(vehicleVO, vehiclePO);
@@ -70,30 +68,20 @@ public class VehicleService {
                 return vehiclePO;
             }
             String id = vehiclePO.getId();
-            if ("1".equals(parameterType)) {
-                if (ObjectUtil.isNull(id)) {//新增
-                    vehiclePO.setId(StringUtil.getRandomUUID());
-                    vehiclePO.setVehicleCode(StringUtil.getRandomCode());
-                    vehicleMapper.insert(vehiclePO);
-                    LogUtil.insert();
-                } else {//修改
-                    vehicleMapper.update(vehiclePO);
-                    LogUtil.update();
-                }
-            } else if ("2".equals(parameterType)) {
-                VehicleUtil.listToJson(vehiclePO);
-                if (ObjectUtil.isNull(id)) {//新增
-                    vehiclePO.setId(StringUtil.getRandomUUID());
-                    vehiclePO.setVehicleCode(StringUtil.getRandomCode());
-                    vehicleMapper.insert(vehiclePO);
-                    LogUtil.insert();
-                } else {//修改
-                    vehicleMapper.update(vehiclePO);
-                    LogUtil.update();
-                }
 
+            String parameterType = vehicleVO.getParameterType();    //1 判断参数是 1 vtd 还是 2 carsim
+            if ("2".equals(parameterType)) {
+                VehicleUtil.listToJson(vehiclePO);
+            }
+            if (ObjectUtil.isNull(id)) {//新增
+                vehiclePO.setId(StringUtil.getRandomUUID());
+                vehiclePO.setVehicleCode(StringUtil.getRandomCode());
+                vehicleMapper.insert(vehiclePO);
+                LogUtil.insert();
+            } else {//修改
+                vehicleMapper.update(vehiclePO);
+                LogUtil.update();
             }
-
             return vehiclePO;
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -108,6 +96,10 @@ public class VehicleService {
         vehiclePO.setCreateUserId(null);
         //名称校验
         List<VehicleVO> list = vehicleMapper.checkVehicleName(vehiclePO);
+        String parameterType = vehicleVO.getParameterType();
+        if ("2".equals(parameterType)) {
+            VehicleUtil.listToJson(vehiclePO);
+        }
         if (ObjectUtil.isNotNull(list)) { // 覆盖
             String id = list.get(0).getId();
             vehiclePO.setId(id);