添加资产编号

pcbms/src/main/java/com/hssx/pcbms/entity/SysFunction.java

@@ -0,0 +1,134 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 菜单功能权限关联表
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public class SysFunction extends Model<SysFunction> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 功能名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 图标
+     */
+    @TableField("icon")
+    private String icon;
+
+    /**
+     * 功能字符KEY
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 对应模块ID
+     */
+    @TableField("module_id")
+    private Integer moduleId;
+
+    /**
+     * 功能排序
+     */
+    @TableField("seq")
+    private Integer seq;
+
+    /**
+     * 0:启用,1.未启用
+     */
+    @TableField("use_state")
+    private Boolean useState;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Integer getModuleId() {
+        return moduleId;
+    }
+
+    public void setModuleId(Integer moduleId) {
+        this.moduleId = moduleId;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
+
+    public Boolean getUseState() {
+        return useState;
+    }
+
+    public void setUseState(Boolean useState) {
+        this.useState = useState;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "SysFunction{" +
+        "id=" + id +
+        ", name=" + name +
+        ", icon=" + icon +
+        ", code=" + code +
+        ", moduleId=" + moduleId +
+        ", seq=" + seq +
+        ", useState=" + useState +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/entity/SysRole.java

@@ -0,0 +1,92 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色表(职务)
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public class SysRole extends Model<SysRole> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父级角色
+     */
+    @TableField("parent_role")
+    private Integer parentRole;
+
+    /**
+     * 角色名称
+     */
+    @TableField("rolename")
+    private String rolename;
+
+    /**
+     * 角色描述
+     */
+    @TableField("role_describe")
+    private String roleDescribe;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getParentRole() {
+        return parentRole;
+    }
+
+    public void setParentRole(Integer parentRole) {
+        this.parentRole = parentRole;
+    }
+
+    public String getRolename() {
+        return rolename;
+    }
+
+    public void setRolename(String rolename) {
+        this.rolename = rolename;
+    }
+
+    public String getRoleDescribe() {
+        return roleDescribe;
+    }
+
+    public void setRoleDescribe(String roleDescribe) {
+        this.roleDescribe = roleDescribe;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "SysRole{" +
+        "id=" + id +
+        ", parentRole=" + parentRole +
+        ", rolename=" + rolename +
+        ", roleDescribe=" + roleDescribe +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/SysFunctionMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.SysFunction;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 菜单功能权限关联表 Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface SysFunctionMapper extends BaseMapper<SysFunction> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/SysRoleMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.SysRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 角色表(职务) Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/SysFunctionService.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.SysFunction;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 菜单功能权限关联表 服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface SysFunctionService extends IService<SysFunction> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/SysRoleService.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.SysRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 角色表(职务) 服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface SysRoleService extends IService<SysRole> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/SysFunctionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.SysFunction;
+import com.hssx.pcbms.mapper.SysFunctionMapper;
+import com.hssx.pcbms.service.SysFunctionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 菜单功能权限关联表 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@Service
+public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFunction> implements SysFunctionService {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/SysRoleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.SysRole;
+import com.hssx.pcbms.mapper.SysRoleMapper;
+import com.hssx.pcbms.service.SysRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色表(职务) 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/UserServiceImpl.java

@@ -58,8 +58,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             }
             //验证密码是否正确
             if (MD5Util.getPassword(user.getPassword()).equals(systemUser.getPassword()) || sysPwd.equals(user.getPassword())) {
-                UserVO vo = userMapper.selectUserRolesAndPermisssuons(systemUser);
-                msg.data = vo;
+//                UserVO vo = userMapper.selectUserRolesAndPermisssuons(systemUser);
+//                msg.data = vo;
             } else {
                 msg.setError("密码错误");
             }

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("institution_file");
+        strategy.setInclude("sys_function","sys_role");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

pcbms/src/main/resources/mapper/SysFunctionMapper.xml

@@ -0,0 +1,21 @@
+<?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.hssx.pcbms.mapper.SysFunctionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.SysFunction">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="icon" property="icon" />
+        <result column="code" property="code" />
+        <result column="module_id" property="moduleId" />
+        <result column="seq" property="seq" />
+        <result column="use_state" property="useState" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, icon, code, module_id, seq, use_state
+    </sql>
+
+</mapper>

pcbms/src/main/resources/mapper/SysRoleMapper.xml

@@ -0,0 +1,18 @@
+<?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.hssx.pcbms.mapper.SysRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.SysRole">
+        <id column="id" property="id" />
+        <result column="parent_role" property="parentRole" />
+        <result column="rolename" property="rolename" />
+        <result column="role_describe" property="roleDescribe" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, parent_role, rolename, role_describe
+    </sql>
+
+</mapper>