[lsp]1.新增用户业务权限功能

kmall-admin/src/main/java/com/kmall/admin/controller/SysBizPermissionController.java

@@ -0,0 +1,108 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.SysBizPermissionEntity;
+import com.kmall.admin.service.SysBizPermissionService;
+import com.kmall.admin.utils.ParamUtils;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 系统业务权限表Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+@Controller
+@RequestMapping("sysbizpermission")
+public class SysBizPermissionController {
+
+    @Autowired
+    private SysBizPermissionService sysBizPermissionService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("sysbizpermission:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<SysBizPermissionEntity> sysBizPermissionList = sysBizPermissionService.queryList(query);
+        int total = sysBizPermissionService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(sysBizPermissionList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{permissionId}")
+    @RequiresPermissions("sysbizpermission:info")
+    @ResponseBody
+    public R info(@PathVariable("permissionId") Long permissionId) {
+        SysBizPermissionEntity sysBizPermission = sysBizPermissionService.queryObject(permissionId);
+
+        return R.ok().put("sysBizPermission", sysBizPermission);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("sysbizpermission:save")
+    @ResponseBody
+    public R save(@RequestBody SysBizPermissionEntity sysBizPermission) {
+        sysBizPermissionService.save(sysBizPermission);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("sysbizpermission:update")
+    @ResponseBody
+    public R update(@RequestBody SysBizPermissionEntity sysBizPermission) {
+        sysBizPermissionService.update(sysBizPermission);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("sysbizpermission:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]permissionIds) {
+        sysBizPermissionService.deleteBatch(permissionIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<SysBizPermissionEntity> list = sysBizPermissionService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/SysUserBizPermissionController.java

@@ -0,0 +1,119 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.SysUserBizPermissionEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.service.SysUserBizPermissionService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户业务权限表Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+@Controller
+@RequestMapping("sysuserbizpermission")
+public class SysUserBizPermissionController {
+    @Autowired
+    private SysUserBizPermissionService sysUserBizPermissionService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("sysuserbizpermission:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<SysUserBizPermissionEntity> sysUserBizPermissionList = sysUserBizPermissionService.queryList(query);
+        int total = sysUserBizPermissionService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(sysUserBizPermissionList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("sysuserbizpermission:info")
+    @ResponseBody
+    public R info(@PathVariable("id") Long id) {
+        SysUserBizPermissionEntity sysUserBizPermission = sysUserBizPermissionService.queryObject(id);
+
+        return R.ok().put("sysUserBizPermission", sysUserBizPermission);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("sysuserbizpermission:save")
+    @ResponseBody
+    public R save(@RequestBody SysUserBizPermissionEntity sysUserBizPermission) {
+        sysUserBizPermissionService.save(sysUserBizPermission);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("sysuserbizpermission:update")
+    @ResponseBody
+    public R update(@RequestBody SysUserBizPermissionEntity sysUserBizPermission) {
+        sysUserBizPermissionService.update(sysUserBizPermission);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("sysuserbizpermission:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]ids) {
+        sysUserBizPermissionService.deleteBatch(ids);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<SysUserBizPermissionEntity> list = sysUserBizPermissionService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+
+    /**
+     * 查看系统用户列表
+     */
+    @RequestMapping("/querySysUserAll")
+    @ResponseBody
+    public R querySysUserAll() {
+
+        List<SysUserEntity> list = sysUserBizPermissionService.querySysUserList();
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dao/SysBizPermissionDao.java

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.SysBizPermissionEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 系统业务权限表Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+public interface SysBizPermissionDao extends BaseDao<SysBizPermissionEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/dao/SysUserBizPermissionDao.java

@@ -0,0 +1,20 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.SysUserBizPermissionEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.manager.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * 用户业务权限表Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+public interface SysUserBizPermissionDao extends BaseDao<SysUserBizPermissionEntity> {
+
+    List<SysUserEntity> querySysUserList();
+
+}

kmall-admin/src/main/java/com/kmall/admin/entity/SysBizPermissionEntity.java

@@ -0,0 +1,120 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统业务权限表实体
+ * 表名 sys_biz_permission
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+public class SysBizPermissionEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long permissionId;
+    /**
+     * 权限名称
+     */
+    private String permissionName;
+    /**
+     * 权限类别
+     */
+    private String permissionType;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建者ID
+     */
+    private String createUserId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setPermissionId(Long permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getPermissionId() {
+        return permissionId;
+    }
+    /**
+     * 设置：权限名称
+     */
+    public void setPermissionName(String permissionName) {
+        this.permissionName = permissionName;
+    }
+
+    /**
+     * 获取：权限名称
+     */
+    public String getPermissionName() {
+        return permissionName;
+    }
+    /**
+     * 设置：权限类别
+     */
+    public void setPermissionType(String permissionType) {
+        this.permissionType = permissionType;
+    }
+
+    /**
+     * 获取：权限类别
+     */
+    public String getPermissionType() {
+        return permissionType;
+    }
+    /**
+     * 设置：备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取：备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+    /**
+     * 设置：创建者ID
+     */
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取：创建者ID
+     */
+    public String getCreateUserId() {
+        return createUserId;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/SysUserBizPermissionEntity.java

@@ -0,0 +1,96 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户业务权限表实体
+ * 表名 sys_user_biz_permission
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+public class SysUserBizPermissionEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long id;
+    /**
+     * 用户ID
+     */
+    private Long userId;
+    /**
+     * 权限ID
+     */
+    private Long permissionId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 权限名称
+     */
+    private String permissionName;
+
+
+    /**
+     * 设置：编号
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getId() {
+        return id;
+    }
+    /**
+     * 设置：用户ID
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：用户ID
+     */
+    public Long getUserId() {
+        return userId;
+    }
+    /**
+     * 设置：权限ID
+     */
+    public void setPermissionId(Long permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    /**
+     * 获取：权限ID
+     */
+    public Long getPermissionId() {
+        return permissionId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPermissionName() {
+        return permissionName;
+    }
+
+    public void setPermissionName(String permissionName) {
+        this.permissionName = permissionName;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/SysBizPermissionService.java

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.SysBizPermissionEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统业务权限表Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+public interface SysBizPermissionService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param permissionId 主键
+     * @return 实体
+     */
+    SysBizPermissionEntity queryObject(Long permissionId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<SysBizPermissionEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param sysBizPermission 实体
+     * @return 保存条数
+     */
+    int save(SysBizPermissionEntity sysBizPermission);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param sysBizPermission 实体
+     * @return 更新条数
+     */
+    int update(SysBizPermissionEntity sysBizPermission);
+
+    /**
+     * 根据主键删除
+     *
+     * @param permissionId
+     * @return 删除条数
+     */
+    int delete(Long permissionId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param permissionIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[] permissionIds);
+}

kmall-admin/src/main/java/com/kmall/admin/service/SysUserBizPermissionService.java

@@ -0,0 +1,79 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.SysUserBizPermissionEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户业务权限表Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+public interface SysUserBizPermissionService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    SysUserBizPermissionEntity queryObject(Long id);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<SysUserBizPermissionEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param sysUserBizPermission 实体
+     * @return 保存条数
+     */
+    int save(SysUserBizPermissionEntity sysUserBizPermission);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param sysUserBizPermission 实体
+     * @return 更新条数
+     */
+    int update(SysUserBizPermissionEntity sysUserBizPermission);
+
+    /**
+     * 根据主键删除
+     *
+     * @param id
+     * @return 删除条数
+     */
+    int delete(Long id);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param ids
+     * @return 删除条数
+     */
+    int deleteBatch(Long[] ids);
+
+    /**
+     * 查看系统用户列表
+     * @return list
+     */
+    List<SysUserEntity> querySysUserList();
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/SysBizPermissionServiceImpl.java

@@ -0,0 +1,66 @@
+package com.kmall.admin.service.impl;
+
+import com.kmall.admin.dao.SysBizPermissionDao;
+import com.kmall.admin.entity.SysBizPermissionEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.service.SysBizPermissionService;
+import com.kmall.admin.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统业务权限表Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+@Service("sysBizPermissionService")
+public class SysBizPermissionServiceImpl implements SysBizPermissionService {
+
+    @Autowired
+    private SysBizPermissionDao sysBizPermissionDao;
+
+    @Override
+    public SysBizPermissionEntity queryObject(Long permissionId) {
+        return sysBizPermissionDao.queryObject(permissionId);
+    }
+
+    @Override
+    public List<SysBizPermissionEntity> queryList(Map<String, Object> map) {
+        return sysBizPermissionDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return sysBizPermissionDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(SysBizPermissionEntity sysBizPermission) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+
+        sysBizPermission.setCreateUserId(user.getUserId().toString());
+        sysBizPermission.setCreateTime(new Date());
+        return sysBizPermissionDao.save(sysBizPermission);
+    }
+
+    @Override
+    public int update(SysBizPermissionEntity sysBizPermission) {
+        return sysBizPermissionDao.update(sysBizPermission);
+    }
+
+    @Override
+    public int delete(Long permissionId) {
+        return sysBizPermissionDao.delete(permissionId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]permissionIds) {
+        return sysBizPermissionDao.deleteBatch(permissionIds);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/SysUserBizPermissionServiceImpl.java

@@ -0,0 +1,64 @@
+package com.kmall.admin.service.impl;
+
+import com.kmall.admin.dao.SysUserBizPermissionDao;
+import com.kmall.admin.entity.SysUserBizPermissionEntity;
+import com.kmall.admin.fromcomm.entity.SysUserEntity;
+import com.kmall.admin.service.SysUserBizPermissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户业务权限表Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-18 10:07:41
+ */
+@Service("sysUserBizPermissionService")
+public class SysUserBizPermissionServiceImpl implements SysUserBizPermissionService {
+    @Autowired
+    private SysUserBizPermissionDao sysUserBizPermissionDao;
+
+    @Override
+    public SysUserBizPermissionEntity queryObject(Long id) {
+        return sysUserBizPermissionDao.queryObject(id);
+    }
+
+    @Override
+    public List<SysUserBizPermissionEntity> queryList(Map<String, Object> map) {
+        return sysUserBizPermissionDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return sysUserBizPermissionDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(SysUserBizPermissionEntity sysUserBizPermission) {
+        return sysUserBizPermissionDao.save(sysUserBizPermission);
+    }
+
+    @Override
+    public int update(SysUserBizPermissionEntity sysUserBizPermission) {
+        return sysUserBizPermissionDao.update(sysUserBizPermission);
+    }
+
+    @Override
+    public int delete(Long id) {
+        return sysUserBizPermissionDao.delete(id);
+    }
+
+    @Override
+    public int deleteBatch(Long[]ids) {
+        return sysUserBizPermissionDao.deleteBatch(ids);
+    }
+
+    @Override
+    public List<SysUserEntity> querySysUserList() {
+        return sysUserBizPermissionDao.querySysUserList();
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/utils/TestUtils.java

@@ -0,0 +1,23 @@
+package com.kmall.admin.utils;
+
+import com.kmall.admin.dao.ExportExceptionDataDao;
+import com.kmall.admin.entity.ExportExceptionDataEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author lsp
+ * @version 1.0.0
+ * 2020/9/18
+ */
+public class TestUtils {
+
+    @Autowired
+    private ExportExceptionDataDao exportExceptionDataDao;
+
+    @Transactional(propagation= Propagation.NOT_SUPPORTED)
+    public void save(ExportExceptionDataEntity exportExceptionDataEntity){
+        exportExceptionDataDao.save(exportExceptionDataEntity);
+    }
+}

kmall-admin/src/main/resources/mybatis/mapper/SysBizPermissionDao.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.kmall.admin.dao.SysBizPermissionDao">
+
+    <resultMap type="com.kmall.admin.entity.SysBizPermissionEntity" id="sysBizPermissionMap">
+        <result property="permissionId" column="permission_id"/>
+        <result property="permissionName" column="permission_name"/>
+        <result property="permissionType" column="permission_type"/>
+        <result property="remark" column="remark"/>
+        <result property="createUserId" column="create_user_id"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.SysBizPermissionEntity">
+		select
+			`permission_id`,
+			`permission_name`,
+			`permission_type`,
+			`remark`,
+			`create_user_id`,
+			`create_time`
+		from sys_biz_permission
+		where permission_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.SysBizPermissionEntity">
+		select
+    		`permission_id`,
+    		`permission_name`,
+    		`permission_type`,
+    		`remark`,
+    		`create_user_id`,
+    		`create_time`
+		from sys_biz_permission
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by permission_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from sys_biz_permission
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+	 
+	<insert id="save" parameterType="com.kmall.admin.entity.SysBizPermissionEntity" useGeneratedKeys="true" keyProperty="permissionId">
+		insert into sys_biz_permission(
+			`permission_name`,
+			`permission_type`,
+			`remark`,
+			`create_user_id`,
+			`create_time`)
+		values(
+			#{permissionName},
+			#{permissionType},
+			#{remark},
+			#{createUserId},
+			#{createTime})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.SysBizPermissionEntity">
+		update sys_biz_permission 
+		<set>
+			<if test="permissionName != null">`permission_name` = #{permissionName}, </if>
+			<if test="permissionType != null">`permission_type` = #{permissionType}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="createUserId != null">`create_user_id` = #{createUserId}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}</if>
+		</set>
+		where permission_id = #{permissionId}
+	</update>
+	
+	<delete id="delete">
+		delete from sys_biz_permission where permission_id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from sys_biz_permission where permission_id in 
+		<foreach item="permissionId" collection="array" open="(" separator="," close=")">
+			#{permissionId}
+		</foreach>
+	</delete>
+
+</mapper>

kmall-admin/src/main/resources/mybatis/mapper/SysUserBizPermissionDao.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.kmall.admin.dao.SysUserBizPermissionDao">
+
+    <resultMap type="com.kmall.admin.entity.SysUserBizPermissionEntity" id="sysUserBizPermissionMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+		<result property="permissionId" column="permission_id"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.SysUserBizPermissionEntity">
+		select
+			`id`,
+			`user_id`,
+			`permission_id`
+		from sys_user_biz_permission
+		where id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.SysUserBizPermissionEntity">
+		select
+			p.*,
+			u.username userName,
+			p2.permission_name permissionName
+		from sys_user_biz_permission p
+		left join sys_user u on p.user_id = u.user_id
+		left join sys_biz_permission p2  on p.permission_id = p2.permission_id
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from sys_user_biz_permission
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+	 
+	<insert id="save" parameterType="com.kmall.admin.entity.SysUserBizPermissionEntity" useGeneratedKeys="true" keyProperty="id">
+		insert into sys_user_biz_permission(
+			`user_id`,
+			`permission_id`)
+		values(
+			#{userId},
+			#{permissionId})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.SysUserBizPermissionEntity">
+		update sys_user_biz_permission 
+		<set>
+			<if test="userId != null">`user_id` = #{userId}, </if>
+			<if test="permissionId != null">`permission_id` = #{permissionId}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="delete">
+		delete from sys_user_biz_permission where id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from sys_user_biz_permission where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+	<select id="querySysUserList" resultType="com.kmall.admin.fromcomm.entity.SysUserEntity">
+		select user_id userId, username from sys_user
+	</select>
+</mapper>

kmall-admin/src/main/webapp/WEB-INF/page/sys/sysbizpermission.html

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("sysbizpermission:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("sysbizpermission:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("sysbizpermission:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="sysBizPermission" :rules="ruleValidate" :label-width="80">
+            <Form-item label="权限名称" prop="permissionName">
+                <i-input v-model="sysBizPermission.permissionName" placeholder="权限名称"/>
+            </Form-item>
+            <Form-item label="权限类别" prop="permissionType">
+                <Radio-group v-model="sysBizPermission.permissionType">
+                    <Radio label="0">
+                        <span>系统</span>
+                    </Radio>
+                    <Radio label="1">
+                        <span>业务</span>
+                    </Radio>
+                </Radio-group>
+            </Form-item>
+            <Form-item label="备注" prop="remark">
+                <i-input v-model="sysBizPermission.remark" placeholder="备注"/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/sys/sysbizpermission.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/sys/sysuserbizpermission.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("sysuserbizpermission:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("sysuserbizpermission:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("sysuserbizpermission:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+        <table id="jqGrid"></table>
+        <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="sysUserBizPermission" :rules="ruleValidate" :label-width="80">
+            <Form-item label="用户" prop="userId">
+                <i-select v-model="sysUserBizPermission.userId" filterable placeholder="用户" label-in-value>
+                    <i-option v-for="user in userList" :value="user.userId" :key="user.userId">{{user.username}}</i-option>
+                </i-select>
+            </Form-item>
+            <Form-item label="权限" prop="permissionId">
+                <i-select v-model="sysUserBizPermission.permissionId" filterable placeholder="权限" label-in-value>
+                    <i-option v-for="permission in permissionList" :value="permission.permissionId" :key="permission.permissionId">{{permission.permissionName}}</i-option>
+                </i-select>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/sys/sysuserbizpermission.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/js/sys/sysbizpermission.js

@@ -0,0 +1,160 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../sysbizpermission/list',
+        datatype: "json",
+        colModel: [
+			{label: 'permissionId', name: 'permissionId', index: 'permission_id', key: true, hidden: true},
+			{label: '权限名称', name: 'permissionName', index: 'permission_name', width: 80, align: 'center'},
+			{label: '权限类别', name: 'permissionType', index: 'permission_type', width: 80, align: 'center',
+                formatter: function (value) {
+                    if (value == '0') {
+                        return '系统';
+                    } else if (value == '1') {
+                        return '业务';
+                    }
+                    return '';
+                }
+			},
+			{label: '备注', name: 'remark', index: 'remark', width: 80, align: 'center'},
+			{label: '创建者ID', name: 'createUserId', index: 'create_user_id', width: 80, align: 'center'},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80, align: 'center',
+				formatter: function (value) {
+                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+                }
+			}
+		],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		sysBizPermission: {},
+		ruleValidate: {
+            permissionName: [
+                {required: true, message: '权限名称不能为空', trigger: 'blur'}
+            ],
+            permissionType: [
+                {required: true, message: '权限类别不能为空', trigger: 'blur'}
+            ]
+		},
+		q: {
+            name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.sysBizPermission = {};
+		},
+		update: function (event) {
+            let permissionId = getSelectedRow();
+			if (permissionId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(permissionId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.sysBizPermission.permissionId == null ? "../sysbizpermission/save" : "../sysbizpermission/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.sysBizPermission),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let permissionIds = getSelectedRows();
+			if (permissionIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../sysbizpermission/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(permissionIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(permissionId){
+			$.get("../sysbizpermission/info/"+permissionId, function (r) {
+                vm.sysBizPermission = r.sysBizPermission;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

kmall-admin/src/main/webapp/js/sys/sysuserbizpermission.js

@@ -0,0 +1,158 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../sysuserbizpermission/list',
+        datatype: "json",
+        colModel: [
+			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
+			{label: '用户', name: 'userName', width: 80, align: 'center'},
+			{label: '权限', name: 'permissionName', width: 80, align: 'center'}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		sysUserBizPermission: {},
+        userList: {},
+        permissionList: {},
+		ruleValidate: {},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.userList = {};
+			vm.permissionList = {};
+			vm.sysUserBizPermission = {};
+			//获取用户列表
+			this.getUsers();
+			//获取权限列表
+			this.getPermissionList();
+		},
+		update: function (event) {
+            let id = getSelectedRow();
+			if (id == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(id)
+            //获取用户列表
+            this.getUsers();
+            //获取权限列表
+            this.getPermissionList();
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.sysUserBizPermission.id == null ? "../sysuserbizpermission/save" : "../sysuserbizpermission/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.sysUserBizPermission),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let ids = getSelectedRows();
+			if (ids == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../sysuserbizpermission/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(ids),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(id){
+			$.get("../sysuserbizpermission/info/"+id, function (r) {
+                vm.sysUserBizPermission = r.sysUserBizPermission;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        },
+        getUsers: function () {
+            $.get("../sysuserbizpermission/querySysUserAll", function (r) {
+                vm.userList = r.list;
+            });
+        },
+		getPermissionList: function () {
+			$.get("../sysbizpermission/queryAll", function (r) {
+                vm.permissionList = r.list;
+            });
+        }
+	}
+});