master
wj 2 years ago
parent aa9d903fd7
commit f6239e5513

@ -6,17 +6,17 @@ import lombok.Getter;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum BasicExportStatusEnum { public enum StatusEnum {
/** /**
* *
*/ */
FAILED(1, "接收失败"), FAILED(1, "失败"),
/** /**
* *
*/ */
SUCCESS(2, "接收成功"), SUCCESS(2, "成功"),
; ;
@EnumValue @EnumValue
private Integer code; private Integer code;

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.glxp.api.constant.BasicExportStatusEnum;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;

@ -1059,14 +1059,14 @@ public class HeartService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) { public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) {
Integer status = BasicExportStatusEnum.SUCCESS.getCode(); Integer status = StatusEnum.SUCCESS.getCode();
Object data = dataMethod.apply(this); Object data = dataMethod.apply(this);
if (data == null) { if (data == null) {
return; return;
} }
BaseResponse<String> baseResponse = spGetHttp.postData(taskId, exportType, data); BaseResponse<String> baseResponse = spGetHttp.postData(taskId, exportType, data);
if (baseResponse.getCode() != 20000) { if (baseResponse.getCode() != 20000) {
status = BasicExportStatusEnum.FAILED.getCode(); status = StatusEnum.FAILED.getCode();
} }
BasicExportStatusEntity exportStatus = BasicExportStatusEntity.builder() BasicExportStatusEntity exportStatus = BasicExportStatusEntity.builder()
.id(taskId) .id(taskId)
@ -1352,7 +1352,7 @@ public class HeartService {
basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setUpdateTime(new Date());
basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date());
basicDownloadStatusEntity.setRemark(remark.toString()); basicDownloadStatusEntity.setRemark(remark.toString());
basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
@ -1419,7 +1419,7 @@ public class HeartService {
basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setUpdateTime(new Date());
basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date());
basicDownloadStatusEntity.setRemark(remark.toString()); basicDownloadStatusEntity.setRemark(remark.toString());
basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
} }
} }
@ -1483,7 +1483,7 @@ public class HeartService {
basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setUpdateTime(new Date());
basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date());
basicDownloadStatusEntity.setIdDatas(exportType.getKey()); basicDownloadStatusEntity.setIdDatas(exportType.getKey());
basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成 basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode()); //下载完成
basicDownloadStatusEntity.setType(exportType.getRemark()); basicDownloadStatusEntity.setType(exportType.getRemark());
basicDownloadStatusEntity.setScheduleType(1); basicDownloadStatusEntity.setScheduleType(1);
try { try {

Loading…
Cancel
Save