Commit c0bb88d2 authored by 赵啸非's avatar 赵啸非

修改app克隆

parent 8ed0eda9
...@@ -101,7 +101,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -101,7 +101,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
AppQuery appQuery = new AppQuery(); AppQuery appQuery = new AppQuery();
appQuery.setAppCode(appEntity.getAppCode()); appQuery.setAppCode(appEntity.getAppCode());
appQuery.setSiteId(siteEntity.getId()); appQuery.setSiteId(siteEntity.getId());
int count = this.count(appQuery, context); int count = this.count(appQuery, context);
if (count == 0) { if (count == 0) {
//不存在,可以克隆当前应用到当前站点 //不存在,可以克隆当前应用到当前站点
...@@ -125,8 +124,11 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -125,8 +124,11 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
BeanUtils.copyProperties(appDatasetEntity, appDatasetClone, BeanUtil.getNullPropertyNames(appDatasetEntity)); BeanUtils.copyProperties(appDatasetEntity, appDatasetClone, BeanUtil.getNullPropertyNames(appDatasetEntity));
appDatasetClone.setAppId(appClone.getId()); appDatasetClone.setAppId(appClone.getId());
appDatasetService.save(appDatasetClone, context); appDatasetService.save(appDatasetClone, context);
//查询属性列表
List<AppInfoFieldEntity> appInfoFieldList = appInfoFieldService.find(new AppInfoFieldQuery().datasetId(appDatasetEntity.getId()));
//保存属性列表 //保存属性列表
List<AppInfoFieldEntity> appInfoFieldList = appDatasetEntity.getAppInfoFieldList(); //List<AppInfoFieldEntity> appInfoFieldList = appDatasetEntity.getAppInfoFieldList();
if (!ObjectUtils.isEmpty(appInfoFieldList)) { if (!ObjectUtils.isEmpty(appInfoFieldList)) {
ArrayList<AppInfoFieldEntity> cloneList = new ArrayList<>(); ArrayList<AppInfoFieldEntity> cloneList = new ArrayList<>();
for (AppInfoFieldEntity appInfoFieldEntity : appInfoFieldList) { for (AppInfoFieldEntity appInfoFieldEntity : appInfoFieldList) {
...@@ -160,7 +162,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -160,7 +162,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
} }
//克隆版本历史 //克隆版本历史
List<AppVersionEntity> appVersionEntities = appVersionService.find(new AppVersionQuery().appId(appEntity.getId())); /* List<AppVersionEntity> appVersionEntities = appVersionService.find(new AppVersionQuery().appId(appEntity.getId()));
if (!ObjectUtils.isEmpty(appVersionEntities)) { if (!ObjectUtils.isEmpty(appVersionEntities)) {
List<AppVersionEntity> appVersionCloneList = new ArrayList<>(); List<AppVersionEntity> appVersionCloneList = new ArrayList<>();
for (AppVersionEntity appVersionEntity : appVersionEntities) { for (AppVersionEntity appVersionEntity : appVersionEntities) {
...@@ -174,7 +176,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -174,7 +176,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
if (!ObjectUtils.isEmpty(appVersionCloneList)) { if (!ObjectUtils.isEmpty(appVersionCloneList)) {
appVersionService.save(appVersionCloneList, context); appVersionService.save(appVersionCloneList, context);
} }
} }*/
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment