添加资产编号

pcbms/src/main/java/com/hssx/pcbms/controller/UserController.java

@@ -24,16 +24,10 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.rpc.ServiceException;
-import java.rmi.RemoteException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
- * <p>
- * 前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-10-24
  */
@@ -62,7 +56,7 @@ public class UserController {
 
     /**
      * 登录
-     * 参数：phone 账号 password 密码
+     * 参数：loginName 账号 password 密码
      *
      * @return
      */

pcbms/src/main/java/com/hssx/pcbms/controller/UserRoleController.java

@@ -0,0 +1,21 @@
+package com.hssx.pcbms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@RestController
+@RequestMapping("/user-role")
+public class UserRoleController {
+
+}
+

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

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -61,11 +59,10 @@ public class User extends Model<User> {
      * 创建时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
-     * 密码
+     * 同步过来的密码 没有作用
      */
     @TableField("password")
     private String password;
@@ -112,6 +109,12 @@ public class User extends Model<User> {
     @TableField("login_name")
     private String loginName;
 
+    /**
+     * 登录系统所需要的密码
+     */
+    @TableField("login_password")
+    private String loginPassword;
+
     /**
      * 工作性质：0：正式 1：临时
      */
@@ -245,6 +248,14 @@ public class User extends Model<User> {
         this.loginName = loginName;
     }
 
+    public String getLoginPassword() {
+        return loginPassword;
+    }
+
+    public void setLoginPassword(String loginPassword) {
+        this.loginPassword = loginPassword;
+    }
+
     public Integer getXingZhi() {
         return xingZhi;
     }
@@ -284,6 +295,7 @@ public class User extends Model<User> {
         ", officePhone=" + officePhone +
         ", jobTitle=" + jobTitle +
         ", loginName=" + loginName +
+        ", loginPassword=" + loginPassword +
         ", xingZhi=" + xingZhi +
         ", keyCode=" + keyCode +
         "}";

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

@@ -0,0 +1,60 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public class UserRole extends Model<UserRole> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Integer userId;
+
+    /**
+     * 角色id
+     */
+    @TableField("role_id")
+    private Integer roleId;
+
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "UserRole{" +
+        "userId=" + userId +
+        ", roleId=" + roleId +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/entity/vo/UserVO.java

@@ -1,6 +1,8 @@
 package com.hssx.pcbms.entity.vo;
 
 import com.hssx.pcbms.entity.Permission;
+import com.hssx.pcbms.entity.SysFunction;
+import com.hssx.pcbms.entity.SysRole;
 import com.hssx.pcbms.entity.User;
 import lombok.Data;
 
@@ -14,5 +16,6 @@ import java.util.List;
  */
 @Data
 public class UserVO extends User {
-    private List<Permission> permissions;
+    private List<SysFunction> functions;
+    private List<SysRole> roles;
 }

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

@@ -2,6 +2,9 @@ package com.hssx.pcbms.mapper;
 
 import com.hssx.pcbms.entity.SysFunction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysFunctionMapper extends BaseMapper<SysFunction> {
 
+    List<SysFunction> selectFunctionsBycondition(@Param("ids") List<Integer> roleIdsList);
 }

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

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.UserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+}

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

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

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.UserRole;
+import com.hssx.pcbms.mapper.UserRoleMapper;
+import com.hssx.pcbms.service.UserRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-05
+ */
+@Service
+public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
+
+}

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

@@ -1,11 +1,9 @@
 package com.hssx.pcbms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.pcbms.entity.User;
-import com.hssx.pcbms.entity.UserPermission;
+import com.hssx.pcbms.entity.*;
 import com.hssx.pcbms.entity.vo.UserVO;
-import com.hssx.pcbms.mapper.UserMapper;
-import com.hssx.pcbms.mapper.UserPermissionMapper;
+import com.hssx.pcbms.mapper.*;
 import com.hssx.pcbms.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
@@ -21,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,14 +39,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Value("${upload.path}")
     private String path;
     @Resource
+    private SysRoleMapper sysRoleMapper;
+    @Resource
     private UserPermissionMapper userPermissionMapper;
+    @Resource
+    private UserRoleMapper userRoleMapper;
+    @Resource
+    private SysFunctionMapper sysFunctionMapper;
 
     @Override
     public HttpRespMsg login(User user, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         //验证用户名是否存在
         QueryWrapper<User> qw = new QueryWrapper<>();
-        qw.eq("phone", user.getPhone());
+        qw.eq("login_name", user.getLoginName());
         Integer count = userMapper.selectCount(qw);
         //验证用户名是否正确
         if (count > 0) {
@@ -58,8 +63,18 @@ 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);
+                List<UserRole> roleIds = userRoleMapper.selectList(new QueryWrapper<UserRole>().eq("user_id", systemUser.getId()));
+                System.out.println(roleIds);
                 UserVO vo = new UserVO();
+                systemUser.setPassword("");
+                systemUser.setLoginPassword("");
+                BeanUtils.copyProperties(systemUser,vo);
+                if(roleIds .size()>0 && roleIds != null){
+                    List<Integer> roleIdsList = roleIds.stream().map(UserRole::getRoleId).collect(Collectors.toList());
+                    List<SysRole> roles = sysRoleMapper.selectList(new QueryWrapper<SysRole>().in("id",roleIdsList));
+                    vo.setRoles(roles);
+                    vo.setFunctions(sysFunctionMapper.selectFunctionsBycondition(roleIdsList));
+                }
                 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("sys_function","sys_role");
+        strategy.setInclude("user");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -17,5 +17,18 @@
     <sql id="Base_Column_List">
         id, name, icon, code, module_id, seq, use_state
     </sql>
-
+    <select id="selectFunctionsBycondition" resultMap="BaseResultMap">
+        select
+        sf.id, sf.name, sf.icon, sf.code, sf.module_id, sf.seq, sf.use_state
+        from
+            sys_function sf
+        left join sys_role_function srf
+        on sf.id = srf.function_id
+        <where>
+            srf.role_id in
+            <foreach collection="ids" index="index" open="(" item="item" close=")" separator=",">
+                #{item}
+            </foreach>
+        </where>
+    </select>
 </mapper>

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

@@ -19,38 +19,14 @@
         <result column="office_phone" property="officePhone" />
         <result column="job_title" property="jobTitle" />
         <result column="login_name" property="loginName" />
+        <result column="login_password" property="loginPassword" />
         <result column="xing_zhi" property="xingZhi" />
         <result column="key_code" property="keyCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, head_url, name, phone, dept_id, is_pass, indate, password, role_name, email, sex, birthday, office_phone, job_title, login_name, xing_zhi, key_code
+        id, head_url, name, phone, dept_id, is_pass, indate, password, role_name, email, sex, birthday, office_phone, job_title, login_name, login_password, xing_zhi, key_code
     </sql>
 
-    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.UserVO">
-        <id column="id" property="id" />
-        <result column="head_url" property="headUrl" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="dept_id" property="deptId" />
-        <result column="is_pass" property="isPass" />
-        <result column="indate" property="indate" />
-        <!--<result column="password" property="password" />-->
-        <collection property="permissions" ofType="com.hssx.pcbms.entity.Permission">
-            <result column="permission_name" property="permissionName" />
-        </collection>
-    </resultMap>
-
-    <select id="selectUserRolesAndPermisssuons" resultMap="BaseResultMapVO">
-        select
-            u.id, u.head_url, u.name, u.phone, u.dept_id, u.is_pass, u.indate,u.role_name
-        from
-            user u
-        left join user_permission up
-        on u.id = up.user_id
-        left join permission p
-        on p.id = up.permission_id
-        where u.id = #{user.id,jdbcType=INTEGER}
-    </select>
 </mapper>

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

@@ -0,0 +1,16 @@
+<?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.UserRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.UserRole">
+        <result column="user_id" property="userId" />
+        <result column="role_id" property="roleId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        user_id, role_id
+    </sql>
+
+</mapper>