Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

@@ -2,8 +2,10 @@ package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.service.CompanyService;
+import com.hssx.cloudmodel.service.RoleService;
 import com.hssx.cloudmodel.service.UserService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
@@ -37,6 +39,8 @@ public class UserController {
     private UserService userService;
     @Autowired
     private CompanyService companyService;
+    @Autowired
+    private RoleService roleService;
 
     /**
      *
@@ -63,7 +67,21 @@ public class UserController {
     @ResponseBody
     public HttpRespMsg getCompanyList(){
         HttpRespMsg msg = new HttpRespMsg();
-        List<Company> list = companyService.list();
+        List<Company> list = companyService.getIdAndNamelist();
+        msg.data = list;
+        return msg;
+    }
+
+    /**
+     * 创建账号是所获取的角色列表
+     * @return
+     */
+    @ApiOperation(value = "获取角色列表")
+    @RequestMapping("getRoleList")
+    @ResponseBody
+    public HttpRespMsg getRoleList(){
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Role> list = roleService.getIdAndNamelist();
         msg.data = list;
         return msg;
     }
@@ -72,7 +90,7 @@ public class UserController {
      *
      * 参数：account 账号 username 用户名（账号使用者的名字）
      * password 密码 ,mobile 手机号 ,roleType 角色类型, companyId 所属公司id
-     * team_name 团体名称 ：客户方、供应方
+     * teamName 团体名称 ：客户方、供应方
      * flag 0-添加，1-修改
      * @return
      */
@@ -118,6 +136,12 @@ public class UserController {
         return msg;
     }
 
+    /**
+     *用户列表
+     * 参数：pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
+     * account 用户账号 token 用户凭证
+     * @return
+     */
     @ApiOperation("用户列表")
     @RequestMapping("/list")
     @ResponseBody
@@ -126,7 +150,7 @@ public class UserController {
         HttpRespMsg msg = new HttpRespMsg();
         User newUser = userService.getOne(new QueryWrapper<User>().eq("head_imgurl", token));
         if(newUser != null){
-            msg = userService.pageList(page,account,keyName);
+            msg = userService.pageList(page,account,keyName,newUser);
         }else{
             msg.setError("当前用户不存，或涉及到权限问题，请重新登录");
         }

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

@@ -18,4 +18,6 @@ import java.util.List;
 public interface CompanyMapper extends BaseMapper<Company> {
 
     List<Company> getListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize);
+
+    List<Company> selectIdAndNamelist();
 }

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

@@ -17,4 +17,6 @@ import java.util.List;
 public interface RoleMapper extends BaseMapper<Role> {
 
     List<Role> getListByKeyName(@Param("keyName") String keyName,@Param("start")Integer start,@Param("pageSize") Integer pageSize);
+
+    List<Role> selectIdAndNamelist();
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -18,4 +20,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg addAndUpdateRole(Company company, Integer flag);
 
     HttpRespMsg pageList(PageUtil page, String keyName);
+
+    List<Company> getIdAndNamelist();
 }

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

@@ -1,10 +1,13 @@
 package com.hssx.cloudmodel.service;
 
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Role;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -18,4 +21,6 @@ public interface RoleService extends IService<Role> {
     HttpRespMsg addAndUpdateRole(Role role, Integer flag);
 
     HttpRespMsg pageList(PageUtil page, String keyName);
+
+    List<Role> getIdAndNamelist();
 }

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

@@ -21,5 +21,5 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg login(User user, HttpServletRequest request);
 
-    HttpRespMsg pageList(PageUtil page, String account, String keyName);
+    HttpRespMsg pageList(PageUtil page, String account, String keyName,User user);
 }

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

@@ -62,4 +62,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         msg.data = page;
         return msg;
     }
+
+    @Override
+    public List<Company> getIdAndNamelist() {
+        return companyMapper.selectIdAndNamelist();
+    }
 }

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

@@ -62,4 +62,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         msg.data = page;
         return msg;
     }
+
+    @Override
+    public List<Role> getIdAndNamelist() {
+        return roleMapper.selectIdAndNamelist();
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.UserMapper;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -53,8 +56,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg pageList(PageUtil page, String account, String keyName) {
-        return null;
+    public HttpRespMsg pageList(PageUtil page, String account, String keyName,User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        if(keyName !=null && !"".equals(keyName)){
+            qw.eq("username", keyName);
+        }else if(account !=null && !"".equals(account)){
+            qw.eq("account", account);
+        }
+        qw.eq("parent_id",user.getParentId());
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+        List<User> users = userMapper.selectList(qw);
+        PageInfo<User> pageInfos = new PageInfo<>(users);
+        msg.data = pageInfos;
+        return msg;
     }
 
     @Override

cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -25,4 +25,11 @@
         </where>
         Limit #{start},#{pageSize}
     </select>
+    <select id="selectIdAndNamelist" resultMap="BaseResultMap">
+        select
+          id, company_name
+        from
+          tb_company
+    </select>
+
 </mapper>

cloud-model/src/main/resources/mapper/RoleMapper.xml

@@ -29,4 +29,13 @@
         </where>
         Limit #{start},#{pageSize}
     </select>
+    <select id="selectIdAndNamelist" resultMap="BaseResultMap">
+        select
+          id, role_name
+        from
+          tb_role
+    </select>
+
+
+
 </mapper>