多余方法删除

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/controller/AuthApiController.java

@@ -4,15 +4,11 @@ import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunInfoDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.AppResourcesDto;
-import com.dragoninfo.dcuc.auth.auth.dto.ApprovalDto;
 import com.dragoninfo.dcuc.auth.auth.dto.RoleApiDto;
-import com.dragoninfo.dcuc.auth.auth.facade.IApprovalFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v3.vo.AppFunInfoApiVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.controller.pojo.FunAppovalParamVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.controller.pojo.RoleApiParamVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.controller.pojo.UpdataAppFunVO;
 import com.dragoninfo.duceap.core.enums.ResultEnum;
@@ -48,8 +44,6 @@ public class AuthApiController {
     @Autowired
     private IRoleFacade roleFacade;
     @Autowired
-    private IApprovalFacade iApprovalFacade;
-    @Autowired
     private IApplyInfoFacade applyInfoFacade;
     @Autowired
     private IAppFunInfoFacade iAppFunInfoFacade;
@@ -95,61 +89,8 @@ public class AuthApiController {
         return roleFacade.getRolesByAppCodeAndUserId(appCode, userId);
     }
 
-    /**
-     * 动态授权申请
-     *
-     * @param appCode        应用代码
-     * @param roleCode       角色代码
-     * @param userIdCard     申请人身份证
-     * @param approvalIdCard 审批人身份证
-     * @param reason         申请事由
-     * @return
-     */
-    @ApiOperation(value = "动态授权申请")
-    @ApiImplicitParams({@ApiImplicitParam(name = "appCode", value = "应用代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "roleCode", value = "角色代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "userIdCard", value = "用户身份证号", required = true
-            , example = "340111197810194754"), @ApiImplicitParam(name = "approvalIdCard", value = "审批人身份证", required = true
-            , example = "340111197810194754"), @ApiImplicitParam(name = "reason", value = "申请事由", required = true
-            , example = "340111197810194754")})
-    @GetMapping(value = "/auth/apply")
-    @ResponseBody
-    public ResponseDTO proposer(
-            @RequestParam(value = "appCode", required = true) String appCode,
-            @RequestParam(value = "roleCode", required = true) String roleCode,
-            @RequestParam(value = "userIdCard", required = true) String userIdCard,
-            @RequestParam(value = "approvalIdCard", required = true) String approvalIdCard,
-            @RequestParam(value = "reason", required = true) String reason) {
-//        http://172.16.105.196:8888/dcuc/api/auth/apply?appCode=YHZX0000000000000001&roleCode=MANAGER_APP&userIdCard=000000000000000001&approvalIdCard=000000000000000001&reason=111
-        return iApprovalFacade.authApply(appCode, roleCode, userIdCard, approvalIdCard, reason);
-    }
 
-    /**
-     * 动态授权的角色功能获取
-     *
-     * @param appCode    应用代码
-     * @param roleCode   角色代码
-     * @param userIdCard 申请批人身份证
-     * @return
-     */
-    @ApiOperation(value = "动态授权的角色功能获取")
-    @ApiImplicitParams({@ApiImplicitParam(name = "appCode", value = "应用代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "roleCode", value = "角色代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "userIdCard", value = "用户身份证号", required = true
-            , example = "340111197810194754")})
-    @GetMapping(value = "/auth/applyResult")
-    @ResponseBody
-    public ResponseDTO getProposerFuns(
-            @RequestParam(value = "appCode", required = true) String appCode,
-            @RequestParam(value = "roleCode", required = true) String roleCode,
-            @RequestParam(value = "userIdCard", required = true) String userIdCard) {
-        ApprovalDto approvalDto = new ApprovalDto();
-        approvalDto.setAppCode(appCode);
-        approvalDto.setRoleCode(roleCode);
-        approvalDto.setUserIdCard(userIdCard);
-//        http://172.16.105.196:8888/dcuc/api/auth/applyResult?appCode=YHZX0000000000000001&roleCode=MANAGER_APP&userIdCard=000000000000000001
-        return iApprovalFacade.applyResult(approvalDto);
-    }
+
 
     /**
      * 1.1
@@ -232,41 +173,6 @@ public class AuthApiController {
         }
     }
 
-
-    /**
-     * 1.4
-     * 动态授权
-     *
-     * @param vo
-     * @return
-     */
-    @ApiOperation(value = "动态授权")
-    @ApiImplicitParams({@ApiImplicitParam(name = "FunAppovalParamVo", value = "动态授权")})
-    @RequestMapping("/pushData")
-    @ResponseBody
-    public Result pushData(@RequestBody FunAppovalParamVo vo) {
-        String appCode = vo.getAppCode();
-        String roleCode = vo.getRoleCode();
-        String userIdCard = vo.getProposerIdcard();
-        String approvalIdCard = vo.getApprpvalIdcard();
-        String reason = vo.getProposerReason();
-        if (StringUtils.isEmpty(appCode) || StringUtils.isEmpty(roleCode)
-                || StringUtils.isEmpty(approvalIdCard) || StringUtils.isEmpty(userIdCard)
-                || StringUtils.isEmpty(vo.getVerifiy()) || StringUtils.isEmpty(vo.getProposerOrg())) {
-            return Result.fail("必填参数不能为空");
-        }
-        AuthUserDTO proposerUserInfo = authUserInfoFacade.findByIdcard(userIdCard);
-        if (proposerUserInfo == null || !proposerUserInfo.getOrgId().equals(vo.getProposerOrg())) {
-            return Result.fail("申请人不存在或机构错误");
-        }
-        ResponseDTO responseDTO = iApprovalFacade.authApply(appCode, roleCode, userIdCard, approvalIdCard, reason);
-        if (ResponseDTO.FAIL_CODE.equals(responseDTO.getStatusCode())) {
-            return Result.fail(responseDTO.getMessage());
-        }
-        return Result.success();
-    }
-
-
     /**
      * 1.5
      * 获取权限列表成功

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/approval/ApprovalController.java

@@ -1,119 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.approval;
-
-
-import com.dragoninfo.dcuc.auth.auth.dto.ApprovalDto;
-import com.dragoninfo.dcuc.auth.auth.entity.FuncApproval;
-import com.dragoninfo.dcuc.auth.auth.facade.IApprovalFacade;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthOrgDTO;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthOrgInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.approval.vo.FuncApprovalVo;
-import com.dragoninfo.duceap.core.response.Result;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
-import com.dragonsoft.duceap.web.annotation.Permission;
-import io.swagger.annotations.*;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-@Api(tags = {"动态授权管理接口"})
-@Permission(value = "power_config")
-@RestController
-@RequestMapping(value = "approsvr/v2/approval/")
-public class ApprovalController {
-    @Autowired
-    private IApprovalFacade iApprovalFacade;
-    @Autowired
-    private IAuthOrgInfoFacade authOrgInfoFacade;
-    @Autowired
-    private IAuthUserInfoFacade authUserInfoFacade;
-
-    @ApiOperation(value = "获取动态授权信息列表")
-    @ApiImplicitParam(name = "searchDTO", value = "查询条件", paramType = "body",
-            examples = @Example({
-                    @ExampleProperty(value = "{'appName_like':'应用名称','roleName_like':'角色名称','proposerName_like':'申请人'," +
-                            "'proposerOrg_eq':'id申请机构id','approvalStatus_eq':'申请状态'}",
-                            mediaType = "application/json")
-            }))
-    @PostMapping(value = "_search")
-    public Result<List<FuncApproval>> approvalPage(SearchDTO searchDTO) {
-        Page<FuncApproval> page = iApprovalFacade.approvalPage(searchDTO);
-        page.getContent().stream().forEach(this::setValues);
-        return Result.success(page.getTotalElements(), page.getContent());
-    }
-
-
-    @ApiOperation(value = "同意授权")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id"),
-            @ApiImplicitParam(name = "hasTime", value = "hasTime,0：不存在时间限制 1：存在时间限制。"),
-            @ApiImplicitParam(name = "validTime", value = "授权截止时间 格式：yyyyMMddHHmmss", paramType = "string")
-    })
-    @PutMapping(value = "agree")
-    public Result agree(@RequestBody FuncApprovalVo funcApprovalVo) {
-        ApprovalDto approvalDto = new ApprovalDto();
-        BeanUtils.copyProperties(funcApprovalVo, approvalDto);
-        ResponseStatus responseStatus = iApprovalFacade.agree(approvalDto);
-        Result result = dealResponseStatus(responseStatus);
-        return result;
-    }
-
-    @ApiOperation(value = "拒绝授权")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id"),
-            @ApiImplicitParam(name = "approvalOpinion", value = "拒绝意见"),
-    })
-    @PutMapping(value = "disagree")
-    public Result disagree(@RequestBody FuncApprovalVo funcApprovalVo) {
-        ApprovalDto approvalDto = new ApprovalDto();
-        BeanUtils.copyProperties(funcApprovalVo, approvalDto);
-        ResponseStatus responseStatus = iApprovalFacade.disagree(approvalDto);
-        Result result = dealResponseStatus(responseStatus);
-        return result;
-
-    }
-
-    @ApiOperation(value = "获取详情")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", name = "id", value = "授权ID", required = true
-            , example = "40288a8b699fc2500169a33b20540000")})
-    @GetMapping(value = "detail/{id}")
-    public Result<FuncApprovalVo> toDetail(@PathVariable("id") String id) {
-        FuncApproval approval = iApprovalFacade.detail(id);
-        setValues(approval);
-        FuncApprovalVo vo = new FuncApprovalVo();
-        BeanUtils.copyProperties(approval, vo);
-        if (approval.getValidTime() != null) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            vo.setValidTime(format.format(approval.getValidTime()));
-        }
-
-        return Result.success(vo);
-    }
-
-    private FuncApproval setValues(FuncApproval approval) {
-        AuthOrgDTO orgInfo = authOrgInfoFacade.get(approval.getProposerOrg());
-        if (orgInfo != null) {
-            approval.setOrgName(orgInfo.getFullName());
-        }
-        AuthUserDTO approvalUser = authUserInfoFacade.get(approval.getApprovalId());
-        if (orgInfo != null) {
-            approval.setApprovalName(approvalUser.getName());
-        }
-        return approval;
-    }
-
-
-    private Result dealResponseStatus(ResponseStatus responseStatus) {
-        if (ResponseStatus.SUCCESS_CODE.equals(responseStatus.getStatusCode())) {
-            return Result.success(responseStatus.getMessage());
-        } else {
-            return Result.fail(responseStatus.getMessage());
-        }
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/approval/vo/FuncApprovalVo.java

@@ -1,110 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.approval.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-
-@Data
-@ApiModel(value = "动态授权资源Vo")
-public class FuncApprovalVo {
-
-    //编号
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    //应用ID
-    @ApiModelProperty(value = "应用ID")
-    private String appId;
-
-    //应用名称
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-
-    //功能id
-    @ApiModelProperty(value = "功能id")
-    private String funcId;
-
-    //功能名称
-    @ApiModelProperty(value = "功能名称")
-    private String funcName;
-
-    //角色id
-    @ApiModelProperty(value = "角色id")
-    private String roleId;
-
-    //申请单位
-    @ApiModelProperty(value = "申请单位")
-    private String proposerOrg;
-
-    //申请人
-    @ApiModelProperty(value = "申请人id")
-    private String proposerId;
-
-    //申请人身份证
-    @ApiModelProperty(value = "申请人身份证")
-    private String proposerIdcard;
-
-    //申请时间
-    @ApiModelProperty(value = "申请时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date proposerTime;
-
-    //申请事由
-    @ApiModelProperty(value = "申请事由")
-    private String proposerReason;
-
-    //审核状态：-1：审批中 0：未通过 1：通过
-    @ApiModelProperty(value = "审核状态")
-    private String approvalStatus;
-
-    //审批意见
-    @ApiModelProperty(value = "审批意见")
-    private String approvalOpinion;
-
-    //审批时间
-    @ApiModelProperty(value = "审批时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date approvalTime;
-
-    //审批人
-    @ApiModelProperty(value = "审批人id")
-    private String approvalId;
-
-    //有效标志(0：无效 1：有效)
-    @ApiModelProperty(value = "有效标志")
-    private String isActive;
-
-    //角色名称
-    @ApiModelProperty(value = "角色名称")
-    private String roleName;
-
-    //申请人名称
-    @ApiModelProperty(value = "申请人名称")
-    private String proposerName;
-
-    //调用次数
-    @ApiModelProperty(value = "调用次数")
-    private int callTime;
-
-    //申请人机构名称
-    @ApiModelProperty(value = "申请人机构名称")
-    private String orgName;
-
-    //审批人名称
-    @ApiModelProperty(value = "审批人名称")
-    private String approvalName;
-
-    //审批人名称
-    @ApiModelProperty(value = "hasTime,0：不存在时间限制 1：存在时间限制")
-    private String hasTime;
-
-    //审批人名称
-    @ApiModelProperty(value = "权限有效期限 格式：yyyyMMddHHmmss")
-    private String validTime;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/AppFunInfoController.java

@@ -4,11 +4,9 @@ package com.dragoninfo.dcuc.authweb.restcontroller.auth;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunTreeDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.AppFunInfo;
 import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
-import com.dragoninfo.dcuc.auth.auth.vo.EventInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.TreeInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.appfun.RespAppFunTreeVo;
 import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
-import com.dragoninfo.dcuc.auth.power.facade.IFunEventFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.AppFunTreeVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -32,7 +30,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -53,9 +50,6 @@ public class AppFunInfoController {
     @Autowired
     private IAppFunInfoFacade iAppFunInfoFacade;
 
-    @Autowired
-    private IFunEventFacade iFunEventFacade;
-
     /**
      * 获取所有菜单信息列表
      *
@@ -103,9 +97,6 @@ public class AppFunInfoController {
     public Result<List<Map<String, Object>>> getMenu(@PathVariable("appId") String appId) {
         //获取该应用的所有节点
         List<TreeInfoVO> appAllTreeList = iAppFunInfoFacade.getAllTreeList(appId, BooleanEnum.TRUE.value);
-        for (TreeInfoVO treeInfoVO : appAllTreeList) {
-            getPreterMission(treeInfoVO);
-        }
         List<Map<String, Object>> maps = TreeNodeUtils.generateTree(appAllTreeList, new SimpleTreeNodeItemResolver("code", "pid"));
         for (Map<String, Object> map : maps) {
             List children = (List) map.get("children");
@@ -202,88 +193,4 @@ public class AppFunInfoController {
         return Result.success(treeVos);
     }
 
-
-    public List<TreeInfoVO> getChildTreeObjects(List<TreeInfoVO> list,
-                                                String parentCode) {
-        List<TreeInfoVO> returnList = new ArrayList<TreeInfoVO>();
-        for (Iterator<TreeInfoVO> iterator = list.iterator(); iterator
-                .hasNext(); ) {
-            TreeInfoVO treeInfoVo = iterator.next();
-            //获取指定parentCode节点的子节点列表
-            String treePid = null;
-            if (null == treeInfoVo.getPid()) {
-                treePid = "";
-            } else {
-                treePid = treeInfoVo.getPid();
-            }
-
-            //获取指定parentCode节点的子节点列表
-            if (parentCode.equals(treePid)) {
-                //递归获取当前节点的子节点
-                recursionFn(list, treeInfoVo);
-
-                getPreterMission(treeInfoVo);
-
-                returnList.add(treeInfoVo);
-            }
-        }
-        return returnList;
-    }
-
-    public void recursionFn(List<TreeInfoVO> list, TreeInfoVO t) {
-        //获取子节点列表
-        List<TreeInfoVO> childsList = getChildList(list, t);
-        // 设置子节点列表
-        t.setChildren(childsList);
-
-        for (TreeInfoVO nextChild : childsList) {
-            // 判断子节点是否有子节点
-            if (hasChild(list, nextChild)) {
-                // 有子节点,递归获取
-                recursionFn(list, nextChild);
-                /*
-                Iterator<TreeInfoVO> it = childsList.iterator();
-				while (it.hasNext()) {
-					TreeInfoVO node = it.next();
-					//递归获取子节点
-					recursionFn(list, node);
-				}
-				*/
-            }
-
-            getPreterMission(nextChild);
-
-        }
-    }
-
-    public static List<TreeInfoVO> getChildList(List<TreeInfoVO> list, TreeInfoVO t) {
-        List<TreeInfoVO> childsList = new ArrayList<TreeInfoVO>();
-        Iterator<TreeInfoVO> it = list.iterator();
-        while (it.hasNext()) {
-            TreeInfoVO child = it.next();
-            if (t.getId().equals(child.getPid())) {
-                childsList.add(child);
-            }
-        }
-        return childsList;
-    }
-
-    public static boolean hasChild(List<TreeInfoVO> list, TreeInfoVO t) {
-        return getChildList(list, t).size() > 0;
-    }
-
-    /**
-     * 组装菜单按钮
-     *
-     * @param nextChild
-     */
-    public void getPreterMission(TreeInfoVO nextChild) {
-        List<EventInfoVO> eventInfoVOList = iFunEventFacade.getEventByTreeId(nextChild.getId());
-        String pretermission = "";
-
-        for (EventInfoVO eventInfoVO : eventInfoVOList) {
-            pretermission += "&nbsp;&nbsp;<input name='" + nextChild.getId() + "' type='checkbox' flag='common' value='" + eventInfoVO.getId() + "' />" + eventInfoVO.getName() + "";
-        }
-        nextChild.setDesc(pretermission);
-    }
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/FunEventController.java

@@ -1,119 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.auth;
-
-import com.dragoninfo.dcuc.auth.auth.entity.AppFunInfo;
-import com.dragoninfo.dcuc.auth.auth.entity.FunEvent;
-import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
-import com.dragoninfo.dcuc.auth.power.facade.IFunEventFacade;
-import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.FunEventVo;
-import com.dragoninfo.duceap.core.response.Result;
-import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
-import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import com.dragonsoft.duceap.core.search.Searchable;
-import com.dragonsoft.duceap.core.search.filter.Condition;
-import com.dragonsoft.duceap.web.annotation.Permission;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Api(tags = {"授权模块-事件管理接口"})
-@RestController
-@RequestMapping(value = "authsvr/v2/funevent")
-public class FunEventController {
-
-    public static Logger logger = LoggerFactory.getLogger(FunEventController.class);
-
-    @Autowired
-    private IFunEventFacade iFunEventFacade;
-
-    @Autowired
-    private IAppFunInfoFacade iAppFunInfoFacade;
-
-
-    /**
-     * 菜单列表
-     * @param searchDTO
-     * @return
-     */
-    @ApiOperation(value = "根据功能菜单id获取菜单的功能事件列表")
-    @ApiImplicitParam(name = "searchable", value = "查询条件,pkMenuId可为空")
-    @GetMapping(value = "/menuList")
-    public Result<List<FunEventVo>> menuList(SearchDTO searchDTO) {
-        Searchable searchable = Searchable.toSearchable(searchDTO);
-        Condition condition = searchable.getSearchFilterByKey("pkMenuId_eq");
-        List<FunEventVo> resultList = new ArrayList<>();
-        String pkMenuId = null;
-        if(null !=condition) pkMenuId = (String) condition.getValue();
-        List<FunEvent> funEvents = iFunEventFacade.getMenuData(pkMenuId, searchDTO);
-        for (FunEvent funEvent : funEvents) {
-            FunEventVo vo = new FunEventVo();
-            BeanUtils.copyProperties(funEvent,vo);
-            resultList.add(vo);
-        }
-        return Result.success(resultList);
-    }
-
-    /**
-     *
-     * @param appFunInfoVo
-     * @return
-     */
-    @ApiOperation(value = "保存应用菜单")
-    @Permission(value = "power_config")
-    @PutMapping(value = "/funEvent",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Result updateFunEvent(@RequestBody AppFunInfoVo appFunInfoVo) {
-        Result result;
-//        String menuId = request.getParameter("menuId");
-        String id = appFunInfoVo.getId();
-        ResponseDTO responseDTO;
-        String message;
-        AppFunInfo appFunInfo = new AppFunInfo();
-        BeanUtils.copyProperties(appFunInfoVo,appFunInfo);
-        if (StringUtils.isBlank(id)) {
-            message = "保存";
-            //id设置为null,避免detached entity passed to persist 异常
-            appFunInfo.setId(null);
-            responseDTO = iAppFunInfoFacade.save(appFunInfo);
-        } else {
-            message = "更新";
-            appFunInfo.setId(id);
-            responseDTO = iAppFunInfoFacade.update(appFunInfo);
-        }
-        if(ResponseStatus.SUCCESS_CODE.equals(responseDTO.getStatusCode())){
-            result = Result.success(message + "成功");
-        }else {
-            result = Result.fail(message+"失败");
-        }
-        return result;
-    }
-
-    @ApiOperation(value = "删除应用菜单,如果(应用菜单)该节点下有子节点也进行删除")
-    @ApiImplicitParams({@ApiImplicitParam(name = "deletedId", value = "菜单id"),@ApiImplicitParam(name = "appId", value = "应用id")})
-    @Permission(value = "power_config")
-    @DeleteMapping(value = "/menu",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Result deleteMenu(@RequestParam("deletedId") String deletedId,@RequestParam("appId") String appId) {
-        Result result;
-        try {
-            if (deletedId != null) {
-                iAppFunInfoFacade.deleteMenuAll(deletedId, appId);
-            }
-            result = Result.success("删除成功");
-        } catch (Exception e) {
-            result = Result.fail("删除异常");
-            logger.error("删除异常", e);
-        }
-        return result;
-    }
-}