diff --git a/meta-api/src/main/java/com/primihub/controller/FusionResourceController.java b/meta-api/src/main/java/com/primihub/controller/FusionResourceController.java index c740ce5..b20a438 100644 --- a/meta-api/src/main/java/com/primihub/controller/FusionResourceController.java +++ b/meta-api/src/main/java/com/primihub/controller/FusionResourceController.java @@ -1,8 +1,6 @@ package com.primihub.controller; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONValidator; import com.primihub.entity.DataSet; import com.primihub.entity.base.BaseResultEntity; import com.primihub.entity.base.BaseResultEnum; @@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Map; import java.util.Set; @RequestMapping("fusionResource") @@ -80,6 +77,11 @@ public BaseResultEntity getTestDataSet(String id){ return resourceService.getTestDataSet(id); } + @RequestMapping("getDataSets") + public BaseResultEntity getDataSets(@RequestBody Set ids){ + return resourceService.getDataSets(ids); + } + @PostMapping("batchSaveTestDataSet") public BaseResultEntity batchSaveTestDataSet(@RequestBody List dataSets){ if (dataSets == null || dataSets.size()==0) { diff --git a/meta-api/src/main/java/com/primihub/convert/DataResourceConvert.java b/meta-api/src/main/java/com/primihub/convert/DataResourceConvert.java index 8a04291..c4abf16 100644 --- a/meta-api/src/main/java/com/primihub/convert/DataResourceConvert.java +++ b/meta-api/src/main/java/com/primihub/convert/DataResourceConvert.java @@ -62,7 +62,7 @@ public static CopyResourceDto FusionResourceConvertCopyResourceDto(FusionResourc copyResourceDto.setResourceHashCode(po.getResourceHashCode()); copyResourceDto.setResourceState(po.getResourceState()); copyResourceDto.setUserName(po.getUserName()); -// dataSet.setAccessInfo(null); + dataSet.setAccessInfo(""); copyResourceDto.setDataSet(dataSet); return copyResourceDto; } diff --git a/meta-api/src/main/java/com/primihub/service/ResourceService.java b/meta-api/src/main/java/com/primihub/service/ResourceService.java index 9a0e3ef..e86b3e6 100644 --- a/meta-api/src/main/java/com/primihub/service/ResourceService.java +++ b/meta-api/src/main/java/com/primihub/service/ResourceService.java @@ -125,6 +125,7 @@ public BaseResultEntity batchSaveResource(String globalId,List log.info(JSONObject.toJSONString(dataSet)); if (dataSet!=null && !StringUtils.isEmpty(dataSet.getId())){ dataSet.setHolder(1); + dataSet.setAccessInfo(""); DataSet d = dataSetRepository.getDataSetById(dataSet.getId()); if (d==null){ dataSetRepository.insertDataSet(dataSet); @@ -184,6 +185,7 @@ public BaseResultEntity batchSaveTestDataSet(List dataSets){ try { for (DataSet dataSet : dataSets) { dataSet.setHolder(1); + dataSet.setAccessInfo(""); DataSet d = dataSetRepository.getDataSetById(dataSet.getId()); if (d==null){ dataSetRepository.insertDataSet(dataSet); @@ -198,4 +200,8 @@ public BaseResultEntity batchSaveTestDataSet(List dataSets){ } } + + public BaseResultEntity getDataSets(Set ids) { + return BaseResultEntity.success(dataSetRepository.getDataSetByIds(ids)); + } } diff --git a/meta-simple/src/main/java/com/primihub/simple/service/AsyncService.java b/meta-simple/src/main/java/com/primihub/simple/service/AsyncService.java index e022da1..a00191b 100644 --- a/meta-simple/src/main/java/com/primihub/simple/service/AsyncService.java +++ b/meta-simple/src/main/java/com/primihub/simple/service/AsyncService.java @@ -33,7 +33,7 @@ public class AsyncService { @Async public void syncOne(DataSet dataSet){ - dataSet.setAccessInfo(null); + dataSet.setAccessInfo(""); for (String collaborate : collaborates) { syncGatewayApiData(dataSet,collaborate+ SysConstant.ONE_URL); } @@ -42,7 +42,7 @@ public void syncOne(DataSet dataSet){ @Async public void syncMany(List dataSets){ for (DataSet dataSet : dataSets) { - dataSet.setAccessInfo(null); + dataSet.setAccessInfo(""); } for (String collaborate : collaborates) { syncGatewayApiData(dataSets,collaborate+ SysConstant.MANY_URL); @@ -51,7 +51,7 @@ public void syncMany(List dataSets){ @Async public void syncDelete(DataSet dataSet){ - dataSet.setAccessInfo(null); + dataSet.setAccessInfo(""); for (String collaborate : collaborates) { syncGatewayApiData(dataSet,collaborate+ SysConstant.DELETE_URL); }