From b3d64f0c7a86d0ba838daf9d3f218a241a6d3218 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Wed, 19 Apr 2023 17:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8A=A5=E6=96=87=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/sync/SpsSyncDownloadController.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
index f2acae98..89c1f2d4 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
@@ -154,7 +154,7 @@ public class SpsSyncDownloadController {
     @GetMapping("sps/sync/basicData")
     public BaseResponse getBasicData() {
         BaseResponse<SpsSyncBasicDataResponse> baseResponse = new BaseResponse<>();
-        SpsSyncBasicDataResponse spsSyncBasicDataResponse = new SpsSyncBasicDataResponse();
+        SpsSyncBasicDataResponse spsSyncBasicDataResponse = null;
         BasicExportStatusEntity one = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
                 .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark())
                 .orderByDesc(BasicExportStatusEntity::getStartTime)
@@ -179,6 +179,7 @@ public class SpsSyncDownloadController {
                     }
                     reader.close();
                     Dict map = JsonUtils.parseMap(str.toString());
+                    spsSyncBasicDataResponse = new SpsSyncBasicDataResponse();
                     // 组装返回数据
                     spsSyncBasicDataResponse.setTaskId(one.getId());
                     spsSyncBasicDataResponse.setHospTypeList((List<BasicHospTypeEntity>) map.get(BasicHospTypeEntity.class.getSimpleName()));
@@ -206,6 +207,7 @@ public class SpsSyncDownloadController {
 //                );
             }
         }
+        baseResponse.setCode(ResultVOUtils.success().getCode());
         baseResponse.setData(spsSyncBasicDataResponse);
         return baseResponse;
     }
@@ -216,7 +218,7 @@ public class SpsSyncDownloadController {
     @GetMapping("sps/sync/otherData")
     public BaseResponse getOtherData() {
         BaseResponse<SpsSyncOtherDataResponse> baseResponse = new BaseResponse<>();
-        SpsSyncOtherDataResponse spsSyncOtherDataResponse = new SpsSyncOtherDataResponse();
+        SpsSyncOtherDataResponse spsSyncOtherDataResponse = null;
         BasicExportStatusEntity one = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
                 .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.OTHER_DATA.getRemark())
                 .orderByDesc(BasicExportStatusEntity::getStartTime)
@@ -241,6 +243,7 @@ public class SpsSyncDownloadController {
                     }
                     reader.close();
                     Dict map = JsonUtils.parseMap(str.toString());
+                    spsSyncOtherDataResponse = new SpsSyncOtherDataResponse();
                     // 组装返回数据
                     spsSyncOtherDataResponse.setTaskId(one.getId());
                     spsSyncOtherDataResponse.setIoCodeLostList((List<IoCodeLostEntity>) map.get(IoCodeLostEntity.class.getSimpleName()));
@@ -260,6 +263,7 @@ public class SpsSyncDownloadController {
 //                );
             }
         }
+        baseResponse.setCode(ResultVOUtils.success().getCode());
         baseResponse.setData(spsSyncOtherDataResponse);
         return baseResponse;
     }