导入划分进度条优化

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -3194,14 +3194,15 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
                     }
                 }
-                bladeRedis.setEx("import:projectId:"+wbsTreeContractRoot.getProjectId()+"contractId:"+wbsTreeContractRoot.getContractId(), "100",7L);
             } catch (Exception e) {
                 bladeRedis.del("import:projectId:"+wbsTreeContractRoot.getProjectId()+"contractId:"+wbsTreeContractRoot.getContractId());
             }finally {
                 bladeRedis.del("import:projectId:"+wbsTreeContractRoot.getProjectId()+"contractId:"+wbsTreeContractRoot.getContractId());
             }
+            bladeRedis.setEx("import:projectId:"+wbsTreeContractRoot.getProjectId()+"contractId:"+wbsTreeContractRoot.getContractId(), "100",7L);
             return R.success("新增了" + insertList.size() + "个节点" + "," + String.join(",", updateList) + "节点编号已被修改");
         } catch (IOException e) {
+            bladeRedis.del("import:projectId:"+wbsTreeContractRoot.getProjectId()+"contractId:"+wbsTreeContractRoot.getContractId());
             return R.fail("文件处理失败: " + e.getMessage());
         }
     }
@@ -4667,20 +4668,36 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
     @Override
     public Boolean getIsImport(Long projectId, Long contractId) {
-        Object o = bladeRedis.get("import:projectId:" + projectId + "contractId:" + contractId);
-        if(o!=null){
-            return true;
-        }else {
+        try {
+            Object o = bladeRedis.get("import:projectId:" + projectId + "contractId:" + contractId);
+            if(o!=null){
+                if(Double.parseDouble(o.toString())>=100){
+                    bladeRedis.del("import:projectId:" + projectId + "contractId:" + contractId);
+                    return false;
+                }
+                return true;
+            }else {
+                return false;
+            }
+        }catch (Exception e){
             return false;
         }
     }
 
     @Override
     public R getImportProgress(Long projectId, Long contractId) {
-        Object o = bladeRedis.get("import:projectId:" + projectId + "contractId:" + contractId);
-        if(o!=null){
-            return R.data(o.toString());
-        }else {
+        try {
+            Object o = bladeRedis.get("import:projectId:" + projectId + "contractId:" + contractId);
+            if(o!=null){
+                if(Double.parseDouble(o.toString())>=100){
+                    bladeRedis.del("import:projectId:" + projectId + "contractId:" + contractId);
+                    return R.data("100");
+                }
+                return R.data(o.toString());
+            }else {
+                return R.data("0");
+            }
+        }catch (Exception e){
             return R.data("0");
         }
     }