msg

model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -8,6 +8,7 @@ package com.hssx.cloudmodel.constant;
  */
 public class Constant {
     public static final String SYS_USER = "sysUserInfo";
+    public static final String COMMON_USER = "UserInfo";
     public static final Integer SYSTEM_ID = 1;
     public static final String DEFAULT_PWD = "000000";
     public static final Integer PAGE_NUM = 1;

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -0,0 +1,103 @@
+package com.hssx.cloudmodel.controller;
+
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.service.UserService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.MD5Util;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@RestController
+@RequestMapping("/user")
+@Slf4j
+public class UserController {
+    @Autowired
+    private UserService userService;
+
+    /**
+     *
+     * @param user
+     * 参数：account 账号 password 密码
+     * @return
+     */
+    @ApiOperation(value = "普通用户登录", notes = "登录方法")
+    @RequestMapping("login")
+    @ResponseBody
+    public HttpRespMsg sysLogin(User user, HttpServletRequest request,
+                                HttpServletResponse response) {
+        log.info("user"+user);
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = userService.login(user,request);
+        return msg;
+    }
+
+    /**
+     * 添加/修改用户
+     *
+     * @param user
+     * 参数：account 账号 username 用户名（账号使用者的名字）
+     * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
+     * @param flag 0-添加，1-修改
+     * @return
+     */
+    @ApiOperation("添加/修改用户")
+    @RequestMapping("/add")
+    @ResponseBody
+    public HttpRespMsg addAndUpdateRole(User user, HttpServletRequest request, Integer flag,
+                                        HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = userService.addAndUpdateRole(user, flag);
+        return msg;
+    }
+
+    /**
+     * 添加/修改用户
+     * @param user
+     * 参数：id 用户id  account 账号  password 密码
+     * @return
+     */
+    @ApiOperation("修改用户密码")
+    @RequestMapping("/updatePassword")
+    @ResponseBody
+    public HttpRespMsg updatePassword(User user, HttpServletRequest request,
+                                        HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        user.setPassword(MD5Util.getPassword(user.getPassword()));
+        msg.data = userService.updateById(user);
+        return msg;
+    }
+
+    /**
+     * 删除角色
+     * @param user
+     * 参数 id 角色id
+     * @return
+     */
+    @ApiOperation("删除角色")
+    @RequestMapping("/delete")
+    @ResponseBody
+    public HttpRespMsg deleteRole(User user, HttpServletRequest request,
+                                  HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = userService.removeById(user.getId());
+        return msg;
+    }
+
+}
+

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -0,0 +1,275 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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-07-26
+ */
+@TableName("tb_user")
+public class User extends Model<User> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 账号
+     */
+    @TableField("account")
+    private String account;
+
+    /**
+     * 名字
+     */
+    @TableField("username")
+    private String username;
+
+    /**
+     * 密码
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 联系电话
+     */
+    @TableField("mobile")
+    private String mobile;
+
+    /**
+     * (供应商)角色类型，0-项目经理 1-普通用户。(客户方)5-客服方领导，6-客户方普通人员
+     */
+    @TableField("role_type")
+    private Integer roleType;
+
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 上级id,0-无上级
+     */
+    @TableField("parent_id")
+    private Integer parentId;
+
+    /**
+     * 性别，0-男 1-女
+     */
+    @TableField("sex")
+    private Integer sex;
+
+    /**
+     * 部门编号
+     */
+    @TableField("dep_no")
+    private String depNo;
+
+    /**
+     * 工作状态
+     */
+    @TableField("work_state")
+    private Integer workState;
+
+    /**
+     * 是否禁用，0-非禁用 1-禁用
+     */
+    @TableField("is_disable")
+    private Integer isDisable;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+    /**
+     * 用户头像
+     */
+    @TableField("head_imgurl")
+    private String headImgurl;
+
+    /**
+     * 团体名称
+     */
+    @TableField("team_name")
+    private String teamName;
+
+    /**
+     * 所属方，0-供应商 1-客户方
+     */
+    @TableField("subordinate_type")
+    private Integer subordinateType;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getRoleType() {
+        return roleType;
+    }
+
+    public void setRoleType(Integer roleType) {
+        this.roleType = roleType;
+    }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getDepNo() {
+        return depNo;
+    }
+
+    public void setDepNo(String depNo) {
+        this.depNo = depNo;
+    }
+
+    public Integer getWorkState() {
+        return workState;
+    }
+
+    public void setWorkState(Integer workState) {
+        this.workState = workState;
+    }
+
+    public Integer getIsDisable() {
+        return isDisable;
+    }
+
+    public void setIsDisable(Integer isDisable) {
+        this.isDisable = isDisable;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    public String getHeadImgurl() {
+        return headImgurl;
+    }
+
+    public void setHeadImgurl(String headImgurl) {
+        this.headImgurl = headImgurl;
+    }
+
+    public String getTeamName() {
+        return teamName;
+    }
+
+    public void setTeamName(String teamName) {
+        this.teamName = teamName;
+    }
+
+    public Integer getSubordinateType() {
+        return subordinateType;
+    }
+
+    public void setSubordinateType(Integer subordinateType) {
+        this.subordinateType = subordinateType;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+        "id=" + id +
+        ", account=" + account +
+        ", username=" + username +
+        ", password=" + password +
+        ", mobile=" + mobile +
+        ", roleType=" + roleType +
+        ", companyId=" + companyId +
+        ", parentId=" + parentId +
+        ", sex=" + sex +
+        ", depNo=" + depNo +
+        ", workState=" + workState +
+        ", isDisable=" + isDisable +
+        ", indate=" + indate +
+        ", headImgurl=" + headImgurl +
+        ", teamName=" + teamName +
+        ", subordinateType=" + subordinateType +
+        "}";
+    }
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/UserMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/UserService.java

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

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -0,0 +1,78 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.constant.Constant;
+import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.entity.SysUser;
+import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.mapper.UserMapper;
+import com.hssx.cloudmodel.service.UserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.MD5Util;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+    @Autowired
+    UserMapper userMapper;
+
+    @Override
+    public HttpRespMsg login(User user, HttpServletRequest request) {
+        System.out.println("user" + user);
+        HttpRespMsg msg = new HttpRespMsg();
+        //验证用户名是否存在
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw.eq("account", user.getAccount());
+        Integer count = userMapper.selectCount(qw);
+        //验证用户名是否正确
+        if (count > 0) {
+            User newUser = userMapper.selectOne(qw);
+            //验证密码是否正确
+            if (user.getPassword().equals(MD5Util.getPassword(user.getPassword()))) {
+                user.setPassword("");
+                request.getSession().setAttribute(Constant.COMMON_USER, user);
+                msg.data = user;
+            } else {
+                msg.setError("密码错误");
+            }
+        } else {
+            msg.setError("账号不存在");
+        }
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg addAndUpdateRole(User user, Integer flag) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (flag == 0) {
+            //添加角色
+            QueryWrapper<User> qw = new QueryWrapper<>();
+            qw.eq("account", user.getAccount());
+            int count = userMapper.selectCount(qw);
+            if (count > 0) {
+                msg.setError("账号已存在，请输入其他账号");
+            } else {
+                //创建账号默认密码"000000"
+                user.setPassword(MD5Util.getPassword("000000"));
+                userMapper.insert(user);
+            }
+        } else if (flag == 1) {
+            //更新角色信息
+            userMapper.updateById(user);
+        }
+        return msg;
+    }
+
+}

model/pom.xml

@@ -59,6 +59,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.15</version>
         </dependency>
+
+        <!--&lt;!&ndash; https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter &ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>com.github.pagehelper</groupId>-->
+            <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
+            <!--<version>1.2.10</version>-->
+        <!--</dependency>-->
     </dependencies>
 
     <build>