[excel导入]修改百分比BUG

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

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -16,5 +17,6 @@ import javax.persistence.Table;
 public class ExcelLog  extends BaseEntity {
     private String result;
     private String reason;
+    @Column(columnDefinition="TEXT")
     private String fileName;
 }

src/main/java/com/tykj/model_layer/excel/ExcelData.java

@@ -50,7 +50,7 @@ public class ExcelData {
     @Autowired
     private ExcelConfigDao excelConfigDao;
     private String path;
-    private double percent;
+    private float percent;
     private String successPath = System.getProperty("user.dir") + "/successFile/";
     private String errorPath = System.getProperty("user.dir") + "/errorFile/";
     private String tmpPath = System.getProperty("user.dir") + "/tmp/";
@@ -71,6 +71,7 @@ public class ExcelData {
     }
 
     public ResponseEntity getExcelData(int id){
+        this.percent =0;//百分比数字
         String jsonData = modelHelper.getJsonExpample(id);
         try {
             //{className={propertyName=""}}
@@ -95,7 +96,9 @@ public class ExcelData {
             String errorFileNameList = "";
             String errorReason = "";
             int total = 0;//操作完成的总数量
-            percent =0;//百分比数字
+            int successNum = 0;
+            int errorNum = 0;
+
             for (File dataFile : dataFiles){
                 //传给保存接口的list
                 List<Map<String, Object>> saveMapList = new ArrayList<>();
@@ -190,12 +193,15 @@ public class ExcelData {
                     if (re == 0){
                         successFileNameList = successFileNameList + "[" + fileName + "]";
                         dataFile.renameTo(new File(successPath + fileName));
+                        successNum = successNum +1;
                     }else {
                         errorFileNameList = errorFileNameList + "[" + fileName + "]";
                         errorReason = "不是excel文件或保存失败";
                         dataFile.renameTo(new File(errorPath + fileName));
+                        errorNum = errorNum + 1;
                     }
                     total = total + 1;
+                    this.percent = (float)total/dataFiles.length;
                 }catch (Exception e){
                     e.printStackTrace();
                     errorFileNameList = errorFileNameList + "[" + fileName + "]";
@@ -203,17 +209,18 @@ public class ExcelData {
                 }
 
             }
-            percent = total/dataFiles.length * 1.0;
+
+            ExcelVo excelVo = new ExcelVo(dataFiles.length, successNum, errorNum, 0,null);
             if (!"".equals(errorFileNameList)){
                 excelLogService.save(new ExcelLog("导入失败", errorReason, errorFileNameList));
                 String s = "没有文件";
                 if (!"".equals(successFileNameList)){
                     s = successFileNameList;
                 }
-                return ResultUtil.failed(errorFileNameList + "导入失败，" + s + "导入成功");
+                return ResultUtil.failed(excelVo + "导入失败，" + s + "导入成功");
             }else {
                 excelLogService.save(new ExcelLog("导入成功", "", successFileNameList));
-                return ResultUtil.success("", "导入成功！");
+                return ResultUtil.success(excelVo, "导入成功！");
             }
 
         } catch (Exception e) {
@@ -532,7 +539,7 @@ public class ExcelData {
     }
 
     public ResponseEntity findPrecen(){
-        return ResultUtil.success(percent,"查询成功");
+        return ResultUtil.success(this.percent,"查询成功");
     }
 
 }

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

@@ -390,6 +390,7 @@ public class ModelImpl implements ModelService {
             Session session = sessionUtil.getSession();
             Query query1 = session.createQuery(query);
             List<Map<String, Object>> list = query1.list();
+            session.close();
             return list;
         }
         return null;
@@ -411,6 +412,7 @@ public class ModelImpl implements ModelService {
                 Query query1 = session.createQuery(query);
                 List<Map<String, Object>> list = query1.list();
                 result.put(groupCondition.getName(), list);
+                session.close();
             }
             return result;
         }