Merge remote-tracking branch 'origin/dev' into dev

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java

@@ -60,15 +60,23 @@
        if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null) {
            resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
        } else {
            manageMenuMapper.insertOne(manageMenu);
            //操作插入日志
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "添加菜单:"+manageMenu.getName()+";";
            logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
            resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
            resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
            return resultMap;
        }
        QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
        wrapper_url.eq("url",manageMenu.getUrl());
        wrapper_url.eq("is_delete",Constants.NOT_DELETE);
        if (manageMenuMapper.selectCount(wrapper_url) != 0) {
            resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
            return resultMap;
        }
        manageMenuMapper.insertOne(manageMenu);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "添加菜单:"+manageMenu.getName()+";";
        logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
    }

@@ -84,37 +92,56 @@
        if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null) {
            resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
        } else {
            //更新之前获取原来的菜单信息
            ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
            manageMenuMapper.updateManageMenuById(map);
            //操作插入日志
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "修改了菜单:"+manageMenuOld.getName()+";";
            for (Object key:map.keySet()) {
                if (key.toString().equals("name")&&map.get(key)!=null){
                    content = content+"菜单名:"+manageMenuOld.getName()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("url")&&map.get(key)!=null){
                    content = content+"url地址:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("icon")&&map.get(key)!=null){
                    content = content+"图标地址:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("parent_id")&&map.get(key)!=null){
            return resultMap;
        }
        if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
            resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
            return resultMap;
        }
        QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
        wrapper_url.eq("url",map.get("url"));
        wrapper_url.eq("is_delete",Constants.NOT_DELETE);
        if (manageMenuMapper.selectCount(wrapper_url) != 0) {
            resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
            resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
            return resultMap;
        }
        //更新之前获取原来的菜单信息
        ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
        manageMenuMapper.updateManageMenuById(map);
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改了菜单:"+manageMenuOld.getName()+";";
        for (Object key:map.keySet()) {
            if (key.toString().equals("name")&&map.get(key)!=null){
                content = content+"菜单名:"+manageMenuOld.getName()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("url")&&map.get(key)!=null){
                content = content+"url地址:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("icon")&&map.get(key)!=null){
                content = content+"图标地址:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("parent_id")&&map.get(key)!=null){
                if (map.get(key).toString().equals("0")){
                    content = content+"父菜单:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->0"+";";
                }else if (manageMenuOld.getId().toString().equals("0")){
                    content = content+"父菜单:"+"0->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
                }else {
                    content = content+"父菜单:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
                }
                if (key.toString().equals("order")&&map.get(key)!=null){
                    content = content+"同一级别菜单顺序:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("desc")&&map.get(key)!=null){
                    content = content+"描述:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
                }
            }
            logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
            resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
            resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
            if (key.toString().equals("order")&&map.get(key)!=null){
                content = content+"同一级别菜单顺序:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
            }
            if (key.toString().equals("desc")&&map.get(key)!=null){
                content = content+"描述:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
            }
        }
        logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
        resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
        resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
        return resultMap;
    }

@@ -237,10 +264,15 @@
    @Override
    public List<Map<String,Object>> getManageMenuByNameFuzzy(Map map) {
        Map limitMap = new HashMap();
        limitMap.put("name", map.get("name"));
        if(!ObjectUtils.isEmpty(map.get("name"))){
            limitMap.put("name", map.get("name"));
        }
        if(!ObjectUtils.isEmpty(map.get("parent_id"))){
            limitMap.put("parent_id", map.get("parent_id"));
        }
        limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
        limitMap.put("number", Integer.parseInt(map.get("size").toString()));
        List<ManageMenu> manageMenus = manageMenuMapper.getManageRoleByNameFuzzy(limitMap);
        List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByNameFuzzy(limitMap);
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> resultList = new ArrayList<>();
        for (ManageMenu manageMenu:manageMenus) {
@@ -266,6 +298,67 @@
    }

    @Override
    public Map<String, Object> getManageMenuByCondition(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
        int current = Integer.parseInt(map.get("current").toString());
        int size = Integer.parseInt(map.get("size").toString());
        Page<ManageMenu> page = new Page<>(current,size);
        QueryWrapper<ManageMenu> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        if(!ObjectUtils.isEmpty(map.get("name"))){
            wrapper.like("name", map.get("name"));
        }
        if(!ObjectUtils.isEmpty(map.get("parent_id"))){
            wrapper.eq("parent_id", map.get("parent_id"));
        }
        Page resultpage = manageMenuMapper.selectPage(page,wrapper);
        List<ManageMenu> manageMenus = resultpage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> manageMenuList = new ArrayList<>();
        for (ManageMenu manageMenu:manageMenus) {
            Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
            if (manageMenu.getParentId().equals(0)){
                manegeMenuMap.put("parent_name","");
            }else {
                ManageMenu parentMenu = manageMenuMapper.getManageMenuById(manageMenu.getParentId());
                if (ObjectUtils.isEmpty(parentMenu)){
                    manegeMenuMap.put("parent_name","");
                }else {
                    String parent_name = parentMenu.getName();
                    manegeMenuMap.put("parent_name",parent_name);
                }
            }
            String createTime = SDF.format(manageMenu.getCreateTime());
            String updateTime = SDF.format(manageMenu.getUpdateTime());
            manegeMenuMap.put("createTime",createTime);
            manegeMenuMap.put("updateTime",updateTime);
            manageMenuList.add(manegeMenuMap);
        }
        resultMap.put("manageMenus",manageMenuList);
        int totalNumber = manageMenuMapper.selectCount(wrapper);
        resultMap.put("totalNumber",totalNumber);
        resultMap.put("current",current);
        resultMap.put("size",size);
        int totalPageNumber = totalNumber/size;
        if(totalNumber%size != 0){
            totalPageNumber += 1;
        }
        resultMap.put("totalPageNumber",totalPageNumber);
        return resultMap;
    }

    @Override
    public Map<String, Object> getManageParentMenu(Map map) {
        Map<String,Object> resultMap = new HashMap();
        QueryWrapper<ManageMenu> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        wrapper.eq("parent_id",0);
        List<ManageMenu> manageMenus = manageMenuMapper.selectList(wrapper);
        resultMap.put("manageMenus",manageMenus);
        return resultMap;
    }

    @Override
    public List<Map<String, Object>> getManageMenuByParentId(Map map) {
        Map limitMap = new HashMap();
        limitMap.put("parent_id", map.get("parent_id"));