|
@@ -16,23 +16,25 @@ public class ReportsComputeConsumer extends Consumer<ReportsComputeEntity> {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void consume(ReportsComputeEntity et) {
|
|
public void consume(ReportsComputeEntity et) {
|
|
- logger.info("***************************报表计算开始,projectId:"+et.getProjectId());
|
|
|
|
|
|
+ logger.info("***************************报表计算开始,projectId:" + et.getProjectId());
|
|
try {
|
|
try {
|
|
// 修改报表计算任务状态
|
|
// 修改报表计算任务状态
|
|
reportsComputeService.updateToComputing(et);
|
|
reportsComputeService.updateToComputing(et);
|
|
- //计算报表
|
|
|
|
|
|
+ // 计算报表
|
|
reportsComputeService.compute(et);
|
|
reportsComputeService.compute(et);
|
|
// 修改报表计算任务状态
|
|
// 修改报表计算任务状态
|
|
reportsComputeService.updateToSuccess(et);
|
|
reportsComputeService.updateToSuccess(et);
|
|
} catch (ReportsComputeStopException e) {
|
|
} catch (ReportsComputeStopException e) {
|
|
- //计算终止
|
|
|
|
|
|
+ // 计算终止
|
|
reportsComputeService.updateToStop(et);
|
|
reportsComputeService.updateToStop(et);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
|
+ // 计算出错
|
|
|
|
+ reportsComputeService.updateToFail(et, "系统错误");
|
|
|
|
+ logger.error("***************************报表计算出错,projectId:" + et.getProjectId(), e);
|
|
|
|
+ } finally {
|
|
|
|
+ // 清除终止标志
|
|
reportsComputeService.clearStopingFlag(et.getId());
|
|
reportsComputeService.clearStopingFlag(et.getId());
|
|
- //计算出错
|
|
|
|
- reportsComputeService.updateToFail(et,"系统错误");
|
|
|
|
- logger.error("***************************报表计算出错,projectId:"+et.getProjectId(),e);
|
|
|
|
}
|
|
}
|
|
- logger.info("***************************报表计算结束,projectId:"+et.getProjectId());
|
|
|
|
|
|
+ logger.info("***************************报表计算结束,projectId:" + et.getProjectId());
|
|
}
|
|
}
|
|
}
|
|
}
|