...
|
...
|
@@ -69,7 +69,7 @@ public class ReportService implements IReportService { |
|
|
XklAmpReportEntity report = reportRepository.findByMd5AndStatus(reportMd5, Constants.STATUS_OK);
|
|
|
if (report != null && report.getStatus() > 0) {
|
|
|
// 返回,报告已存在。
|
|
|
return new ResponseEntity<>(ResultModel.ok(new ReportIdModel(report.getId())), HttpStatus.OK);
|
|
|
return new ResponseEntity<>(ResultModel.error(ResultStatus.REPORT_EXISTED_ERROR, new ReportIdModel(report.getId())), HttpStatus.OK);
|
|
|
} else if (redis.hasKey(reportWithNoUser)) {
|
|
|
// 返回,报告对应会员不存在。
|
|
|
return new ResponseEntity<>(ResultModel.error(ResultStatus.INVALID_USER_ERROR),HttpStatus.OK);
|
...
|
...
|
@@ -120,7 +120,7 @@ public class ReportService implements IReportService { |
|
|
XklAmpReportEntity report = reportRepository.findById(report_id);
|
|
|
if (report == null || report.getStatus() == 0) {
|
|
|
// 报告不存在,返回
|
|
|
return new ResponseEntity<>(ResultModel.error(ResultStatus.REPORT_INVALID__ERROR), HttpStatus.OK);
|
|
|
return new ResponseEntity<>(ResultModel.error(ResultStatus.REPORT_INVALID_ERROR), HttpStatus.OK);
|
|
|
}
|
|
|
|
|
|
// 2. 验证admin
|
...
|
...
|
|