From 729badbb042bbcd71a1e160b8bc4fa987782ea69 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Fri, 21 Apr 2023 16:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E5=86=85=E5=90=91=E5=A4=96=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java | 2 +-
 .../glxp/api/entity/sync/BasicExportStatusTimeEntity.java    | 5 +++++
 src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java    | 2 +-
 src/main/java/com/glxp/api/service/sync/HeartService.java    | 5 ++---
 src/main/java/com/glxp/api/task/SyncHeartTask.java           | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
index bf7a40bc..19f95213 100644
--- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
+++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
@@ -20,7 +20,7 @@ public enum BasicExportTypeEnum {
     /**
      * 单据类型
      */
-    DOCUMENT_TYPE("document_type", "单据类型"),
+    DOCUMENT_TYPE_DATA("document_type_data", "单据类型"),
 
     /**
      * 其他数据
diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java
index b044f812..60fb37db 100644
--- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java
+++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java
@@ -1,5 +1,7 @@
 package com.glxp.api.entity.sync;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,10 +11,13 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@TableName("basic_export_status_time")
 public class BasicExportStatusTimeEntity {
 
     private Integer id;
+    @TableField("lastUpdateTime")
     private String lastUpdateTime;
+    @TableField("`key`")
     private String key;
     private String remark;
 
diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
index d3b9b01c..24cab3b5 100644
--- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
+++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
@@ -56,7 +56,7 @@ public class SpGetHttpClient {
 
     public BaseResponse<String> postData(BasicExportTypeEnum exportType, Object data) {
         SyncUpLoadRequest build = SyncUpLoadRequest.builder().exportType(exportType).data(data).build();
-        String result = okHttpCli.doPostJson(getIpUrl() + "sps/sync/upload/data", JSONUtil.toJsonStr(build), buildHeader());
+        String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/upload/data", JSONUtil.toJsonStr(build), buildHeader());
         return JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
         });
     }
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 d2d7e804..bec00be7 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -22,7 +22,6 @@ import com.glxp.api.entity.purchase.*;
 import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
-import com.glxp.api.entity.system.SyncDataBustypeEntity;
 import com.glxp.api.entity.system.SyncDataSetEntity;
 import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
 import com.glxp.api.http.sync.SpGetHttpClient;
@@ -221,7 +220,7 @@ public class HeartService {
                     uploadData(exportType, taskId, x -> x.getOtherData(info, taskId, now, syncTime));
                 }
                 break;
-            case DOCUMENT_TYPE:
+            case DOCUMENT_TYPE_DATA:
                 if (needExec(info.getTypeBus(), info.getTypeScan(), info.getTypeThird())) {
                     uploadData(exportType, taskId, x -> x.getDocumentTypeData(info, taskId, now, syncTime));
                 }
@@ -540,7 +539,7 @@ public class HeartService {
      * @return
      */
     private boolean needExec(int... set) {
-        return CollectionUtil.contains(Collections.singleton(set), 1);
+        return Arrays.stream(set).filter(i->i==1).findAny().isPresent();
     }
 
     public void uploadData(BasicExportTypeEnum exportType, String taskId, Function<HeartService, Object> dataMethod) {
diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java
index 0107b7d2..fa769b8b 100644
--- a/src/main/java/com/glxp/api/task/SyncHeartTask.java
+++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java
@@ -20,8 +20,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);