批量删除功能

common/src/main/java/com/huaxu/model/Permission.java

@@ -48,11 +48,8 @@ public class Permission {
     @ApiModelProperty(value="是否是菜单",position = 11)
     private Boolean isMenu;
 
-    @ApiModelProperty(value="所属超级管理员",position = 12)
-    private Boolean isSuperAdmin;
-
-    @ApiModelProperty(value="所属站点",position = 13)
-    private Boolean isSite;
+    @ApiModelProperty(value="是否是菜单",position = 12)
+    private Integer roleId;
 
     @JsonIgnore
     @ApiModelProperty(value="状态",hidden = true)

user_auth/src/main/java/com/huaxu/controller/UserController.java

@@ -53,7 +53,7 @@ public class UserController {
      */
     @RequestMapping(value = "login", method = RequestMethod.POST)
     @ApiOperation(value = "登录")
-    public AjaxMessage<OAuth2AccessToken> login(String mobile, String tenatId) {
+    public AjaxMessage< List<UserDto>> login(String mobile, String tenatId) {
         User user=new User();
         user.setPhone(mobile);
         user.setTenantId(tenatId);

user_auth/src/main/java/com/huaxu/dto/UserDto.java

@@ -12,7 +12,7 @@ public class UserDto {
     @ApiModelProperty(value="租户")
     private String  tenantName;
     @ApiModelProperty(value="租户id")
-    private Integer tenantId;
+    private String tenantId;
     @ApiModelProperty(value="界面url")
     private String webUrl;
     @ApiModelProperty(value="logo")

user_auth/src/main/java/com/huaxu/service/UserService.java

@@ -82,7 +82,7 @@ public interface UserService {
     IPage<User> selectPage(User user, IPage<User> page);
     User findUser(User user);
 
-    OAuth2AccessToken chooseUser(User user);
+    List<UserDto> chooseUser(User user);
     boolean logOut(String token);
 
 }

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -171,20 +171,26 @@ public class UserServiceImpl implements UserService {
 
 
     @Override
-    public OAuth2AccessToken chooseUser(User user) {
+    public List<UserDto> chooseUser(User user) {
 
 
         user=findUser(user);
+        UserDto userDto=new UserDto();
+        userDto.setPhone(user.getPhone());
+        List<UserDto> loginInfos = userMapper.findLoginInfo(userDto);
         Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
         OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) SecurityContextHolder.getContext().getAuthentication();
         LoginUser loginUser = (LoginUser) oAuth2Authentication.getPrincipal();
+        List<ProgramItem>programItems=new ArrayList<>();
+
         Permission permission=new Permission();
+        getDataPermission(permission.getPermissionType(),user,programItems);
         //角色必须是ROLE_开头，其余的是用户功能权限
         /* List<Permission> permissionList =findPermission(user);
         Integer permissionType = permissionList.get(0).getPermissionType();
         List<ProgramItem> programItemList = newArrayList();
         //获取数据权限
-        getDataPermission(permissionType,user,programItemList);
+
         //分配功能权限
         if (permissionList.size() > 0) {
             for (Permission permission : permissionList) {
@@ -196,8 +202,8 @@ public class UserServiceImpl implements UserService {
         }
         loginUser.setProgramItemList(programItemList);
         */
-        GrantedAuthority authority1 = new SimpleGrantedAuthority("sys:menu:edit");
-        grantedAuthorities.add(authority1);
+
+
 
 
         loginUser.setName(user.getUsername());
@@ -218,7 +224,7 @@ public class UserServiceImpl implements UserService {
         OAuth2AccessToken accessToken = authorizationServerTokenServices.createAccessToken(oAuth2AuthenticationNew);
 
         insertLoginLog(loginUser,"登录");
-        return accessToken;
+        return loginInfos;
     }
 
     private void getDataPermission(int permissionType,User user, List<ProgramItem> programItemList){

user_auth/src/main/resources/mapper/UserMapper.xml

@@ -262,7 +262,7 @@
 
     </select>
     <select id="findLoginInfo" resultType="com.huaxu.dto.UserDto">
-        select a.id, a.PHONE,b.TENANT_NAME,b.id tenantId,b.WEB_URL ,b.LOGO
+        select a.id, a.PHONE,b.TENANT_NAME,b.code tenantId,b.WEB_URL ,b.LOGO
         from uims_user a left join uims_tenant b on
         a.TENANT_ID=b.ID
         where a.PHONE=#{phone}

user_center/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -17,7 +17,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .and()
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
-                       "/v2/**","/app/**","/user/**","/menu/**","/role/**","/org/**","/userGroup/**","/loginLog/**","/operateLog/**","/excel/download/**","/dict/**","/userRegister/**")
+                       "/v2/**","/app/**","/user/**","/menu/**","/role/**","/org/**","/userGroup/**","/loginLog/**","/operateLog/**","/excel/download/**","/dict/**","/userRegister/**","/area/**")
                 .permitAll() //配置不需要身份认证的请求路径
                 .anyRequest().authenticated() //其他所有访问路径都需要身份认证
                 .and()

user_center/src/main/java/com/huaxu/controller/AreaController.java

@@ -2,6 +2,7 @@ package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.dto.AreaDto;
 import com.huaxu.entity.Area;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.Pagination;
@@ -11,10 +12,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * (Area)控制层
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/area")
-@Api(tags = "")
+@Api(tags = "区域接口")
 public class AreaController {
     /**
      * 服务对象
@@ -39,7 +39,7 @@ public class AreaController {
      * @return 单条数据
      */
     @RequestMapping(value = "get", method = RequestMethod.POST)
-    @ApiOperation(value = "查询设施配置列表")
+    @ApiOperation(value = "查询区域列表")
     public AjaxMessage<Area> selectOne(
             @ApiParam(value = "设置配置", required = true) @RequestBody Area area) {
         Area result = areaService.selectById(area.getId());
@@ -54,7 +54,7 @@ public class AreaController {
      * @return Response对象
      */
     @RequestMapping(value = "insert", method = RequestMethod.POST)
-    @ApiOperation(value = "查询设施配置列表")
+    @ApiOperation(value = "查询区域列表")
     public AjaxMessage<Integer> insert(@ApiParam(value = "设置配置", required = true) @RequestBody Area area) {
         int result = areaService.insert(area);
 
@@ -68,7 +68,7 @@ public class AreaController {
      * @return Response对象
      */
     @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ApiOperation(value = "查询设施配置列表")
+    @ApiOperation(value = "查询区域列表")
     public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody Area area) {
         int result = areaService.update(area);
         return new AjaxMessage<>(ResultStatus.OK, result);
@@ -82,12 +82,26 @@ public class AreaController {
      * @return Response对象
      */
     @RequestMapping(value = "delete", method = RequestMethod.POST)
-    @ApiOperation(value = "查询设施配置列表")
+    @ApiOperation(value = "查询区域列表")
     public AjaxMessage<Integer> delete(@ApiParam(value = "设置配置", required = true) @RequestBody Area area) {
         int result = areaService.deleteById(area.getId());
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
+    /**
+     * 修改一条数据
+     *
+     * @param id 父类id
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectAll", method = RequestMethod.POST)
+    @ApiOperation(value = "查询区域列表")
+    public AjaxMessage<List<AreaDto>> selectAll(@ApiParam(value = "设置配置", required = true)
+                                              @RequestParam Integer id) {
+        Area area=new Area();
 
+        return new AjaxMessage<>(ResultStatus.OK, areaService.selectList(area));
+
+    }
 
     /**
      * 分页查询
@@ -97,7 +111,7 @@ public class AreaController {
      * @return Response对象
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
-    @ApiOperation(value = "查询设施配置列表")
+    @ApiOperation(value = "查询区域列表")
     public AjaxMessage<Pagination<Area>> selectPage(Integer pageNum, Integer pageSize) {
         Area area = new Area();
         IPage<Area> iPage = new Page<>(pageNum, pageSize);

user_center/src/main/java/com/huaxu/controller/OrgController.java

@@ -71,7 +71,7 @@ public class OrgController {
      * @return Response对象
      */
     @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ApiOperation(value = "更改机构/删除机构",notes = "将状态设为1即为删除")
+    @ApiOperation(value = "更改机构/删除机构",notes = "将状态设为-1即为删除")
     public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody Org org) {
         int result = orgService.update(org);
         if(result==-1){
@@ -106,5 +106,12 @@ public class OrgController {
         ;
         return new AjaxMessage<>(ResultStatus.OK, orgService.getTrees(org));
     }
+    @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
+    @ApiOperation(value = "查询角色对应user")
+    AjaxMessage<Integer> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
+
+        return new AjaxMessage<>(ResultStatus.OK,
+                orgService.deleteAll(ids));
+    }
 
 }

user_center/src/main/java/com/huaxu/controller/RoleController.java

@@ -108,5 +108,11 @@ public class RoleController {
         return new AjaxMessage<>(ResultStatus.OK,
               roleService.findUsersByRole(role) );
     }
+    @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
+    @ApiOperation(value = "查询角色对应user")
+    AjaxMessage<Integer> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
 
+        return new AjaxMessage<>(ResultStatus.OK,
+                roleService.deleteAll(ids));
+    }
 }

user_center/src/main/java/com/huaxu/controller/UserGroupController.java

@@ -114,5 +114,13 @@ public class UserGroupController {
         userGroupService.updateRolesByUserGroup(userGroupDto);
         return new AjaxMessage<>(ResultStatus.OK);
     }
+    @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
+    @ApiOperation(value = "查询角色对应user")
+    AjaxMessage<Integer> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
+
+        return new AjaxMessage<>(ResultStatus.OK,
+                userGroupService.deleteAll(ids));
+    }
+
 
 }

user_center/src/main/java/com/huaxu/dao/AreaMapper.java

@@ -1,6 +1,7 @@
 package com.huaxu.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dto.AreaDto;
 import com.huaxu.entity.Area;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -38,7 +39,7 @@ public interface AreaMapper {
      * @param area 实例对象
      * @return 对象列表
      */
-    List<Area> selectList(Area area);
+    List<AreaDto> selectList(Area area);
 
     /**
      * 新增数据

user_center/src/main/java/com/huaxu/dto/AreaDto.java

@@ -0,0 +1,15 @@
+package com.huaxu.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("区域")
+public class AreaDto {
+    private Integer code;
+    private Integer pid;
+    private String name;
+    private List<AreaDto> children;
+}

user_center/src/main/java/com/huaxu/service/AreaService.java

@@ -1,6 +1,7 @@
 package com.huaxu.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dto.AreaDto;
 import com.huaxu.entity.Area;
 
 import java.util.List;
@@ -35,7 +36,7 @@ public interface AreaService {
      * @param area 实例对象
      * @return 对象列表
      */
-    List<Area> selectList(Area area);
+    List<AreaDto> selectList(Area area);
 
     /**
      * 新增数据

user_center/src/main/java/com/huaxu/service/OrgService.java

@@ -70,6 +70,14 @@ public interface OrgService {
      */
     int deleteById(Integer id);
 
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteAll(List<Integer>ids);
+
     /**
      * 查询总数据数
      *

user_center/src/main/java/com/huaxu/service/RoleService.java

@@ -71,6 +71,7 @@ public interface RoleService {
      * @return 影响行数
      */
     int deleteById(Integer id);
+    int deleteAll(List<Integer>ids);
 
     /**
      * 查询总数据数

user_center/src/main/java/com/huaxu/service/UserGroupService.java

@@ -70,7 +70,7 @@ public interface UserGroupService {
      * @return 影响行数
      */
     int deleteById(Integer id);
-
+    int deleteAll(List<Integer>ids);
     /**
      * 查询总数据数
      *

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

@@ -2,13 +2,17 @@ package com.huaxu.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.AreaMapper;
+import com.huaxu.dto.AreaDto;
 import com.huaxu.entity.Area;
 import com.huaxu.service.AreaService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+import static com.google.common.collect.Lists.newArrayList;
+
 /**
  * (Area表)服务实现类
  *
@@ -48,8 +52,28 @@ public class AreaServiceImpl implements AreaService {
      * @return 实例对象的集合
      */
     @Override
-    public List<Area> selectList(Area area) {
-        return this.areaMapper.selectList(area);
+    public List<AreaDto> selectList(Area area) {
+        return getArea(this.areaMapper.selectList(area),100000,1);
+    }
+    public static List<AreaDto> getArea(List<AreaDto> list, Integer id, Integer leve) {
+        List<AreaDto> temList = newArrayList();
+        if (list != null) {
+            for (AreaDto areaDto : list) {
+                if (id.equals(areaDto.getPid())) {
+                    List<AreaDto> chidren = getArea(list, areaDto.getCode(), ++leve);
+                    AreaDto tempArea = new AreaDto();
+                    BeanUtils.copyProperties(areaDto, tempArea);
+                    tempArea.setChildren(chidren);
+                    temList.add(tempArea);
+                    leve--;
+                }
+            }
+        }
+        if(temList.size() > 0){
+            return temList;
+        }else {
+            return null;
+        }
     }
 
     /**

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

@@ -109,17 +109,13 @@ public class OrgServiceImpl implements OrgService {
             }
         }
         //删除前先查询机构下是否还有用户
-        if(org.getStatus()==-1){
-            Org orgUser = orgMapper.findOrgUser(org);
-            if(orgUser!=null){
-                return -1;
-            }
-        }
+
         LoginUser currentUser = UserUtil.getCurrentUser();
         org.setUpdateBy(currentUser.getUsername());
         return this.orgMapper.update(org);
     }
 
+
     /**
      * 通过主键删除数据
      *
@@ -131,6 +127,24 @@ public class OrgServiceImpl implements OrgService {
         return this.orgMapper.deleteById(id);
     }
 
+    @Override
+    public int deleteAll(List<Integer> ids) {
+            ids.forEach(id->{
+                        Org org=new Org();
+                        org.setId(id);
+                        Org orgUser = orgMapper.findOrgUser(org);
+                        if(orgUser==null){
+                            org.setStatus(-1);
+                            orgMapper.update(org);
+                        }
+
+                 });
+
+
+
+        return 0;
+    }
+
     /**
      * 查询总数据数
      *

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

@@ -110,16 +110,7 @@ public class RoleServiceImpl implements RoleService {
     public int update(RoleRequestDto roleRequestDto) {
         Role role=roleRequestDto.getRole();
 
-        if(role.getStatus()==-1){
-            Role roleUser = roleMapper.findRoleUser(role);
-            if(roleUser!=null){
-                return -1;
-            }
-            //删除用户与角色的关系
-            roleMapper.deleteRoleUser(role);
-            //删除用户与菜单关系
-            roleMapper.deleteRoleMenu(role);
-        }
+
         //將禁用的角色放入redis，作为登出判断
         if(role.getRoleState()==-1){
             String roleKey="disableRole:"+role.getId();
@@ -164,6 +155,26 @@ public class RoleServiceImpl implements RoleService {
         return this.roleMapper.deleteById(id);
     }
 
+    @Override
+    public int deleteAll(List<Integer> ids) {
+        ids.forEach(id->{
+            Role role=new Role();
+            role.setId(id);
+                Role roleUser = roleMapper.findRoleUser(role);
+                if (roleUser==null){
+                    role.setStatus(-1);
+                    roleMapper.update(role);
+                }
+                //删除用户与角色的关系
+                //roleMapper.deleteRoleUser(role);
+                //删除用户与菜单关系
+                // roleMapper.deleteRoleMenu(role);
+
+        });
+
+        return 0;
+    }
+
     /**
      * 查询总数据数
      *

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

@@ -100,14 +100,7 @@ public class UserGroupServiceImpl implements UserGroupService {
     @Override
     @Transactional
     public int update(UserGroup userGroup) {
-        if(userGroup.getStatus()==-1){
-            UserGroup hasUserGroupUsers = userGroupMapper.findHasUserGroupUsers(userGroup);
-            if(hasUserGroupUsers!=null){
-                return -1;
-            }
-            //删除用户与用户组的关系
-            userGroupMapper.deleteUserGroupRelations(userGroup);
-        }
+
         LoginUser currentUser = UserUtil.getCurrentUser();
         userGroup.setUpdateBy(currentUser.getUsername());
         return this.userGroupMapper.update(userGroup);
@@ -124,6 +117,24 @@ public class UserGroupServiceImpl implements UserGroupService {
         return this.userGroupMapper.deleteById(id);
     }
 
+    @Override
+    public int deleteAll(List<Integer> ids) {
+        ids.forEach(id->{
+            UserGroup userGroup=new UserGroup();
+            userGroup.setId(id);
+
+                UserGroup hasUserGroupUsers = userGroupMapper.findHasUserGroupUsers(userGroup);
+                if(hasUserGroupUsers==null){
+                    userGroup.setStatus(-1);
+                userGroupMapper.update(userGroup);
+                //删除用户与用户组的关系
+                // userGroupMapper.deleteUserGroupRelations(userGroup);
+            }
+        });
+
+        return 0;
+    }
+
     /**
      * 查询总数据数
      *

user_center/src/main/resources/mapper/AreaMapper.xml

@@ -41,9 +41,9 @@
     </select>
 
     <!--通过实体作为筛选条件查询-->
-    <select id="selectList" resultMap="AreaMap">
+    <select id="selectList" resultType="com.huaxu.dto.AreaDto">
         select
-        <include refid="Base_Column_List"/>
+        id code,parent_id pid,name
         from uims_area
         <where>
             <if test="id != null">

user_center/src/main/resources/mapper/RoleMapper.xml

@@ -176,7 +176,7 @@
                 and TENANT_ID = #{role.tenantId}
             </if>
             <if test="role.roleName != null and role.roleName != ''">
-                and ROLE_NAME = #{role.roleName}
+                and ROLE_NAME  like concat('%', #{role.roleName}, '%')
             </if>
             <if test="role.description != null and role.description != ''">
                 and DESCRIPTION = #{role.description}
@@ -208,7 +208,7 @@
         </where>
     </select>
     <select id="findRoleUser" resultType="com.huaxu.entity.Role">
-        select a.id from uims_user_role  where a.ROLE_ID=#{id} and a.status!=-1
+        select a.id from uims_user_role a where a.ROLE_ID=#{id} and a.status!=-1 limit 1
     </select>
     <sql id="sysAreaJoins">
           left join uims_org com ON com.id = a.company_org_id

user_center/src/test/com/huaxu/test/TestEXCEL.java

@@ -0,0 +1,34 @@
+package com.huaxu.test;
+
+import lombok.Data;
+
+@Data
+public class TestEXCEL {
+    private String a1;
+    private String a2;
+    private String a3;
+    private String a4;
+    private String a5;
+    private String a6;
+    private String a7;
+    private String a8;
+    private String a9;
+    private String a10;
+    private String a11;
+    private String a12;
+    public TestEXCEL(String value){
+        this.a1=value;
+        this.a2=value;
+        this.a3=value;
+        this.a4=value;
+        this.a5=value;
+        this.a6=value;
+        this.a7=value;
+        this.a8=value;
+        this.a9=value;
+        this.a10=value;
+        this.a11=value;
+        this.a12=value;
+
+    }
+}

user_center/src/test/com/huaxu/test/TestOrgTree.java

@@ -1,5 +1,9 @@
 package com.huaxu.test;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.huaxu.common.CustemhandlerUtils;
+import com.huaxu.common.EasyExcelUtil;
 import com.huaxu.dto.OrgTree;
 import com.huaxu.entity.Org;
 import com.huaxu.model.Permission;
@@ -7,16 +11,24 @@ import com.huaxu.model.ProgramItem;
 import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static com.google.common.collect.Lists.newArrayList;
 
 public class TestOrgTree {
-    @Test
+   // @Test
     public void test(){
-
+      /*  List<TestEXCEL>list =new ArrayList<>();
+        for(int i=0;i<1000000;i++){
+            TestEXCEL excel=new TestEXCEL(UUID.randomUUID().toString());
+            list.add(excel);
+        }
+        EasyExcel.write("D:\\test\\2020\\10\\31/1.xlsx", TestEXCEL.class)
+                .excelType(ExcelTypeEnum.XLSX)
+                .registerWriteHandler(new CustemhandlerUtils())
+                .registerWriteHandler(EasyExcelUtil.getStyleStrategy())
+                .sheet("Export")
+                .doWrite(list);*/
     }
 
     public void getOrg(){