Commit 58dba73a authored by 赵啸非's avatar 赵啸非

添加窗口无人值守

parent 9866304a
...@@ -76,7 +76,9 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao ...@@ -76,7 +76,9 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
protected void removeAfter(Long[] ids, Context context, int result) throws AppException { protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<AppInfoFieldEntity> appInfoFieldlist = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(Arrays.asList(ids))); List<AppInfoFieldEntity> appInfoFieldlist = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appInfoFieldlist)) { if (!ObjectUtils.isEmpty(appInfoFieldlist)) {
appInfoFieldService.removeList(appInfoFieldlist, context); Long[] idList = appInfoFieldlist.stream().map(item -> item.getId()).toArray(Long[]::new);
appInfoFieldService.remove(idList, context);
} }
super.removeAfter(ids, context, result); super.removeAfter(ids, context, result);
} }
......
...@@ -353,21 +353,25 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -353,21 +353,25 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
//删除模板属性 //删除模板属性
List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids))); List<AppInfoTempleteFieldEntity> appInfoTempleteFieldDeleteList = appInfoTempleteFieldService.find(new AppInfoTempleteFieldQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) { if (!ObjectUtils.isEmpty(appInfoTempleteFieldDeleteList)) {
appInfoTempleteFieldService.removeList(appInfoTempleteFieldDeleteList, context); Long[] idList = appInfoTempleteFieldDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appInfoTempleteFieldService.remove(idList, context);
} }
//删除版本信息 //删除版本信息
List<AppVersionEntity> appVersionDeleteList = appVersionService.find(new AppVersionQuery().appIdList(Arrays.asList(ids))); List<AppVersionEntity> appVersionDeleteList = appVersionService.find(new AppVersionQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appVersionDeleteList)) { if (!ObjectUtils.isEmpty(appVersionDeleteList)) {
appVersionService.removeList(appVersionDeleteList, context); Long[] idList = appVersionDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appVersionService.remove(idList, context);
} }
//删除数据集 //删除数据集
List<AppDatasetEntity> appDatasetDeleteList = appDatasetService.find(new AppDatasetQuery().appIdList(Arrays.asList(ids))); List<AppDatasetEntity> appDatasetDeleteList = appDatasetService.find(new AppDatasetQuery().appIdList(Arrays.asList(ids)));
if (!ObjectUtils.isEmpty(appDatasetDeleteList)) { if (!ObjectUtils.isEmpty(appDatasetDeleteList)) {
appDatasetService.removeList(appDatasetDeleteList, context); Long[] idLists = appDatasetDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appDatasetService.remove(idLists, context);
List<AppInfoFieldEntity> appInfoFieldDeleteList = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(appDatasetDeleteList.stream().map(AppDatasetEntity::getAppId).collect(Collectors.toList()))); List<AppInfoFieldEntity> appInfoFieldDeleteList = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(appDatasetDeleteList.stream().map(AppDatasetEntity::getAppId).collect(Collectors.toList())));
if (!ObjectUtils.isEmpty(appInfoFieldDeleteList)) { if (!ObjectUtils.isEmpty(appInfoFieldDeleteList)) {
appInfoFieldService.removeList(appInfoFieldDeleteList, context); Long[] idList = appInfoFieldDeleteList.stream().map(item -> item.getId()).toArray(Long[]::new);
appInfoFieldService.remove(idList, context);
} }
} }
......
...@@ -138,7 +138,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -138,7 +138,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery); List<WindowBusinessEntity> windowBusinessEntities = windowBusinessService.find(windowBusinessQuery);
log.info("remove windowBusinessEntities size:{}",windowBusinessEntities.size()); log.info("remove windowBusinessEntities size:{}",windowBusinessEntities.size());
if (!ObjectUtils.isEmpty(windowBusinessEntities)) { if (!ObjectUtils.isEmpty(windowBusinessEntities)) {
List<Long> idList = windowBusinessEntities.stream().map(item -> item.getId()).collect(Collectors.toList()); Long[] idList = windowBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
//windowBusinessService.removeList(windowBusinessEntities, context); //windowBusinessService.removeList(windowBusinessEntities, context);
windowBusinessService.remove(idList, context); windowBusinessService.remove(idList, context);
} }
...@@ -148,7 +148,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W ...@@ -148,7 +148,7 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(windowMatterQuery); List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(windowMatterQuery);
log.info("remove windowMatterEntities size:{}",windowMatterEntities.size()); log.info("remove windowMatterEntities size:{}",windowMatterEntities.size());
if (!ObjectUtils.isEmpty(windowMatterEntities)) { if (!ObjectUtils.isEmpty(windowMatterEntities)) {
List<Long> idList = windowMatterEntities.stream().map(item -> item.getId()).collect(Collectors.toList()); Long[] idList = windowMatterEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
windowMatterService.remove(idList, context); windowMatterService.remove(idList, context);
//windowMatterService.removeList(windowMatterEntities, context); //windowMatterService.removeList(windowMatterEntities, 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