Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/service/impl/TenantServiceImpl.java

@@ -3,13 +3,10 @@ package com.huaxu.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.common.ToolUtil;
-import com.huaxu.dao.TenantMapper;
+import com.huaxu.dao.*;
 import com.huaxu.dto.RoleRequestDto;
 import com.huaxu.dto.TenantDto;
-import com.huaxu.entity.Org;
-import com.huaxu.entity.Role;
-import com.huaxu.entity.TenantEntity;
-import com.huaxu.entity.UserEntity;
+import com.huaxu.entity.*;
 import com.huaxu.model.LoginUser;
 import com.huaxu.service.OrgService;
 import com.huaxu.service.RoleService;
@@ -21,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -41,18 +39,23 @@ public class TenantServiceImpl implements TenantService {
     /**
      * 用户
      */
-     @Autowired
-     private UserService userService;
+     @Resource
+     private UserMapper userMapper;
+    /**
+     * 角色
+     */
+    @Resource
+     private RoleMapper roleMapper;
     /**
      * 角色
      */
-    @Autowired
-     private RoleService roleService;
+    @Resource
+    private RoleMenuMapper roleMenuMapper;
     /**
      * 机构
      */
-    @Autowired
-    private OrgService orgService;
+    @Resource
+    private OrgMapper orgMapper;
 
     /**
      * 通过ID查询单条数据
@@ -117,20 +120,33 @@ public class TenantServiceImpl implements TenantService {
             tenantMapper.createTenantMenu(tenantDto.getCreateBy(),tenantDto.getId(),tenantDto.getTenantMenuIds());
         }
         //创建角色
-        RoleRequestDto roleRequestDto = new RoleRequestDto();
         Role role = new Role();
         role.setRoleName(tenantDto.getTenantName());
         role.setDescription(tenantDto.getTenantName() +"初始化角色");
         role.setRoleState(1);
         role.setPermissionType(1);
-        roleRequestDto.setRole(role);
-        //查询租户菜单id
-//        List<Integer > tenantMenuIds = tenantMapper.selectTenantMenuIds(tenantDto.getId());
-        roleRequestDto.setIds(tenantDto.getTenantMenuIds());
+        role.setTenantId(tenantDto.getCode());
+        role.setCreateBy(loginUser.getUsername());
+        role.setDateCreate(new Date());
+        role.setStatus(1);
         //插入角色
-        roleService.insert(roleRequestDto);
+        roleMapper.insert(role);
         //插入角色菜单（租户菜单id）
-        roleService.updateRoleMenuRelations(roleRequestDto);
+        Integer roleId =role.getId();
+        List<Integer> menuIds = tenantDto.getTenantMenuIds();
+        List<RoleMenu>menus=new ArrayList<>();
+        roleMapper.deleteRoleMenu(role);
+        menuIds.forEach(id->{
+            RoleMenu roleMenu=new RoleMenu();
+            roleMenu.setRoleId(roleId);
+            roleMenu.setMenuId(id);
+            roleMenu.setStatus(1);
+            menus.add(roleMenu);
+        });
+        roleMenuMapper.batchInsert(menus);
+
+
+//        roleService.updateRoleMenuRelations(roleRequestDto);
 
         /*创建机构*/
         Org org = new Org();
@@ -141,7 +157,11 @@ public class TenantServiceImpl implements TenantService {
         org.setOrgState(1);
         org.setOrgType("company");  //机构类型
         org.setParentId(0);
-        orgService.insert(org);
+        org.setCreateBy(loginUser.getUsername());
+        org.setDateCreate(new Date());
+        org.setStatus(1);
+        org.setParentOrgId(0);
+        orgMapper.insert(org);
 
 
         //创建管理员信息
@@ -158,7 +178,7 @@ public class TenantServiceImpl implements TenantService {
         userEntity.setRoleId(role.getId().longValue()); //赋值角色
         userEntity.setCompanyOrgId(org.getId().longValue());//公司
         userEntity.setDeptOrgId(org.getId().longValue());//机构
-        userService.addUser(userEntity);
+        userMapper.insert(userEntity);
         return 1;
     }
 
@@ -202,30 +222,36 @@ public class TenantServiceImpl implements TenantService {
             tenantMapper.deleteTenantMenuIds(tenantDto.getId(),deleteTenantMenuIds);
         }
         //修改管理员信息
-        UserEntity userEntity =userService.findUserById(tenantDto.getUserId());
+        UserEntity userEntity =userMapper.findUserById(tenantDto.getUserId());
         userEntity.setUpdateBy(tenantDto.getUpdateBy());
         userEntity.setDateUpdate(new Date());
         userEntity.setPhone(tenantDto.getPhone());
         userEntity.setUsername(tenantDto.getUserName());
         userEntity.setEnableState("1");
-        userService.updateUserById(userEntity);
+        userMapper.updateById(userEntity);
 
 
         //创建角色
-        RoleRequestDto roleRequestDto = new RoleRequestDto();
-        Role role = roleService.selectById(userEntity.getRoleId().intValue());
+
+        Role role = roleMapper.selectById(userEntity.getRoleId().intValue());
         role.setRoleName(tenantDto.getTenantName());
         role.setDescription(tenantDto.getTenantName() +"初始化角色");
-        roleRequestDto.setRole(role);
-        //查询租户菜单id
-//        List<Integer > tenantMenuIds = tenantMapper.selectTenantMenuIds(tenantDto.getId());
-
-        roleRequestDto.setIds(newTenantMenuIds);
-        //插入角色
-        roleService.update(roleRequestDto);
-        //插入角色菜单（租户菜单id）
-        roleService.updateRoleMenuRelations(roleRequestDto);
-
+        role.setCreateBy(loginUser.getUsername());
+        role.setDateUpdate(new Date());
+        //更新角色
+        roleMapper.update(role);
+        //更新角色菜单（租户菜单id）
+        Integer roleId =role.getId();
+        List<RoleMenu>menus=new ArrayList<>();
+        roleMapper.deleteRoleMenu(role);
+        newTenantMenuIds.forEach(id->{
+            RoleMenu roleMenu=new RoleMenu();
+            roleMenu.setRoleId(roleId);
+            roleMenu.setMenuId(id);
+            roleMenu.setStatus(1);
+            menus.add(roleMenu);
+        });
+        roleMenuMapper.batchInsert(menus);
         return 1;
     }