From f7247819da5bb13f467bb91b1c10221759a8035e Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 4 May 2023 18:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=B8=8A=E4=BC=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sync/SpsSyncExportStatusController.java   | 38 +++++++++++++++++--
 .../api/req/sync/ManualUploadDataReq.java     | 18 +++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/glxp/api/req/sync/ManualUploadDataReq.java

diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
index e4a420bef..1885232c8 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
@@ -4,21 +4,25 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.system.SyncDataSetDao;
 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.SyncDataSetEntity;
 import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
 import com.glxp.api.req.sync.BasicExportTimeRequest;
+import com.glxp.api.req.sync.ManualUploadDataReq;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.service.sync.BasicDownloadService;
-import com.glxp.api.service.sync.BasicExportService;
-import com.glxp.api.service.sync.BasicExportTimeService;
+import com.glxp.api.res.system.SyncDataSetResponse;
+import com.glxp.api.service.sync.*;
 import com.glxp.api.util.BeanCopyUtils;
 import com.glxp.api.util.RedisUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +43,7 @@ import java.util.List;
 
 @Slf4j
 @RestController
+@RequiredArgsConstructor
 public class SpsSyncExportStatusController {
 
 
@@ -185,4 +190,31 @@ public class SpsSyncExportStatusController {
     }
 
 
+    private final SyncDataSetDao syncDataSetDao;
+    private final HeartService heartService;
+
+    /**
+     * 手动上传数据
+     *
+     * @param req 参数
+     * @return 结果
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/spssync/udiinfo/uploadData")
+    public BaseResponse uploadData(@RequestBody ManualUploadDataReq req) {
+
+        if (req.getExportType() == null || req.getSyncTime() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
+
+        if (syncDataSetEntity.getSyncTime() == null) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK.getCode(), "缺少初始化数据");
+        }
+        heartService.pushData(syncDataSetEntity, req.getSyncTime(), req.getExportType());
+
+        return ResultVOUtils.success();
+    }
+
+
 }
diff --git a/src/main/java/com/glxp/api/req/sync/ManualUploadDataReq.java b/src/main/java/com/glxp/api/req/sync/ManualUploadDataReq.java
new file mode 100644
index 000000000..31e07b154
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/sync/ManualUploadDataReq.java
@@ -0,0 +1,18 @@
+package com.glxp.api.req.sync;
+
+import com.glxp.api.constant.BasicExportTypeEnum;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 手动调用上传数据
+ */
+@Data
+public class ManualUploadDataReq {
+
+    private BasicExportTypeEnum exportType;
+
+    private Date syncTime;
+
+}