修改用户登录

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

.idea/modules.xml

@@ -3,8 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/model/cloud-model/cloud-model.iml" />
-      <module fileurl="file://$PROJECT_DIR$/model/model.iml" filepath="$PROJECT_DIR$/model/model.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/yunsu.iml" filepath="$PROJECT_DIR$/.idea/yunsu.iml" />
     </modules>
   </component>

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

@@ -1,44 +0,0 @@
-package com.hssx.cloudmodel.controller;
-
-
-import com.hssx.cloudmodel.entity.SysUser;
-import com.hssx.cloudmodel.service.SysUserService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-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.ResponseBody;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@Controller
-@RequestMapping("/system")
-@Slf4j
-public class SysUserController {
-    @Autowired
-    SysUserService sysUserService;
-
-    /**
-     * 參數 ：username 用戶名 password 密碼
-     * @return
-     */
-    @ApiOperation(value = "系统管理员登录", notes = "登录方法")
-    @RequestMapping("login")
-    @ResponseBody
-    public HttpRespMsg sysLogin(SysUser sysUser, HttpServletRequest request,
-                                HttpServletResponse response) {
-        log.info("user"+sysUser);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = sysUserService.login(sysUser,request);
-        return msg;
-    }
-
-}
-

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

@@ -1,19 +1,25 @@
 package com.hssx.cloudmodel.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
+import com.hssx.cloudmodel.util.PageUtil;
 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -29,6 +35,8 @@ import javax.servlet.http.HttpServletResponse;
 public class UserController {
     @Autowired
     private UserService userService;
+    @Autowired
+    private CompanyService companyService;
 
     /**
      *
@@ -42,27 +50,38 @@ public class UserController {
     public HttpRespMsg sysLogin(User user, HttpServletRequest request,
                                 HttpServletResponse response) {
         log.info("user"+user);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = userService.login(user,request);
+        HttpRespMsg msg = userService.login(user,request);
         return msg;
     }
 
+    /**
+     * 创建账号是所获取的公司列表
+     * @return
+     */
+    @ApiOperation(value = "获取公司列表")
+    @RequestMapping("getCompanyList")
+    @ResponseBody
+    public HttpRespMsg getCompanyList(){
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Company> list = companyService.list();
+        msg.data = list;
+        return msg;
+    }
     /**
      * 添加/修改用户
      *
-     * @param user
      * 参数：account 账号 username 用户名（账号使用者的名字）
      * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
-     * @param flag 0-添加，1-修改
+     * team_name 团体名称 ：客户方、供应方
+     * flag 0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改用户")
     @RequestMapping("/add")
     @ResponseBody
-    public HttpRespMsg addAndUpdateRole(User user, HttpServletRequest request, Integer flag,
+    public HttpRespMsg addAndUpdateUser(User user, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg = userService.addAndUpdateRole(user, flag);
+        HttpRespMsg msg = userService.addAndUpdateUser(user, flag);
         return msg;
     }
 
@@ -89,15 +108,25 @@ public class UserController {
      * 参数 id 角色id
      * @return
      */
-    @ApiOperation("删除角色")
+    @ApiOperation("删除用户")
     @RequestMapping("/delete")
     @ResponseBody
-    public HttpRespMsg deleteRole(User user, HttpServletRequest request,
+    public HttpRespMsg deleteUser(User user, HttpServletRequest request,
                                   HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
         msg.data = userService.removeById(user.getId());
         return msg;
     }
 
+    @ApiOperation("用户列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(@RequestParam(required = false) String account, HttpServletRequest request,String token,
+                            HttpServletResponse response, PageUtil page,@RequestParam(required = false)String keyName) {
+        HttpRespMsg msg = userService.pageList(page,account,keyName);
+        User newUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        return msg;
+    }
+
 }
 

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

@@ -1,91 +0,0 @@
-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 com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-@TableName("tb_sys_user")
-public class SysUser extends Model<SysUser> {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 用户名
-     */
-    @TableField("username")
-    private String username;
-
-    /**
-     * 密码
-     */
-    @TableField("password")
-    private String password;
-
-    /**
-     * 名称
-     */
-    @TableField("name")
-    private String name;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    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 getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUser{" +
-        "id=" + id +
-        ", username=" + username +
-        ", password=" + password +
-        ", name=" + name +
-        "}";
-    }
-}

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

@@ -100,7 +100,7 @@ public class User extends Model<User> {
     private LocalDateTime indate;
 
     /**
-     * 用户头像
+     * 用户token
      */
     @TableField("head_imgurl")
     private String headImgurl;

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

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

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

@@ -1,21 +0,0 @@
-package com.hssx.cloudmodel.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.cloudmodel.entity.SysUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-07-25
- */
-public interface SysUserService extends IService<SysUser> {
-
-    HttpRespMsg login(SysUser sysUser, HttpServletRequest request);
-}

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

@@ -3,6 +3,7 @@ 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 com.hssx.cloudmodel.util.PageUtil;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -16,7 +17,9 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface UserService extends IService<User> {
 
-    HttpRespMsg addAndUpdateRole(User user, Integer flag);
+    HttpRespMsg addAndUpdateUser(User user, Integer flag);
 
     HttpRespMsg login(User user, HttpServletRequest request);
+
+    HttpRespMsg pageList(PageUtil page, String account, String keyName);
 }

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

@@ -1,54 +0,0 @@
-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.SysUser;
-import com.hssx.cloudmodel.mapper.SysUserMapper;
-import com.hssx.cloudmodel.service.SysUserService;
-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-25
- */
-@Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
-
-    @Autowired
-    SysUserMapper sysUserMapper;
-
-    @Override
-    public HttpRespMsg login(SysUser sysUser, HttpServletRequest request) {
-        System.out.println("sysUser" + sysUser);
-        HttpRespMsg msg = new HttpRespMsg();
-        //验证用户名是否存在
-        QueryWrapper<SysUser> qw = new QueryWrapper<>();
-        qw.eq("username", sysUser.getUsername());
-        Integer count = sysUserMapper.selectCount(qw);
-        //验证用户名是否正确
-        if (count > 0) {
-            SysUser user = sysUserMapper.selectOne(qw);
-            //验证密码是否正确
-            if (user.getPassword().equals(MD5Util.getPassword(sysUser.getPassword()))) {
-                user.setPassword("");
-                request.getSession().setAttribute(Constant.SYS_USER, user);
-                msg.data = user;
-            } else {
-                msg.setError("密码错误");
-            }
-        } else {
-            msg.setError("用户不存在");
-        }
-        return msg;
-    }
-}

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

@@ -2,18 +2,18 @@ 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 com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.UUID;
 
 /**
  * <p>
@@ -40,10 +40,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         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;
+            if (newUser.getPassword().equals(MD5Util.getPassword(user.getPassword()))) {
+                newUser.setPassword("");
+                msg.data = newUser;
             } else {
                 msg.setError("密码错误");
             }
@@ -54,7 +53,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg addAndUpdateRole(User user, Integer flag) {
+    public HttpRespMsg pageList(PageUtil page, String account, String keyName) {
+        return null;
+    }
+
+    @Override
+    public HttpRespMsg addAndUpdateUser(User user, Integer flag) {
         HttpRespMsg msg = new HttpRespMsg();
         if (flag == 0) {
             //添加角色
@@ -66,6 +70,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             } else {
                 //创建账号默认密码"000000"
                 user.setPassword(MD5Util.getPassword("000000"));
+                user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                 userMapper.insert(user);
             }
         } else if (flag == 1) {

cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java

@@ -2,6 +2,8 @@ package com.hssx.cloudmodel.util;
 
 import org.springframework.util.DigestUtils;
 
+import java.util.UUID;
+
 /**
  * Author: 吴涛涛 cuiyi@itany.com
  * Date : 2019 - 07 - 25 16:56
@@ -15,7 +17,8 @@ public class MD5Util {
     }
 
     public static void main(String[] args) {
-        String password = "000000";
-        System.out.println(MD5Util.getPassword(password));
+//        String password = "000000";
+//        System.out.println(MD5Util.getPassword(password));
+        System.out.println(UUID.randomUUID().toString().replaceAll("-", ""));;
     }
 }