调整

src/main/java/com/glxp/api/constant/StatusEnum.java

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

src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java

@@ -2,32 +2,40 @@ package com.glxp.api.entity.sync;
 
 import java.util.Date;
 
-import com.glxp.api.constant.BasicExportStatusEnum;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@TableName("basic_export_status")
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 public class BasicExportStatusEntity {
 
+    @TableId(type = IdType.INPUT)
     private String id;
+    @TableField(value = "idDatas")
     private String idDatas;
     private Integer status;
     private String type;
+    @TableField(value = "updateTime")
     private Date updateTime;
+    @TableField(value = "scheduleType")
     private Integer scheduleType;
+    @TableField(value = "startTime")
     private Date startTime;
+    @TableField(value = "endTime")
     private Date endTime;
     private String remark;
-    private String cacheFilePath;
-
-    /**
-     * 接收状态 1：接收失败   2：接收成功
-     */
+    @TableField(value = "receiveStatus")
     private Integer receiveStatus;
+    @TableField(value = "cacheFilePath")
+    private String cacheFilePath;
 
 }

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -812,14 +812,14 @@ public class HeartService {
 
     @Transactional(rollbackFor = Exception.class)
     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);
         if (data == null) {
             return;
         }
         BaseResponse<String> baseResponse = spGetHttp.postData(exportType, data);
         if (baseResponse.getCode() != 20000) {
-            status = BasicExportStatusEnum.FAILED.getCode();
+            status = StatusEnum.FAILED.getCode();
         }
         BasicExportStatusEntity exportStatus = BasicExportStatusEntity.builder()
                 .id(taskId)
@@ -1098,7 +1098,7 @@ public class HeartService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
-                        basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS);
+                        basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
 
 
@@ -1165,7 +1165,7 @@ public class HeartService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
-                        basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS);
+                        basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
                 }
@@ -1229,8 +1229,8 @@ public class HeartService {
                 basicDownloadStatusEntity.setUpdateTime(new Date());
                 basicDownloadStatusEntity.setEndTime(new Date());
                 basicDownloadStatusEntity.setIdDatas(exportType.getKey());
-                basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成
-                basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA);
+                basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode()); //下载完成
+                basicDownloadStatusEntity.setType(exportType.getRemark());
                 basicDownloadStatusEntity.setScheduleType(1);
                 basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
                 //通知自助平台任务已完成