完善

platform-dao/src/main/java/com/platform/dao/util/ExcelUtil.java

@@ -37,6 +37,7 @@ public class ExcelUtil {
      *
      * @param inputStream :
      * @param pojoClass   :
+     * @param titleRows   :行列索引从0开始
      * @return ：
      */
     public static <T> List<T> importExcel(InputStream inputStream, Class<? extends T> pojoClass, int titleRows) {

platform-dao/src/main/java/com/platform/dao/vo/export/firm/ExportFirmProducerVO.java

@@ -20,13 +20,13 @@ public class ExportFirmProducerVO implements Serializable {
     /**
      * 位置id
      */
-    @Excel(name = "位置id", orderNum = "1")
+    @Excel(name = "生产商id", orderNum = "1")
     private String id;
 
     /**
      * 类型：1.表示设备，2.表示部位，3.表示备件
      */
-    @Excel(name = "类型：1.表示设备，2.表示部位，3.表示备件", orderNum = "2")
+    @Excel(name = "类型：1.表示设备供应商，2.表示部位供应商，3.表示备件供应商", orderNum = "2")
     private Integer type;
 
     /**
@@ -71,53 +71,10 @@ public class ExportFirmProducerVO implements Serializable {
     @Excel(name = "排序", orderNum = "9")
     private Integer sort;
 
-    /**
-     * 是否删除:  -1：已删除  0：正常
-     */
-    @Excel(name = "是否删除:  -1：已删除  0：正常", orderNum = "10")
-    private Integer delFlag;
-
     /**
      * 备注
      */
-    @Excel(name = "备注", orderNum = "11")
+    @Excel(name = "备注", orderNum = "10")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", orderNum = "12")
-    private String createdUserId;
-
-    /**
-     * 创建人名称
-     */
-    @Excel(name = "创建人名称", orderNum = "13")
-    private String createdUserName;
-
-    /**
-     * 更新人
-     */
-    @Excel(name = "更新人", orderNum = "14")
-    private String updateUserId;
-
-    /**
-     * 更新人名称
-     */
-    @Excel(name = "更新人名称", orderNum = "15")
-    private String updateUserName;
-
-    /**
-     * 创建日期
-     */
-    @Excel(name = "创建日期", orderNum = "16")
-    private LocalDateTime createdTime;
-
-    /**
-     * 更新日期
-     */
-    @Excel(name = "更新日期", orderNum = "17")
-    private LocalDateTime updateTime;
-
-
 }

platform-dao/src/main/java/com/platform/dao/vo/export/part/ExportPartTypeVO.java

@@ -47,47 +47,16 @@ public class ExportPartTypeVO implements Serializable {
     @Excel(name = "排序", orderNum = "5")
     private Integer sort;
 
-    /**
-     * 是否删除  -1：已删除  0：正常
-     */
-    @Excel(name = "是否删除  -1：已删除  0：正常", orderNum = "6")
-    private Integer delFlag;
-
     /**
      * 上层部位id
      */
-    @Excel(name = "上层部位id", orderNum = "7")
+    @Excel(name = "上层部位id", orderNum = "6")
     private String parentId;
 
     /**
      * 备注
      */
-    @Excel(name = "备注", orderNum = "8")
+    @Excel(name = "备注", orderNum = "7")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", orderNum = "9")
-    private String updateUserId;
-
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", orderNum = "10")
-    private String createdUserId;
-
-    /**
-     * 创建日期
-     */
-    @Excel(name = "创建日期", orderNum = "11")
-    private LocalDateTime createdTime;
-
-    /**
-     * 更新日期
-     */
-    @Excel(name = "更新日期", orderNum = "12")
-    private LocalDateTime updateTime;
-
-
 }

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbPositionVO.java

@@ -30,7 +30,7 @@ public class ExportSbPositionVO implements Serializable {
     private String no;
 
     /**
-     * 父子级编码
+     * 编码
      */
     private String code;
 
@@ -52,41 +52,16 @@ public class ExportSbPositionVO implements Serializable {
     @Excel(name = "排序", orderNum = "5")
     private Integer sort;
 
-    /**
-     * 是否删除  -1：已删除  0：正常
-     */
-    @Excel(name = "是否删除  -1：已删除  0：正常", orderNum = "6")
-    private Integer delFlag;
-
     /**
      * 上层位置id
      */
-    @Excel(name = "上层位置id", orderNum = "7")
+    @Excel(name = "上层位置id", orderNum = "6")
     private String parentId;
 
     /**
      * 备注
      */
-    @Excel(name = "备注", orderNum = "8")
+    @Excel(name = "备注", orderNum = "7")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @Excel(name = "创建人", orderNum = "9")
-    private String createdUserId;
-
-    /**
-     * 创建日期
-     */
-    @Excel(name = "创建日期", orderNum = "10")
-    private LocalDateTime createdTime;
-
-    /**
-     * 更新日期
-     */
-    @Excel(name = "更新日期", orderNum = "11")
-    private LocalDateTime updateTime;
-
-
 }

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbTypeVO.java

@@ -56,7 +56,7 @@ public class ExportSbTypeVO implements Serializable {
     /**
      * 上层类型id
      */
-    @Excel(name = "上层类型名称", orderNum = "7")
+    @Excel(name = "上层类型名称（导入时，可不填）", orderNum = "7")
     private String parentName;
 
 }

platform-rest/src/main/java/com/platform/rest/controller/excel/ExcelImportController.java

@@ -0,0 +1,51 @@
+package com.platform.rest.controller.excel;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.platform.common.util.R;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.sb.ExportSbTypeVO;
+import com.platform.rest.log.annotation.SysLog;
+import com.platform.service.sb.SbInfoService;
+import com.platform.service.sb.impl.SbInfoServiceImpl;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * @Description 设备基础信息 控制器
+ * @Author liuyu
+ * @Date 2020-04-21 21:05:46
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/excel/import")
+@Slf4j
+public class ExcelImportController {
+
+    private final SbInfoService sbInfoService;
+
+    /**
+     * 导入设备类型
+     *
+     * @param file bom excel文件
+     * @return R
+     */
+    @SysLog("新增导入设备类型")
+    @PostMapping("/sb/type")
+    public R importExcel(@RequestParam("file") MultipartFile file) throws Exception {
+        List<ExportSbTypeVO> list = ExcelUtil.importExcel(file.getInputStream(), ExportSbTypeVO.class, 1);
+        if(CollectionUtil.isNotEmpty(list)){
+            list.forEach(item->log.info(item.toString()));
+        }
+        int i = list.size();
+        if (i != 0) {
+            return new R("导入成功");
+        } else {
+            return new R("导入失败");
+        }
+    }
+}