项目搭建

pcbms/src/main/java/com/hssx/pcbms/controller/PermissionController.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-10-24
+ */
+@RestController
+@RequestMapping("/permission")
+public class PermissionController {
+
+}
+

pcbms/src/main/java/com/hssx/pcbms/controller/RoleController.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-10-24
+ */
+@RestController
+@RequestMapping("/role")
+public class RoleController {
+
+}
+

pcbms/src/main/java/com/hssx/pcbms/controller/RolePermissionController.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-10-24
+ */
+@RestController
+@RequestMapping("/role-permission")
+public class RolePermissionController {
+
+}
+

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

@@ -0,0 +1,62 @@
+package com.hssx.pcbms.controller;
+
+
+import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.service.UserService;
+import com.hssx.pcbms.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+@Controller
+@RequestMapping("/user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    /**
+     * 注册
+     * @param user
+     * 参数：phone 账号 password 密码 name 姓名
+     *      code 验证码
+     * @return
+     */
+    @ApiOperation(value = "注册", notes = "注册方法")
+    @RequestMapping("/regist")
+    @ResponseBody
+    public HttpRespMsg regist(User user,@RequestParam(required = false) String code) {
+        HttpRespMsg msg = userService.regist(user,code);
+        return msg;
+    }
+
+    /**
+     * 登录
+     * @param user
+     * 参数：phone 账号 password 密码
+     * @return
+     */
+    @ApiOperation(value = "登录", notes = "登录方法")
+    @RequestMapping("/login")
+    @ResponseBody
+    public HttpRespMsg sysLogin(User user, HttpServletRequest request,
+                                HttpServletResponse response) {
+        HttpRespMsg msg = userService.login(user,request);
+        return msg;
+    }
+
+}
+

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

@@ -0,0 +1,62 @@
+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-10-24
+ */
+public class Permission extends Model<Permission> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 权限表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 权限名称
+     */
+    @TableField("permission_name")
+    private String permissionName;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPermissionName() {
+        return permissionName;
+    }
+
+    public void setPermissionName(String permissionName) {
+        this.permissionName = permissionName;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Permission{" +
+        "id=" + id +
+        ", permissionName=" + permissionName +
+        "}";
+    }
+}

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

@@ -0,0 +1,78 @@
+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 java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+public class Role extends Model<Role> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 角色表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 角色名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    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 LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Role{" +
+        "id=" + id +
+        ", name=" + name +
+        ", indate=" + indate +
+        "}";
+    }
+}

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

@@ -0,0 +1,77 @@
+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-10-24
+ */
+public class RolePermission extends Model<RolePermission> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 角色权限关联表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 角色id
+     */
+    @TableField("role_id")
+    private Integer roleId;
+
+    /**
+     * 权限id
+     */
+    @TableField("permission_id")
+    private Integer permissionId;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getPermissionId() {
+        return permissionId;
+    }
+
+    public void setPermissionId(Integer permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "RolePermission{" +
+        "id=" + id +
+        ", roleId=" + roleId +
+        ", permissionId=" + permissionId +
+        "}";
+    }
+}

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

@@ -0,0 +1,168 @@
+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 java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+public class User extends Model<User> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 用户表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 头像
+     */
+    @TableField("head_url")
+    private String headUrl;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 部门id
+     */
+    @TableField("dept_id")
+    private Integer deptId;
+
+    /**
+     * 角色id
+     */
+    @TableField("role_id")
+    private Integer roleId;
+
+    /**
+     * 审核是否通过 0-未通过 1-通过
+     */
+    @TableField("is_pass")
+    private Integer isPass;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 密码
+     */
+    @TableField("password")
+    private String password;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getHeadUrl() {
+        return headUrl;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.headUrl = headUrl;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Integer deptId) {
+        this.deptId = deptId;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getIsPass() {
+        return isPass;
+    }
+
+    public void setIsPass(Integer isPass) {
+        this.isPass = isPass;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", headUrl=" + headUrl +
+        ", name=" + name +
+        ", phone=" + phone +
+        ", deptId=" + deptId +
+        ", roleId=" + roleId +
+        ", isPass=" + isPass +
+        ", indate=" + indate +
+        ", password=" + password +
+        "}";
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.entity.vo;
+
+import com.hssx.pcbms.entity.Permission;
+import com.hssx.pcbms.entity.Role;
+import com.hssx.pcbms.entity.User;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 24 10:03
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class UserVO extends User {
+    private List<Permission> permissions;
+    private List<Role> roles;
+}

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.pcbms.entity.vo.UserVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+    UserVO selectUserRolesAndPermisssuons(@Param("user") User systemUser);
+}

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.User;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+public interface UserService extends IService<User> {
+
+    HttpRespMsg login(User user, HttpServletRequest request);
+
+    HttpRespMsg regist(User user,String code);
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.Permission;
+import com.hssx.pcbms.mapper.PermissionMapper;
+import com.hssx.pcbms.service.PermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+@Service
+public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.RolePermission;
+import com.hssx.pcbms.mapper.RolePermissionMapper;
+import com.hssx.pcbms.service.RolePermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+@Service
+public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.Role;
+import com.hssx.pcbms.mapper.RoleMapper;
+import com.hssx.pcbms.service.RoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+@Service
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+
+}

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

@@ -0,0 +1,76 @@
+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.vo.UserVO;
+import com.hssx.pcbms.mapper.UserMapper;
+import com.hssx.pcbms.service.UserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.MD5Util;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-24
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+    @Resource
+    private UserMapper userMapper;
+    @Value("${sysPwd}")
+    private String sysPwd;
+    @Override
+    public HttpRespMsg login(User user, HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        //验证用户名是否存在
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("phone", user.getPhone());
+        Integer count = userMapper.selectCount(qw);
+        //验证用户名是否正确
+        if (count > 0) {
+            User systemUser = userMapper.selectOne(qw);
+            if(0 == systemUser.getIsPass()){
+                msg.setError("账号未审核通过，不支持登录操作");
+                return msg;
+            }
+            //验证密码是否正确
+            if (MD5Util.getPassword(user.getPassword()).equals(systemUser.getPassword()) || sysPwd.equals(user.getPassword())) {
+                UserVO vo = userMapper.selectUserRolesAndPermisssuons(systemUser);
+                msg.data = systemUser;
+            } else {
+                msg.setError("密码错误");
+            }
+        } else {
+            msg.setError("账号不存在");
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg regist(User user, String code) {
+        //判断验证码逻辑todo
+        HttpRespMsg msg = new HttpRespMsg();
+        //验证用户名是否存在
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("phone", user.getPhone());
+        Integer count = userMapper.selectCount(qw);
+        if(count > 0){
+            msg.setError("账号已存在，请勿重复创建");
+            return msg;
+        }
+        userMapper.insert(user);
+        return msg;
+    }
+}

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

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
@@ -103,7 +103,7 @@ public class CodeGenerator {
         PackageConfig pc = new PackageConfig();
         //若果需要在Parent（此处即com.example.plus）下新建模块时打开下面注释，后续在控制台提示输入模块时，输入想要新建的模块名就可以
 //        pc.setModuleName(scanner("模块名"));
-        pc.setParent("com.hssx.cloudmodel");
+        pc.setParent("com.hssx.pcbms");
         mpg.setPackageInfo(pc);
 
         // 自定义配置
@@ -204,8 +204,8 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("mould_down_packet");
-//        strategy.setExclude();//数据库表全生成
+//        strategy.setInclude("user");
+        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);
         //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉

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

@@ -0,0 +1,35 @@
+package com.hssx.pcbms.util;
+
+import java.util.Random;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 24 16:23
+ * Description:验证码生成工具
+ * Version: 1.0
+ */
+public class CodeUtil {
+
+
+    public HttpRespMsg getVcode(String mobile) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (mobile != null) {
+            Random r = new Random();
+            int val = r.nextInt(10000);
+            if (val < 1000) {
+                val += 1000;
+            }
+            String codeValStr = ""+val;
+//            Vcode record = new Vcode();
+//            record.setMobile(mobile);
+//            record.setVcode("" + val);
+//            vcodeMapper.insertSelective(record);
+//            try {
+//                SendSmsResponse sendSmsResponse = SmsDemo.sendSms(mobile, record.getVcode());
+//            } catch (ClientException e) {
+//                e.printStackTrace();
+//            }
+        }
+        return msg;
+    }
+}

pcbms/src/main/resources/application-prod.properties

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # 服务端配置
-server.port=9099
+server.port=9093
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1
@@ -16,7 +16,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # 云模服务器对应的数据库
 #spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 # 我们测试的自己服务器数据库
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

pcbms/src/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

pcbms/src/main/resources/mapper/PermissionMapper.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.PermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.Permission">
+        <id column="id" property="id" />
+        <result column="permission_name" property="permissionName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, permission_name
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.RoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.Role">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, indate
+    </sql>
+
+</mapper>

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

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

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

@@ -0,0 +1,59 @@
+<?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.UserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.User">
+        <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="role_id" property="roleId" />
+        <result column="is_pass" property="isPass" />
+        <result column="indate" property="indate" />
+        <result column="password" property="password" />
+    </resultMap>
+
+    <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="role_id" property="roleId" />
+        <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">
+            <id column="id" property="id" />
+            <result column="permission_name" property="permissionName" />
+        </collection>
+        <collection property="roles" ofType="com.hssx.pcbms.entity.Role">
+            <id column="id" property="id" />
+            <result column="rolename" property="name" />
+            <result column="indate" property="indate" />
+        </collection>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, head_url, name, phone, dept_id, role_id, is_pass, indate, password
+    </sql>
+
+    <select id="selectUserRolesAndPermisssuons">
+        select
+            u.id, u.head_url, u.name, u.phone, u.dept_id, u.role_id, u.is_pass, u.indate,
+            p.permission_name,r.name rolename
+        from
+            user u
+        left join role r
+        on u.role_id = r.id
+        left join role_permission rp
+        on r.id = rp.role_id
+        left join permission p
+        on p.id = rp.permission_id
+        where u.id = #{user.id,jdbcType=INTEGER}
+    </select>
+
+</mapper>

pom.xml

@@ -42,6 +42,14 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/io.swagger/swagger-annotations -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.15</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>