[excle]excel导入

src/main/java/com/tykj/model_layer/controller/ExcelController.java

 package com.tykj.model_layer.controller;
 
 import com.tykj.base.result.ResultUtil;
+import com.tykj.model_layer.entity.ExcelConfig;
 import com.tykj.model_layer.excel.ExcelData;
 import com.tykj.model_layer.service.ExcelLogService;
 import com.tykj.model_layer.service.impl.ModelHelper;
@@ -27,7 +28,9 @@ public class ExcelController {
 
     @ApiOperation("导入excel")
     @PostMapping("/import")
-    public ResponseEntity importExcel(@RequestParam int id){
+    public ResponseEntity importExcel(){
+        //@RequestParam int id
+        int id = 14;
         return excelData.getExcelData(id);
 
     }
@@ -55,5 +58,16 @@ public class ExcelController {
         return excelData.compareRule();
     }
 
+    @ApiOperation("新增excel路径")
+    @PostMapping("/path")
+    public ResponseEntity savePath(@RequestParam String path){
+        return excelData.savePath(path);
+    }
+
+    @ApiOperation("查询路径")
+    @PostMapping("/findPath")
+    public ResponseEntity findPath(){
+        return excelData.findPath();
+    }
 
 }

src/main/java/com/tykj/model_layer/dao/ExcelConfigDao.java

+package com.tykj.model_layer.dao;
+
+import com.tykj.model_layer.entity.ExcelConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface ExcelConfigDao extends JpaRepository<ExcelConfig, Integer>, JpaSpecificationExecutor<ExcelConfig> {
+}

src/main/java/com/tykj/model_layer/entity/ExcelConfig.java

+package com.tykj.model_layer.entity;
+
+import com.tykj.base.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExcelConfig extends BaseEntity {
+    private String path;
+}

src/main/java/com/tykj/model_layer/entity/ExcelLog.java

@@ -5,10 +5,16 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@Entity
+@Table
 public class ExcelLog  extends BaseEntity {
     private String result;
     private String reason;
+    private String fileName;
 }

src/main/java/com/tykj/model_layer/entity/Rule.java

@@ -31,6 +31,6 @@ public class Rule extends BaseEntity {
     private String level;
     @ApiModelProperty("对比结果")
     private String result;
-    @ApiModelProperty("是否需要对比多个sheet数据")
+    @ApiModelProperty("是否需要对比多个sheet数据, 0不用，1需要对比所有sheet的name是否相同，2 唯一值")
     private Integer compare;
 }

src/main/java/com/tykj/model_layer/entity/vo/ExcelLogVo.java

@@ -14,4 +14,5 @@ public class ExcelLogVo extends JpaCustomPage {
     @ApiModelProperty("成功")
     private String result;
 
+
 }

src/main/java/com/tykj/model_layer/entity/vo/ExcelVo.java

@@ -9,6 +9,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ExcelVo {
+    private Integer total;
     private Integer successNum;
     private Integer errorNum;
     private List<ExcelErrorVo> list;

src/main/java/com/tykj/model_layer/service/impl/ExcelLogServiceImpl.java

@@ -2,6 +2,7 @@ package com.tykj.model_layer.service.impl;
 
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
+import com.tykj.base.page.JpaCustomOrder;
 import com.tykj.base.result.ResultUtil;
 import com.tykj.model_layer.dao.ExcelLogDao;
 import com.tykj.model_layer.entity.ExcelLog;
@@ -9,9 +10,13 @@ import com.tykj.model_layer.entity.vo.ExcelLogVo;
 import com.tykj.model_layer.service.ExcelLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class ExcelLogServiceImpl implements ExcelLogService {
     @Autowired
@@ -25,6 +30,12 @@ public class ExcelLogServiceImpl implements ExcelLogService {
     public ResponseEntity pageAll(ExcelLogVo ruleVo) {
         try {
             PredicateBuilder<ExcelLog> and = Specifications.and();
+            List<JpaCustomOrder> orders = new ArrayList<>();
+            JpaCustomOrder jpaCustomOrder = new JpaCustomOrder();
+            jpaCustomOrder.setCoulmn("createdTime");
+            jpaCustomOrder.setDirection(Sort.Direction.DESC);
+            orders.add(jpaCustomOrder);
+            ruleVo.setOrders(orders);
             Page<ExcelLog> rules = excelLogDao.findAll(and.build(), ruleVo.getPageable());
             return ResultUtil.success(rules, "查询成功！");
         }catch (Exception e){