diff --git a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/menu/AppWorkPageMation.java b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/menu/AppWorkPageMation.java index 6e28af94..86f5cca8 100644 --- a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/menu/AppWorkPageMation.java +++ b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/userauth/menu/AppWorkPageMation.java @@ -24,7 +24,7 @@ import java.io.Serializable; * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @Data -@TableName(value = "sys_eve_menu_auth_point") +@TableName(value = "app_workbench_page") @ApiModel("APP菜单实体类") public class AppWorkPageMation extends CommonOperatorUserInfo implements Serializable { @@ -68,4 +68,8 @@ public class AppWorkPageMation extends CommonOperatorUserInfo implements Seriali @ApiModelProperty(value = "所属目录id", required = "required") private String parentId; + @TableField(value = "desktop_id") + @ApiModelProperty(value = "所属桌面id", required = "required") + private String desktopId; + } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/AppWorkPageController.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/AppWorkPageController.java index 0d17bfce..51c799d4 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/AppWorkPageController.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/AppWorkPageController.java @@ -5,6 +5,7 @@ package com.skyeye.eve.controller; import com.skyeye.annotation.api.Api; +import com.skyeye.annotation.api.ApiImplicitParam; import com.skyeye.annotation.api.ApiImplicitParams; import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.CommonPageInfo; @@ -115,4 +116,19 @@ public class AppWorkPageController { appWorkPageService.editAppWorkPageDownById(inputObject, outputObject); } + /** + * 根据父目录id获取子目录集合 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "queryAppWorkPageListByParentId", value = "根据父目录id获取子目录集合", method = "GET", allUse = "2") + @ApiImplicitParams({ + @ApiImplicitParam(id = "parentId", name = "parentId", value = "父目录ID", required = "required"), + @ApiImplicitParam(id = "desktopId", name = "desktopId", value = "桌面id")}) + @RequestMapping("/post/AppWorkPageController/queryAppWorkPageListByParentId") + public void queryAppWorkPageListByParentId(InputObject inputObject, OutputObject outputObject) { + appWorkPageService.queryAppWorkPageListByParentId(inputObject, outputObject); + } + } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/AppWorkPageService.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/AppWorkPageService.java index b5b69cc1..a87bd69a 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/AppWorkPageService.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/AppWorkPageService.java @@ -25,4 +25,5 @@ public interface AppWorkPageService { void editAppWorkPageDownById(InputObject inputObject, OutputObject outputObject); + void queryAppWorkPageListByParentId(InputObject inputObject, OutputObject outputObject); } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/AppWorkPageServiceImpl.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/AppWorkPageServiceImpl.java index d6f6834c..61389e40 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/AppWorkPageServiceImpl.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/AppWorkPageServiceImpl.java @@ -262,4 +262,25 @@ public class AppWorkPageServiceImpl implements AppWorkPageService { } } + /** + * 根据父目录id获取子目录集合 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @Override + public void queryAppWorkPageListByParentId(InputObject inputObject, OutputObject outputObject) { + Map map = inputObject.getParams(); + String parentId = map.get("parentId").toString(); + String desktopId = map.get("desktopId").toString(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(MybatisPlusUtil.getDeclaredFieldsInfo2(AppWorkPageMation.class, "parentId"), parentId); + if (StringUtils.isNotEmpty(desktopId)) { + queryWrapper.eq(MybatisPlusUtil.getDeclaredFieldsInfo2(AppWorkPageMation.class, "desktopId"), desktopId); + } + List appWorkPageMationList = appWorkPageDao.selectList(queryWrapper); + outputObject.setBeans(appWorkPageMationList); + outputObject.settotal(appWorkPageMationList.size()); + } + } diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml b/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml index e4e48d67..eb6c8a4f 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/reqmapping/mapping/userauth.xml @@ -269,7 +269,7 @@ - +