|
|
|
@ -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;
|
|
|
|
|
}
|
|
|
|
|