|
|
@@ -3,9 +3,13 @@ package com.storlead.centre.app;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.storlead.centre.entity.SysAppPageInfoEntity;
|
|
|
import com.storlead.centre.pojo.dto.SysAppInfoQuery;
|
|
|
import com.storlead.centre.pojo.entity.SysAppInfoEntity;
|
|
|
+import com.storlead.centre.pojo.vo.SysAppPageVO;
|
|
|
+import com.storlead.centre.pojo.vo.SysAppVO;
|
|
|
import com.storlead.centre.service.SysAppInfoService;
|
|
|
+import com.storlead.centre.service.SysAppPageInfoService;
|
|
|
import com.storlead.centre.util.CryptoZipUtil;
|
|
|
import com.storlead.centre.util.HttpSecurityCheckUtil;
|
|
|
import com.storlead.framework.common.constant.CommonConstant;
|
|
|
@@ -26,6 +30,7 @@ import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @program: storlead-centre-platform
|
|
|
@@ -41,6 +46,9 @@ public class AppManageApiController {
|
|
|
@Resource
|
|
|
private SysAppInfoService sysAppInfoService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private SysAppPageInfoService sysAppPageInfoService;
|
|
|
+
|
|
|
private static final String SALT_KEY = "G4YfTqX6Kh8cHQy5";
|
|
|
|
|
|
@PostMapping(value = "/save")
|
|
|
@@ -80,6 +88,23 @@ public class AppManageApiController {
|
|
|
LambdaQueryWrapper<SysAppInfoEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(SysAppInfoEntity::getIsDelete, CommonConstant.FALSE_FLAG);
|
|
|
List<SysAppInfoEntity> apps = sysAppInfoService.list(queryWrapper);
|
|
|
+ List<SysAppVO> appTree = SysAppVO.appInfoListToAppTreeVoList(apps);
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(appTree)) {
|
|
|
+ return Result.result(appTree);
|
|
|
+ }
|
|
|
+ LambdaQueryWrapper<SysAppPageInfoEntity> queryWra1 = new LambdaQueryWrapper<>();
|
|
|
+ queryWra1.eq(SysAppPageInfoEntity::getIsDelete, CommonConstant.FALSE_FLAG);
|
|
|
+ List<SysAppPageInfoEntity> appPages = sysAppPageInfoService.list(queryWra1);
|
|
|
+ if (CollectionUtils.isEmpty(appPages)) {
|
|
|
+ return Result.result(appTree);
|
|
|
+ }
|
|
|
+
|
|
|
+ appTree.forEach(e -> {
|
|
|
+ List<SysAppPageInfoEntity> appPagels = appPages.stream().filter(p ->p.getAppId().equals(e.getAppId())).collect(Collectors.toList());
|
|
|
+ List<SysAppPageVO> pageTree = SysAppPageVO.appPageInfoListToAppPageTreeVoList(appPagels);
|
|
|
+ e.setAppPages(pageTree);
|
|
|
+ });
|
|
|
|
|
|
return Result.result(apps);
|
|
|
}
|