角色列表、新增成员绑定、根据单位id查询三个决口

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/CompanyMemberVO.java

+package com.mmc.iuav.user.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyMemberVO implements Serializable {
+
+
+    @ApiModelProperty(value = "绑定用户id")
+    private Integer userAccountId;
+
+
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
+    @ApiModelProperty(value = "角色姓名")
+    private String roleName;
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyController.java

@@ -3,10 +3,7 @@ package com.mmc.iuav.user.controller;
 import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
-import com.mmc.iuav.user.model.vo.CompanyInfoVO;
-import com.mmc.iuav.user.model.vo.UserAccountVO;
-import com.mmc.iuav.user.model.vo.UserRcdUpVO;
-import com.mmc.iuav.user.model.vo.UserRcdVO;
+import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.service.CompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -88,8 +85,10 @@ public class CompanyController extends BaseController {
     @GetMapping("bindingCompanyMember")
     public ResultBody bindingCompanyMember(HttpServletRequest request,
                                            @RequestParam Integer userAccountId,
-                                           @RequestParam Integer companyInfoId) {
-        return companyService.bindingCompanyMember(this.getUserLoginInfoFromRedis(request), userAccountId, companyInfoId);
+                                           @RequestParam Integer companyInfoId,
+                                           // leader 角色id
+                                           @RequestParam Integer leader) {
+        return companyService.bindingCompanyMember(this.getUserLoginInfoFromRedis(request), userAccountId, companyInfoId, leader);
     }
 
     @ApiOperation(value = "成员-解绑")
@@ -150,4 +149,11 @@ public class CompanyController extends BaseController {
         return  companyService.insertUserRcd(userRcdUpVO.getRUerId(),userRcdUpVO.getUserId());
 
     }
+
+    @ApiOperation(value = "根据公司id获取用户id和角色信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyInfoVO.class)})
+    @PostMapping("listUserAndRoleByCompanyId")
+    public List<CompanyMemberVO> listUserAndRoleByCompanyId(@RequestParam Integer companyInfoId) {
+        return companyService.listUserAndRoleByCompanyId(companyInfoId);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java

@@ -210,4 +210,11 @@ public class UserAccountController extends BaseController {
         return userAccountService.getStateList();
     }
 
+    @ApiOperation(value = "获取角色列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getRolesList")
+    public ResultBody getRolesList() {
+        return userAccountService.getRolesList();
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/CompanyDao.java

@@ -222,4 +222,6 @@ public interface CompanyDao {
     void insertUserRcd(Integer userId,Integer rUserId);
 
     Integer selectUserByUserRcd(Integer userId);
+
+    List<CompanyMemberDO> selectUserAndRoleList(Integer companyInfoId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java

 package com.mmc.iuav.user.dao;
 
+import com.mmc.iuav.user.entity.CompanyRoleDo;
 import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.entity.UserRcdDO;
 import com.mmc.iuav.user.entity.UserStateDO;
@@ -270,4 +271,10 @@ public interface UserServiceDao {
     UserStateVO getUserState(Integer stateId);
 
     Integer getUserStateId(Integer userId);
+
+    /**
+     * 查询角色信息
+     */
+    List<CompanyRoleDo> getCompanyRoleList();
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyMemberDO.java

 package com.mmc.iuav.user.entity;
 
+import com.mmc.iuav.user.model.vo.CompanyMemberVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,7 +20,18 @@ public class CompanyMemberDO implements Serializable {
     private Integer id;
     private Integer userAccountId;
     private Integer companyInfoId;
-    private Integer leader;
+    private Integer isLeader;
     private Date createTime;
 
+    private String roleName;
+
+    public CompanyMemberVO builCompanyMemberVO(){
+        return CompanyMemberVO.builder()
+                .userAccountId(userAccountId)
+                .roleId(isLeader)
+                .roleName(roleName)
+                .build();
+    }
+
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyRoleDo.java

+package com.mmc.iuav.user.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CompanyRoleDo implements Serializable {
+
+    private Integer id;
+
+    private String roleName;
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CompanyService.java

@@ -6,6 +6,7 @@ import com.mmc.iuav.user.entity.CompanyInfoDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
+import com.mmc.iuav.user.model.vo.CompanyMemberVO;
 
 import java.util.List;
 
@@ -98,7 +99,7 @@ public interface CompanyService {
      * @param companyInfoId
      * @return
      */
-    ResultBody bindingCompanyMember(LoginSuccessDTO userLoginInfoFromRedis, Integer userAccountId, Integer companyInfoId);
+    ResultBody bindingCompanyMember(LoginSuccessDTO userLoginInfoFromRedis, Integer userAccountId, Integer companyInfoId, Integer leader);
 
     /**
      * 获取小程序用户绑定企业信息
@@ -174,4 +175,6 @@ public interface CompanyService {
     ResultBody getManagerIdByBackUserId(Integer backUserAccountId);
 
     ResultBody insertUserRcd(Integer rUserId,List<Integer> userIds);
+
+    List<CompanyMemberVO> listUserAndRoleByCompanyId(Integer companyInfoId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/UserAccountService.java

@@ -196,4 +196,5 @@ public interface UserAccountService {
 
     ResultBody getStateList();
 
+    ResultBody getRolesList();
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyAuthServiceImpl.java

@@ -62,7 +62,7 @@ public class CompanyAuthServiceImpl implements CompanyAuthService {
         CompanyMemberDO companyMemberDO = new CompanyMemberDO();
         companyMemberDO.setCompanyInfoId(companyInfoDO.getId());
         companyMemberDO.setUserAccountId(companyAuthVO.getUserAccountId());
-        companyMemberDO.setLeader(1);
+        companyMemberDO.setIsLeader(1);
         companyDao.addCompanyMember(companyMemberDO);
         return ResultBody.success();
     }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -11,6 +11,7 @@ import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
+import com.mmc.iuav.user.model.vo.CompanyMemberVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 import com.mmc.iuav.user.service.CompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -163,7 +164,7 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public ResultBody bindingCompanyMember(LoginSuccessDTO loginSuccessDTO, Integer userAccountId, Integer companyInfoId) {
+    public ResultBody bindingCompanyMember(LoginSuccessDTO loginSuccessDTO, Integer userAccountId, Integer companyInfoId, Integer leader) {
         // 查看该成员是否已被绑定
         int count = companyDao.countBingingCompanyInfoByUID(userAccountId);
         if (count > 0) {
@@ -172,7 +173,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyMemberDO companyMemberDO = new CompanyMemberDO();
         companyMemberDO.setUserAccountId(userAccountId);
         companyMemberDO.setCompanyInfoId(companyInfoId);
-        companyMemberDO.setLeader(0);
+        companyMemberDO.setIsLeader(leader);
         companyDao.addCompanyMember(companyMemberDO);
         return ResultBody.success();
     }
@@ -196,7 +197,7 @@ public class CompanyServiceImpl implements CompanyService {
     public ResultBody unbindCompanyMember(LoginSuccessDTO userLoginInfoFromRedis, Integer userAccountId, Integer companyInfoId) {
         CompanyMemberDO companyMemberDO = companyDao.getCompanyMember(userAccountId, companyInfoId);
         if (companyMemberDO != null) {
-            if (companyMemberDO.getLeader().equals(1)) {
+            if (companyMemberDO.getIsLeader().equals(1)) {
                 return ResultBody.error(ResultEnum.UNBIND_COMPANY_MEMBER_ERROR);
             }
         }
@@ -209,7 +210,7 @@ public class CompanyServiceImpl implements CompanyService {
     public ResultBody transferLeader(LoginSuccessDTO loginSuccessDTO, Integer fromUserAccountId, Integer toUserAccountId, Integer companyInfoId) {
         CompanyMemberDO companyMemberDO = companyDao.getCompanyMember(fromUserAccountId, companyInfoId);
         if (companyMemberDO != null) {
-            if (!companyMemberDO.getLeader().equals(1)) {
+            if (!companyMemberDO.getIsLeader().equals(1)) {
                 return ResultBody.error(ResultEnum.TRANFER_COMPANY_MEMBER_LEADER_ERROR);
             }
         }
@@ -313,5 +314,12 @@ public class CompanyServiceImpl implements CompanyService {
         return ResultBody.success();
     }
 
+    @Override
+    public List<CompanyMemberVO> listUserAndRoleByCompanyId(Integer companyInfoId) {
+        List<CompanyMemberDO> companyMemberDOS = companyDao.selectUserAndRoleList(companyInfoId);
+        List<CompanyMemberVO> companyMemberVOS = companyMemberDOS.stream().map(CompanyMemberDO::builCompanyMemberVO).collect(Collectors.toList());
+        return companyMemberVOS;
+    }
+
 
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -575,6 +575,13 @@ public class UserAccountServiceImpl implements UserAccountService {
         List<UserStateDO> stateList = userServiceDao.getStateList();
         return ResultBody.success(stateList);
     }
+
+    @Override
+    public ResultBody getRolesList() {
+        List<CompanyRoleDo> rolesList = userServiceDao.getCompanyRoleList();
+        return ResultBody.success(rolesList);
+    }
+
     private UserAccountVO getUserAccountVO(Integer userAccountId) {
         UserAccountDO userAccountDO = userServiceDao.getUserAccountById(userAccountId);
         if (userAccountDO == null) {

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -19,7 +19,7 @@
     <insert id="addCompanyMember" parameterType="com.mmc.iuav.user.entity.CompanyMemberDO" keyProperty="id"
             useGeneratedKeys="true">
         insert into company_member(user_account_id, company_info_id, is_leader, create_time)
-        values (#{userAccountId}, #{companyInfoId}, #{leader}, NOW())
+        values (#{userAccountId}, #{companyInfoId}, #{isLeader}, NOW())
     </insert>
     <insert id="insertUserRcd">
         insert into user_rcd(user_account_id,rcd_user_id,create_time) values (#{userId},#{rUserId},NOW())
@@ -294,4 +294,9 @@
         FROM company_back_user cbu INNER JOIN company_info ci ON ci.id = cbu.company_info_id
         WHERE cbu.back_user_account_id = #{backUserAccountId} and ci.is_deleted = 0
     </select>
+    <select id="selectUserAndRoleList" resultType="com.mmc.iuav.user.entity.CompanyMemberDO">
+        SELECT me.user_account_id, me.is_leader, rol.role_name
+        FROM company_member me INNER JOIN company_role rol ON me.is_leader = rol.id
+        where company_info_id = #{companyInfoId}
+    </select>
 </mapper>

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -783,5 +783,8 @@
     <select id="getUserStateId" resultType="java.lang.Integer">
         select user_state_id from user_account where id = #{userId}
     </select>
+    <select id="getCompanyRoleList" resultType="com.mmc.iuav.user.entity.CompanyRoleDo">
+        select id,role_name from company_role
+    </select>
 
 </mapper>