Эх сурвалжийг харах

fix: 人员导出接口、个人执行包数据导出接口-补充异常结果状态更新

lixuesong 4 өдөр өмнө
parent
commit
8eee517b21

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserExportServiceImpl.java

@@ -129,8 +129,8 @@ public class SysUserExportServiceImpl implements SysUserExportService {
 			});
 
 		} finally {
-			// 释放全局限流
-			redisTemplate.opsForValue().decrement(CacheConstants.ASYNC_EXPORT_LIMIT_KEY);
+			redisUtils.releaseExportGlobalAllows();
+			redisUtils.cleanupGenerating(ExportType.USER, user.getId());
 		}
 	}
 	

+ 2 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageExportServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ExportType;
@@ -43,7 +42,6 @@ import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -77,7 +75,6 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 	private final WmScorePackageStatusMapper scorePackageStatusMapper;
 	private final SysCheckChainNodeCheckHistoryMapper checkChainNodeCheckHistoryMapper;
 	private final WmPackageTaskTypeQtyService packageTaskTypeQtyService;
-	private final RedisTemplate<String, Object> redisTemplate;
 	private final UpmsConfig upmsConfig;
 	private final RedisUtils redisUtils;
 	private final ExportUtils exportUtils;
@@ -122,8 +119,8 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 			String resultValue = exportUtils.WriteExportExcel(ExportType.SCORE_PACKAGE_SUB, data, WmScorePackageSubInfoExcelModel.class, user);
 			return !StrUtil.startWith(resultValue, "ERROR");
 		} finally {
-			// 释放全局限流
-			redisTemplate.opsForValue().decrement(CacheConstants.ASYNC_EXPORT_LIMIT_KEY);
+			redisUtils.releaseExportGlobalAllows();
+			redisUtils.cleanupGenerating(ExportType.SCORE_PACKAGE_SUB, user.getId());
 		}
 	}