Merge remote-tracking branch 'origin/master'

# Conflicts:
#	authorize-api-service/src/main/java/com/xy/entity/SysDeptRole.java
#	authorize-api-service/src/main/java/com/xy/entity/SysRoleMenu.java

authorize-api-service/src/main/java/com/xy/entity/SysDeptRelation.java

@@ -31,4 +31,8 @@ public class SysDeptRelation extends Model<SysDeptRelation> {
      */
     private Long sysId;
 
+    /**
+     * 系统id
+     */
+    private Long sysId;
 }

authorize-api-service/src/main/java/com/xy/entity/SysDeptRole.java

@@ -28,7 +28,7 @@ public class SysDeptRole extends Model<SysDeptRole> {
 
     @ApiModelProperty("角色id")
     private Long roleId;
-    
+
     @ApiModelProperty("系统ID")
     private Long sysId;
 

authorize-api-service/src/main/java/com/xy/service/impl/SysMenuServiceImpl.java

@@ -9,15 +9,12 @@ import com.xy.collections.list.JList;
 import com.xy.consts.CommConsts;
 import com.xy.dto.SysMenuDto;
 import com.xy.entity.SysMenu;
-import com.xy.entity.SysRole;
 import com.xy.entity.SysRoleMenu;
 import com.xy.entity.join.SysMenuJoinSysRoleMenu;
 import com.xy.mapper.SysMenuMapper;
-import com.xy.mapper.SysRoleMapper;
 import com.xy.mapper.SysRoleMenuMapper;
 import com.xy.redis.RedisCache;
 import com.xy.service.SysMenuService;
-import com.xy.service.SysRoleMenuService;
 import com.xy.utils.R;
 import com.xy.utils.SaTokenUtils;
 import io.swagger.annotations.Api;
@@ -111,4 +108,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         updateById(sysMenu);
         return R.ok();
     }
+
+    @IsAdmin
+    @Override
+    @ApiOperation("删除菜单")
+    public R del(SysMenuDto.Del del) {
+        //删除角色菜单
+        sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getMenuId, del.getId()));
+        //删除菜单
+        removeBatchByIds(del.getId());
+        return R.ok();
+    }
 }

authorize-api-service/src/main/java/com/xy/service/impl/SysSystemServiceImpl.java

@@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.annotation.IsAdmin;
+import com.xy.collections.list.JArrayList;
+import com.xy.collections.list.JList;
 import com.xy.dto.SysSystemDto;
-import com.xy.entity.SysSystem;
-import com.xy.mapper.SysSystemMapper;
+import com.xy.dto.SysSystemValueDto;
+import com.xy.entity.*;
+import com.xy.mapper.*;
 import com.xy.redis.RedisCache;
 import com.xy.service.SysSystemService;
+import com.xy.service.SysSystemValueService;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.PageBean;
 import com.xy.utils.R;
@@ -17,6 +21,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -37,6 +42,24 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @AllArgsConstructor
 public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem> implements SysSystemService {
 
+    private SysSystemValueMapper sysSystemValueMapper;
+
+    private SysRoleMenuMapper sysRoleMenuMapper;
+
+    private SysMenuMapper sysMenuMapper;
+
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    private SysDeptRoleMapper sysDeptRoleMapper;
+
+    private SysRoleMapper sysRoleMapper;
+
+    private SysUserDeptMapper sysUserDeptMapper;
+
+    private SysDeptRelationMapper sysDeptRelationMapper;
+
+    private SysDeptMapper sysDeptMapper;
+
     @IsAdmin
     @Override
     @ApiOperation("添加系统")
@@ -94,8 +117,28 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     @IsAdmin
     @Override
     @ApiOperation("删除系统")
+    @Transactional(rollbackFor = Exception.class)
     public R del(SysSystemDto.Del del) {
-
-        return null;
+        //删除系统属性
+        sysSystemValueMapper.delete(new LambdaQueryWrapper<SysSystemValue>().in(SysSystemValue::getSysId, del.getId()));
+        //删除角色菜单
+        sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getSysId, del.getId()));
+        //删除菜单
+        sysMenuMapper.delete(new LambdaQueryWrapper<SysMenu>().in(SysMenu::getSysId, del.getId()));
+        //删除用户角色
+        sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getSysId, del.getId()));
+        //删除部门角色
+        sysDeptRoleMapper.delete(new LambdaQueryWrapper<SysDeptRole>().in(SysDeptRole::getSysId, del.getId()));
+        //删除角色
+        sysRoleMapper.delete(new LambdaQueryWrapper<SysRole>().in(SysRole::getSysId, del.getId()));
+        //删除用户部门
+        sysUserDeptMapper.delete(new LambdaQueryWrapper<SysUserDept>().in(SysUserDept::getSysId, del.getId()));
+        //删除部门关系
+        sysDeptRelationMapper.delete(new LambdaQueryWrapper<SysDeptRelation>().in(SysDeptRelation::getSysId, del.getId()));
+        //删除部门
+        sysDeptMapper.delete(new LambdaQueryWrapper<SysDept>().in(SysDept::getSysId, del.getId()));
+        //删除系统
+        removeBatchByIds(del.getId());
+        return R.ok();
     }
 }

authorize-api/src/main/java/com/xy/dto/SysMenuDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -79,6 +80,17 @@ public class SysMenuDto {
         private String webJson;
     }
 
+    @Data
+    @ApiModel("删除")
+    @Accessors(chain = true)
+    public static class Del {
+
+        @NotEmpty(message = "id不能为空")
+        @ApiModelProperty(value = "菜单id", required = true)
+        private List<Long> id;
+
+    }
+
     @Data
     @ApiModel("返参类")
     @Accessors(chain = true)

authorize-api/src/main/java/com/xy/dto/SysSystemValueDto.java

@@ -85,7 +85,7 @@ public class SysSystemValueDto {
     }
 
     @Data
-    @ApiModel("修改类")
+    @ApiModel("删除类")
     @Accessors(chain = true)
     public static class Del {
 

authorize-api/src/main/java/com/xy/service/SysMenuService.java

@@ -53,4 +53,13 @@ public interface SysMenuService {
      */
     @PostMapping("update")
     R update(@RequestBody @Validated SysMenuDto.Update update);
+
+    /**
+     * 删除菜单
+     *
+     * @param del
+     * @return
+     */
+    @PostMapping("del")
+    R del(@RequestBody @Validated SysMenuDto.Del del);
 }

sql/init.sql

@@ -73,49 +73,49 @@ values(23, 19, 1, 'dept_role', '分配角色', 2, null, null, now(), now());
 
 -- 新增角色菜单关联
 delete from sys_role_menu where id in(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(1, 1, 1, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(2, 1, 2, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(3, 1, 3, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(4, 1, 4, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(5, 1, 5, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(6, 1, 6, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(7, 1, 7, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(8, 1, 8, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(9, 1, 9, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(10, 1, 10, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(11, 1, 11, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(12, 1, 12, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(13, 1, 13, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(14, 1, 14, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(15, 1, 15, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(16, 1, 16, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(17, 1, 17, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(18, 1, 18, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(19, 1, 19, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(20, 1, 20, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(21, 1, 21, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(22, 1, 22, true);
-insert into sys_role_menu(id, role_id, menu_id, select_is_admin)
-values(23, 1, 23, true);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(1, 1, 1, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(2, 1, 2, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(3, 1, 3, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(4, 1, 4, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(5, 1, 5, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(6, 1, 6, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(7, 1, 7, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(8, 1, 8, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(9, 1, 9, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(10, 1, 10, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(11, 1, 11, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(12, 1, 12, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(13, 1, 13, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(14, 1, 14, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(15, 1, 15, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(16, 1, 16, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(17, 1, 17, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(18, 1, 18, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(19, 1, 19, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(20, 1, 20, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(21, 1, 21, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(22, 1, 22, true, 1);
+insert into sys_role_menu(id, role_id, menu_id, select_is_admin, sys_id)
+values(23, 1, 23, true, 1);