大屏后台管理代码update

ZhuDongming

2019-11-28 70830c5b2e96cc1c76d4adb88ddced55e7476547

大屏后台管理代码update

 src/main/java/com/moral/controller/AccountRoleController.java

File was deleted

 src/main/java/com/moral/controller/MenuController.java

@@ -1,6 +1,10 @@
package com.moral.controller;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

import javax.annotation.Resource;

@@ -14,6 +18,8 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Menu;
import com.moral.mapper.MenuMapper;
import com.moral.mapper.RoleMenuMapper;
import com.moral.service.AccountService;
import com.moral.service.ChannelService;
import com.moral.service.MenuService;
@@ -24,6 +30,12 @@
public class MenuController {
    @Resource
    MenuService menuService;

    @Resource
    MenuMapper menuMapper;

    @Resource
    RoleMenuMapper roleMenuMapper;

    @Resource
    ChannelService channelService;
@@ -79,4 +91,56 @@
        Map<String,Object> mapResult = accountService.getMenuListsByAccountName(accountName);
        return mapResult;
    }

    @GetMapping("getZNodes")
    public List<Map<String,Object>> getZNodes(Integer roleId) {
        List<Map<String,Object>> zNodes= new ArrayList<>();
        List<Integer> channelIds = menuMapper.getChannelId();
        List<Integer> channels= roleMenuMapper.getChannels(roleId);
        List<Integer> menus=roleMenuMapper.getMenus(roleId);
        List<Menu> menuList=menuService.getZNodes();
        for(Integer channelId:channelIds){
            Map<String,Object> channelNodeMap=new LinkedHashMap<>();
            channelNodeMap.put("id",channelId);
            channelNodeMap.put("pId",0);
            if (Objects.equals(channelId, 1)) {
                channelNodeMap.put("name", "大屏");
            } else if (Objects.equals(channelId, 2)) {
                channelNodeMap.put("name", "web管理");
            }else if (Objects.equals(channelId, 3)) {
                channelNodeMap.put("name", "运维APP");
            }else if(Objects.equals(channelId, 4)){
                channelNodeMap.put("name", "企业客户端APP");
            }
            channelNodeMap.put("open",true);
            for(Integer roleHasChannelId:channels){
                if(roleHasChannelId.equals(channelId)){
                    channelNodeMap.put("checked",true);
                }
            }
            zNodes.add(channelNodeMap);
        }
        for(Menu menu:menuList){
            Map<String,Object> childNodeMap=new LinkedHashMap<>();
            childNodeMap.put("id",menu.getMenuOrder());
            childNodeMap.put("pId",menu.getMenuParentId());
            childNodeMap.put("name", menu.getMenuName());
            if(menu.getMenuOrder().toString().length()==2){
                childNodeMap.put("open",true);
            }
            for(Integer roleHasMenuId:menus){
                if(roleHasMenuId.equals(menu.getId())){
                    childNodeMap.put("checked", true);
                }
            }
            zNodes.add(childNodeMap);
        }
        return zNodes;
    }

    @GetMapping("menuOrders")
    public List<Integer> getMenuOrders(Integer roleId) {
        List<Integer> menuOrders=menuService.getMenuOrders(roleId);
        return menuOrders;
    }
}

 src/main/java/com/moral/controller/RoleController.java

@@ -72,4 +72,18 @@
        return resultBean;
    }

    @PostMapping("allot-menu/{id}")
    public ResultBean allotMenu(@PathVariable("id") Integer roleId, @RequestBody Integer [] menuOrders){
        ResultBean resultBean = new ResultBean();
        if(roleId==null){
            resultBean.setCode(ResultBean.NO_PERMISSION);
            resultBean.setMessage("角色ID不能为null");
            return resultBean;
        }else{
            roleService.allotMenu(roleId,menuOrders);
            resultBean.setCode(ResultBean.SUCCESS);
        }
        return resultBean;
    }

}

 src/main/java/com/moral/controller/RoleMenuController.java

File was deleted

 src/main/java/com/moral/entity/RoleMenu.java

@@ -13,6 +13,8 @@

    private Integer menuId;

    private Integer channelId;

    @Transient
    private Role role;


 src/main/java/com/moral/mapper/AccountMapper.java

 src/main/java/com/moral/mapper/AccountRoleMapper.java

@@ -1,18 +1,8 @@
package com.moral.mapper;

import java.util.List;

import com.moral.common.mapper.BaseMapper;
import com.moral.entity.AccountRole;

import tk.mybatis.mapper.entity.Example;


public interface AccountRoleMapper extends BaseMapper<AccountRole> {

    List<AccountRole> getAccountRoleList(Example example);

    int updateByPrimaryKey(AccountRole accountRole);

    int deleteByPrimaryKeyOwn(Integer id);
}

 src/main/java/com/moral/mapper/MenuMapper.java

@@ -20,6 +20,10 @@

    List<Menu> getParentMenuList(@Param("menuName") String menuName);

    List<Menu> getMenuListByName(@Param("menuName") String menuName);
    List<Integer> getChannelId();

    List<Menu> getMenuListInfo();

    List<Integer> getMenuOrdersByRoleId(@Param("roleId") Integer roleId);

}

 src/main/java/com/moral/mapper/RoleMapper.java

@@ -2,18 +2,12 @@

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Role;

import tk.mybatis.mapper.entity.Example;

public interface RoleMapper extends BaseMapper<Role> {

    int updateByPrimaryKey(Role role);

    List<Role> getRoleListByName(@Param("roleName") String roleName);

    List<Role> getRoleList(Example example);


 src/main/java/com/moral/mapper/RoleMenuMapper.java

@@ -2,17 +2,15 @@

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.moral.common.mapper.BaseMapper;
import com.moral.entity.RoleMenu;

import tk.mybatis.mapper.entity.Example;

public interface RoleMenuMapper extends BaseMapper<RoleMenu> {

    List<RoleMenu> getRoleMenuList(Example example);
    List<Integer> getChannels(@Param("roleId") Integer roleId);

    int deleteByPrimaryKeyOwn(Integer id);

    int updateByPrimaryKey(RoleMenu roleMenu);
    List<Integer> getMenus(@Param("roleId") Integer roleId);

}

 src/main/java/com/moral/service/AccountRoleService.java

File was deleted

 src/main/java/com/moral/service/AccountService.java

@@ -32,8 +32,6 @@
    

    Map<String, Object> getOrganizationIdByAccountId(String id);



    List<Account> getAccountList(String accountName);



    List<Role> getRolesByAccountName(String accountName);



    Map<String, Object> getMenuListsByAccountName(String accountName);


 src/main/java/com/moral/service/MenuService.java

@@ -18,5 +18,7 @@

    void deleteByIds(Integer[] ids);

    List<Menu> getMenuListByName(String menuName);
    List<Menu> getZNodes();

    List<Integer> getMenuOrders(Integer roleId);
}

 src/main/java/com/moral/service/RoleMenuService.java

File was deleted

 src/main/java/com/moral/service/RoleService.java

@@ -11,8 +11,6 @@

    int countByExample(PageBean pageBean);

    List<Role> getRoleListByName(String roleName);

    PageBean getRoleList(PageBean pageBean);

    PageBean queryByPageBean(PageBean pageBean);
@@ -22,4 +20,6 @@
    List<Integer> getRoleIds(int accountId);

    void allotRole(Integer accountId, Integer[] roleIds);

    void allotMenu(Integer roleId, Integer[] menuOrders);
}

 src/main/java/com/moral/service/impl/AccountRoleServiceImpl.java

File was deleted

 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -36,7 +36,6 @@
import com.moral.entity.Organization;

import com.moral.entity.Role;

import com.moral.mapper.AccountMapper;

import com.moral.mapper.MenuMapper;

import com.moral.mapper.OrganizationMapper;

import com.moral.service.AccountService;

import com.moral.service.OrganizationService;

@@ -88,10 +87,12 @@
        account.setAccountName(accountName);

        return accountMapper.selectOne(account);

    }



    @Override

    public Account getAccountById(Integer id){

        return accountMapper.selectByPrimaryKey(id);

    }



    @Override

    public void setOrgIdsByAccount(Map<String, Object> parameters) {

        String accountId = parameters.get("accountId").toString();

@@ -217,12 +218,6 @@
        Integer accountId = Integer.parseInt(id);

        Map<String, Object> map = accountMapper.getOrganizationIdByAccountId(accountId);

        return map;

    }



    @Override

    public List<Account> getAccountList(String accountName) {

        List<Account> accountList = accountMapper.getAccountList(accountName);

        return accountList;

    }



    @Override


 src/main/java/com/moral/service/impl/MenuServiceImpl.java

@@ -1,5 +1,6 @@
package com.moral.service.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.Iterator;
@@ -7,6 +8,7 @@

import javax.annotation.Resource;

import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -16,9 +18,9 @@
import com.moral.common.util.ExampleUtil;
import com.moral.entity.Menu;
import com.moral.mapper.MenuMapper;
import com.moral.mapper.RoleMenuMapper;
import com.moral.service.MenuService;
import com.moral.util.TkMybatisUtils;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;

import tk.mybatis.mapper.entity.Example;

@@ -29,6 +31,9 @@

    @Resource
    private MenuMapper menuMapper;

    @Resource
    private RoleMenuMapper roleMenuMapper;

    @Override
    @Transactional
@@ -116,8 +121,29 @@
    }

    @Override
    public List<Menu> getMenuListByName(String menuName) {
        List<Menu> menuList = menuMapper.getMenuListByName(menuName);
        return menuList;
    public List<Menu> getZNodes() {
        List<Menu> menuList = menuMapper.getMenuListInfo();
        List<Menu> zNodes = new ArrayList<>();
        for (Menu menu : menuList) {
            if (menu.getMenuOrder().toString().length() == 2) {
                menu.setMenuParentId(Integer.valueOf(menu.getMenuOrder().toString().substring(0, 1)));
            } else if (menu.getMenuOrder().toString().length() == 3) {
                menu.setMenuParentId(Integer.valueOf(menu.getMenuOrder().toString().substring(0, 2)));
            }
            zNodes.add(menu);
        }
        return zNodes;
    }

    @Override
    public List<Integer> getMenuOrders(Integer roleId) {
        List<Integer> menuOrders = menuMapper.getMenuOrdersByRoleId(roleId);
        List<Integer> channels = roleMenuMapper.getChannels(roleId);
        if (CollectionUtils.isNotEmpty(channels)) {
            for (Integer channel : channels) {
                menuOrders.add(channel);
            }
        }
        return menuOrders;
    }
}

 src/main/java/com/moral/service/impl/RoleMenuServiceImpl.java

File was deleted

 src/main/java/com/moral/service/impl/RoleServiceImpl.java

@@ -3,7 +3,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.annotation.Resource;

@@ -16,9 +18,13 @@
import com.moral.common.util.ExampleUtil;
import com.moral.common.util.MyBatisBaseMapUtil;
import com.moral.entity.AccountRole;
import com.moral.entity.Menu;
import com.moral.entity.Role;
import com.moral.entity.RoleMenu;
import com.moral.mapper.AccountRoleMapper;
import com.moral.mapper.MenuMapper;
import com.moral.mapper.RoleMapper;
import com.moral.mapper.RoleMenuMapper;
import com.moral.service.RoleService;
import com.moral.util.TkMybatisUtils;

@@ -31,6 +37,12 @@

    @Resource
    RoleMapper roleMapper;

    @Resource
    RoleMenuMapper roleMenuMapper;

    @Resource
    MenuMapper menuMapper;

    @Resource
    AccountRoleMapper accountRoleMapper;
@@ -65,12 +77,6 @@
        Example example = ExampleUtil.generateExample(ENTITY_CLASS, pageBean);
        TkMybatisUtils.addDeletesToExample(example);
        return roleMapper.selectCountByExample(example);
    }

    @Override
    public List<Role> getRoleListByName(String roleName) {
        List<Role> roleList = roleMapper.getRoleListByName(roleName);
        return roleList;
    }

    @Override
@@ -124,6 +130,31 @@
    }

    @Override
    public void allotMenu(Integer roleId, Integer[] menuOrders) {
        Example example = new Example(RoleMenu.class);
        example.or().andEqualTo("roleId", roleId);
        roleMenuMapper.deleteByExample(example);
        List<Menu> menuListInfo = menuMapper.getMenuListInfo();
        Map<Integer, Integer> menuMap = new HashMap<>();
        for (Menu m : menuListInfo) {
            menuMap.put(m.getMenuOrder(), m.getId());
        }
        if (menuOrders != null && menuOrders.length > 0) {
            List<RoleMenu> roleMenuList = new ArrayList<>();
            for (Integer menuOrder : menuOrders) {
                if (menuOrder > 10) {
                    RoleMenu roleMenu = new RoleMenu();
                    roleMenu.setRoleId(roleId);
                    roleMenu.setChannelId(Integer.valueOf(menuOrder.toString().substring(0, 1)));
                    roleMenu.setMenuId(menuMap.get(menuOrder));
                    roleMenuList.add(roleMenu);
                }
            }
            roleMenuMapper.insertList(roleMenuList);
        }
    }

    @Override
    public PageBean<Role> queryByPageBean(PageBean pageBean){
        return MyBatisBaseMapUtil.queryPage(roleMapper,pageBean,ENTITY_CLASS);
    }

 src/main/resources/mapper/AccountRoleMapper.xml

@@ -49,32 +49,4 @@
        </where>
    </sql>

    <select id="getAccountRoleList" resultMap="BaseResultMap">
        select
        ar.*,
        a.account_name,
        r.role_name
        from account_role ar
        left join account a on ar.account_id = a.id
        left join role r on ar.role_id = r.id
        <if test="_parameter != null">
            <include refid="Example_Where_Clause"/>
        </if>
        <if test="orderByClause != null">
            order by ${orderByClause}
        </if>
    </select>

    <update id="updateByPrimaryKey" parameterType="com.moral.entity.AccountRole" >
        update account_role
        set account_id = #{accountId,jdbcType=INTEGER},
        role_id = #{roleId,jdbcType=INTEGER}
        where id = #{id,jdbcType=INTEGER}
    </update>

    <delete id="deleteByPrimaryKeyOwn" parameterType="java.lang.Integer" >
        delete from account_role
        where id = #{id,jdbcType=INTEGER}
    </delete>

</mapper>

 src/main/resources/mapper/MenuMapper.xml

@@ -110,14 +110,27 @@
        </if>
    </select>

    <select id="getMenuListByName" resultMap="ResultMap">
    <select id="getChannelId" resultType="java.lang.Integer">
        select
        distinct
        channel_id
        from menu
        where is_delete=0
    </select>

    <select id="getMenuListInfo" resultMap="ResultMap">
        select
        <include refid="Base_Column_List"/>
        from menu
        where is_delete=0
        <if test="menuName != 'null'">
            and menu_name like concat('%',#{menuName},'%')
        </if>
    </select>

    <select id="getMenuOrdersByRoleId" resultType="java.lang.Integer">
        select
        m.menu_order
        from menu m
        left join role_menu rm on m.id=rm.menu_id and m.channel_id= rm.channel_id
        where rm.role_id = #{roleId}
    </select>

</mapper>

 src/main/resources/mapper/RoleMapper.xml

@@ -49,16 +49,6 @@
        </where>
    </sql>

    <select id="getRoleListByName" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from role
        where is_delete=0
        <if test="roleName != 'null'">
            and role_name like concat('%',#{roleName},'%')
        </if>
    </select>

    <select id="getRoleList" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
@@ -70,39 +60,5 @@
            order by ${orderByClause}
        </if>
    </select>

    <update id="updateByPrimaryKey" parameterType="com.moral.entity.Role" >
        update role
        <set >
            <if test="roleCode != null" >
                role_code = #{roleCode,jdbcType=VARCHAR},
            </if>
            <if test="roleName != null" >
                role_name = #{roleName,jdbcType=VARCHAR},
            </if>
            <if test="channelId != null" >
                channel_id = #{channelId,jdbcType=INTEGER},
            </if>
            <if test="isDelete != null" >
                is_delete = #{isDelete,jdbcType=CHAR},
            </if>
            <if test="roleRemark != null" >
                role_remark = #{roleRemark,jdbcType=VARCHAR},
            </if>
            <if test="createTime != null" >
                create_time = #{createTime,jdbcType=TIMESTAMP},
            </if>
            <if test="createUser != null" >
                create_user = #{createUser,jdbcType=VARCHAR},
            </if>
            <if test="updateTime != null" >
                update_time = #{updateTime,jdbcType=TIMESTAMP},
            </if>
            <if test="updateUser != null" >
                update_user = #{updateUser,jdbcType=VARCHAR},
            </if>
        </set>
        where id = #{id,jdbcType=INTEGER}
    </update>

</mapper>

 src/main/resources/mapper/RoleMenuMapper.xml

@@ -49,32 +49,20 @@
        </where>
    </sql>

    <select id="getRoleMenuList" resultMap="BaseResultMap">

    <select id="getChannels" resultType="java.lang.Integer">
        select
        rm.*,
        r.role_name,
        m.menu_name
        from role_menu rm
        left join role r on rm.role_id = r.id
        left join menu m on rm.menu_id = m.id
        <if test="_parameter != null">
            <include refid="Example_Where_Clause"/>
        </if>
        <if test="orderByClause != null">
            order by ${orderByClause}
        </if>
        distinct
        channel_id
        from role_menu
        where role_id = #{roleId}
    </select>

    <update id="updateByPrimaryKey" parameterType="com.moral.entity.RoleMenu" >
        update role_menu
        set role_id = #{roleId,jdbcType=INTEGER},
        menu_id = #{menuId,jdbcType=INTEGER}
        where id = #{id,jdbcType=INTEGER}
    </update>

    <delete id="deleteByPrimaryKeyOwn" parameterType="java.lang.Integer" >
        delete from role_menu
        where id = #{id,jdbcType=INTEGER}
    </delete>
    <select id="getMenus" resultType="java.lang.Integer">
        select
        menu_id
        from role_menu
        where role_id = #{roleId}
    </select>

</mapper>