From f6239e55136f0b1cc6a4f9a3816f4bf92e608835 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 27 Apr 2023 15:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{BasicExportStatusEnum.java => StatusEnum.java}    | 10 +++++-----
 .../glxp/api/entity/sync/BasicExportStatusEntity.java  |  1 -
 .../java/com/glxp/api/service/sync/HeartService.java   | 10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename src/main/java/com/glxp/api/constant/{BasicExportStatusEnum.java => StatusEnum.java} (66%)

diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java b/src/main/java/com/glxp/api/constant/StatusEnum.java
similarity index 66%
rename from src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java
rename to src/main/java/com/glxp/api/constant/StatusEnum.java
index 2f5c908ff..f0419a240 100644
--- a/src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java
+++ b/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;
diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
index 73886ef0f..5c633ac01 100644
--- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
+++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
@@ -6,7 +6,6 @@ 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 com.glxp.api.constant.BasicExportStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java
index 052f86ec4..6ece8f4fb 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -1059,14 +1059,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(taskId, exportType, data);
         if (baseResponse.getCode() != 20000) {
-            status = BasicExportStatusEnum.FAILED.getCode();
+            status = StatusEnum.FAILED.getCode();
         }
         BasicExportStatusEntity exportStatus = BasicExportStatusEntity.builder()
                 .id(taskId)
@@ -1352,7 +1352,7 @@ public class HeartService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
-                        basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode());
+                        basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
 
 
@@ -1419,7 +1419,7 @@ public class HeartService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
-                        basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode());
+                        basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
                 }
@@ -1483,7 +1483,7 @@ public class HeartService {
                 basicDownloadStatusEntity.setUpdateTime(new Date());
                 basicDownloadStatusEntity.setEndTime(new Date());
                 basicDownloadStatusEntity.setIdDatas(exportType.getKey());
-                basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成
+                basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode()); //下载完成
                 basicDownloadStatusEntity.setType(exportType.getRemark());
                 basicDownloadStatusEntity.setScheduleType(1);
                 try {