Browse Source

规范对外接口

李进 2 years ago
parent
commit
1575d30695

+ 1 - 1
authorize-api-service/src/main/java/com/xy/service/impl/AuthorizeServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
 @AllArgsConstructor
 @AllArgsConstructor
 public class AuthorizeServiceImpl implements AuthorizeService {
 public class AuthorizeServiceImpl implements AuthorizeService {
 
 
-    private SysMenuService sysMenuService;
+    private SysMenuServiceImpl sysMenuService;
 
 
     @Override
     @Override
     @ApiOperation("获取菜单")
     @ApiOperation("获取菜单")

+ 19 - 11
authorize-api-service/src/main/java/com/xy/service/impl/SysDeptServiceImpl.java

@@ -20,10 +20,13 @@ import com.xy.utils.R;
 import com.xy.utils.SaTokenUtils;
 import com.xy.utils.SaTokenUtils;
 import com.xy.vo.SysDeptVo;
 import com.xy.vo.SysDeptVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
 
+import javax.validation.Valid;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -44,9 +47,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     private final SysUserDeptService sysUserDeptService;
     private final SysUserDeptService sysUserDeptService;
 
 
 
 
-    @Override
+    @ApiOperation(value = "新增、更新部门信息", notes = "新增、更新部门信息")
+    @PostMapping("saveOrUpdate")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public R<Boolean> saveOrUpdate(SysDeptDto sysDeptDto) {
+    public R<Boolean> saveOrUpdate(@Valid @RequestBody SysDeptDto sysDeptDto) {
         Long id = sysDeptDto.getId();
         Long id = sysDeptDto.getId();
         if (SaTokenUtils.getId() == null) {
         if (SaTokenUtils.getId() == null) {
             return R.fail("获取用户信息失败");
             return R.fail("获取用户信息失败");
@@ -92,22 +96,25 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         return R.ok(saveOrUpdate(sysDept));
         return R.ok(saveOrUpdate(sysDept));
     }
     }
 
 
-    @Override
-    public R<List<Tree<Long>>> deptTree(Long sysId) {
+    @ApiOperation(value = "系统部门树", notes = "系统部门树")
+    @GetMapping("tree/{sysId}")
+    public R<List<Tree<Long>>> deptTree(@PathVariable("sysId") Long sysId) {
         List<Tree<Long>> deptTree = getDeptTree(this.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getSysId, sysId)), 0L);
         List<Tree<Long>> deptTree = getDeptTree(this.list(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getSysId, sysId)), 0L);
         return R.ok(deptTree);
         return R.ok(deptTree);
     }
     }
 
 
-    @Override
-    public R<SysDeptVo> getById(Long id) {
+    @ApiOperation(value = "根据ID获取部门信息", notes = "根据ID获取部门信息")
+    @GetMapping("{id}")
+    public R<SysDeptVo> getById(@PathVariable("id") Long id) {
         SysDept sysDept = super.getById(id);
         SysDept sysDept = super.getById(id);
         SysDeptVo sysRoleVo = copy(SysDeptVo.class, sysDept);
         SysDeptVo sysRoleVo = copy(SysDeptVo.class, sysDept);
         return R.ok(sysRoleVo);
         return R.ok(sysRoleVo);
     }
     }
 
 
-    @Override
+    @ApiOperation(value = "删除部门", notes = "删除部门")
+    @DeleteMapping("{id}")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public R<Boolean> deleteById(Long id) {
+    public R<Boolean> deleteById(@PathVariable("id") Long id) {
         // 级联删除部门
         // 级联删除部门
         List<Long> idList = sysDeptRelationService
         List<Long> idList = sysDeptRelationService
                 .list(Wrappers.<SysDeptRelation>query().lambda().eq(SysDeptRelation::getAncestor, id)).stream()
                 .list(Wrappers.<SysDeptRelation>query().lambda().eq(SysDeptRelation::getAncestor, id)).stream()
@@ -122,12 +129,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         sysDeptRoleService.removeDeptRoleById(id);
         sysDeptRoleService.removeDeptRoleById(id);
         //业务用户部门关系 sys_user_dept
         //业务用户部门关系 sys_user_dept
         sysUserDeptService.remove(Wrappers.<SysUserDept>lambdaQuery().in(SysUserDept::getDeptId, idList));
         sysUserDeptService.remove(Wrappers.<SysUserDept>lambdaQuery().in(SysUserDept::getDeptId, idList));
-        
+
         return R.ok(Boolean.TRUE);
         return R.ok(Boolean.TRUE);
     }
     }
 
 
-    @Override
-    public R<List<Tree<Long>>> getDeptTreeById(Long deptId) {
+    @ApiOperation(value = "获取指定部门部门树", notes = "获取指定部门部门树")
+    @GetMapping("deptTree/{id}")
+    public R<List<Tree<Long>>> getDeptTreeById(@PathVariable("id") Long deptId) {
         List<Long> descendantIdList = sysDeptRelationService
         List<Long> descendantIdList = sysDeptRelationService
                 .list(Wrappers.<SysDeptRelation>query().lambda().eq(SysDeptRelation::getAncestor, deptId)).stream()
                 .list(Wrappers.<SysDeptRelation>query().lambda().eq(SysDeptRelation::getAncestor, deptId)).stream()
                 .map(SysDeptRelation::getDescendant).collect(Collectors.toList());
                 .map(SysDeptRelation::getDescendant).collect(Collectors.toList());

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

@@ -21,6 +21,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -45,9 +48,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 
 
     private SysRoleMapper sysRoleMapper;
     private SysRoleMapper sysRoleMapper;
 
 
-    @Override
+    @PostMapping("workMenu")
     @ApiOperation("用户菜单树")
     @ApiOperation("用户菜单树")
-    public R<List<SysMenuDto.Vo>> workMenu(SysMenuDto.WorkMenu workMenu) {
+    public R<List<SysMenuDto.Vo>> workMenu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {
         List<SysMenuDto.Vo> list = new ArrayList<>();
         List<SysMenuDto.Vo> list = new ArrayList<>();
         List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenuTree(SaTokenUtils.getToken(), workMenu.getSystemId());
         List<SysMenuJoinSysRoleMenu> menus = RedisCache.getMenuTree(SaTokenUtils.getToken(), workMenu.getSystemId());
         menus.forEach(sysMenuJoinSysRoleMenu -> {
         menus.forEach(sysMenuJoinSysRoleMenu -> {
@@ -58,9 +61,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return R.ok(list);
         return R.ok(list);
     }
     }
 
 
-    @Override
+    @PostMapping("menu")
     @ApiOperation("全部菜单树")
     @ApiOperation("全部菜单树")
-    public R<List<SysMenuDto.Vo>> menu(SysMenuDto.WorkMenu workMenu) {
+    public R<List<SysMenuDto.Vo>> menu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu) {
         List<SysMenuDto.Vo> vos = copy(SysMenuDto.Vo.class, list());
         List<SysMenuDto.Vo> vos = copy(SysMenuDto.Vo.class, list());
         JList<SysMenuDto.Vo> list = new JArrayList<>(vos).filter().isNull(SysMenuDto.Vo::getPaterId).list();
         JList<SysMenuDto.Vo> list = new JArrayList<>(vos).filter().isNull(SysMenuDto.Vo::getPaterId).list();
         for (SysMenuDto.Vo vo : list) {
         for (SysMenuDto.Vo vo : list) {
@@ -70,9 +73,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return R.ok(list);
         return R.ok(list);
     }
     }
 
 
-    @Override
+    @PostMapping("save")
     @ApiOperation("添加菜单")
     @ApiOperation("添加菜单")
-    public R save(SysMenuDto.Save save) {
+    public R save(@RequestBody @Validated SysMenuDto.Save save) {
         //校验重复
         //校验重复
         Long longId = SaTokenUtils.getId(Long.class);
         Long longId = SaTokenUtils.getId(Long.class);
         long count = count(new LambdaQueryWrapper<SysMenu>()
         long count = count(new LambdaQueryWrapper<SysMenu>()
@@ -97,9 +100,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return R.ok();
         return R.ok();
     }
     }
 
 
-    @Override
+    @PostMapping("update")
     @ApiOperation("修改菜单")
     @ApiOperation("修改菜单")
-    public R update(SysMenuDto.Update update) {
+    public R update(@RequestBody @Validated SysMenuDto.Update update) {
         Long longId = SaTokenUtils.getId(Long.class);
         Long longId = SaTokenUtils.getId(Long.class);
         SysMenu sysMenu = copy(SysMenu.class, update)
         SysMenu sysMenu = copy(SysMenu.class, update)
                 .update(longId);
                 .update(longId);
@@ -107,9 +110,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return R.ok();
         return R.ok();
     }
     }
 
 
-    @Override
+    @PostMapping("del")
     @ApiOperation("删除菜单")
     @ApiOperation("删除菜单")
-    public R del(SysMenuDto.Del del) {
+    public R del(@RequestBody @Validated SysMenuDto.Del del) {
         //删除角色菜单
         //删除角色菜单
         sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getMenuId, del.getId()));
         sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getMenuId, del.getId()));
         //删除菜单
         //删除菜单

+ 25 - 14
authorize-api-service/src/main/java/com/xy/service/impl/SysRoleServiceImpl.java

@@ -22,10 +22,13 @@ import com.xy.vo.RoleMenuVo;
 import com.xy.vo.SysRoleGroupBySysVo;
 import com.xy.vo.SysRoleGroupBySysVo;
 import com.xy.vo.SysRoleVo;
 import com.xy.vo.SysRoleVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -50,8 +53,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     private final SysUserRoleService sysUserRoleService;
     private final SysUserRoleService sysUserRoleService;
     private final SysSystemMapper sysSystemMapper;
     private final SysSystemMapper sysSystemMapper;
 
 
-    @Override
-    public R<Long> saveOrUpdate(SysRoleDto sysRoleDto) {
+    @ApiOperation(value = "新增、更新角色信息", notes = "新增、更新角色信息")
+    @PostMapping("saveOrUpdate")
+    public R<Long> saveOrUpdate(@Valid @RequestBody SysRoleDto sysRoleDto) {
         Long id = sysRoleDto.getId();
         Long id = sysRoleDto.getId();
         long currentUser = Long.parseLong(SaTokenUtils.getId().toString());
         long currentUser = Long.parseLong(SaTokenUtils.getId().toString());
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<SysRole>()
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<SysRole>()
@@ -71,8 +75,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return R.ok(sysRole.getId());
         return R.ok(sysRole.getId());
     }
     }
 
 
-    @Override
-    public R<Boolean> batchDelete(BatchDeleteDto batchDeleteDto) {
+    @ApiOperation(value = "删除角色", notes = "删除角色")
+    @DeleteMapping
+    public R<Boolean> batchDelete(@Valid @RequestBody BatchDeleteDto batchDeleteDto) {
         List<Long> ids = batchDeleteDto.getIds();
         List<Long> ids = batchDeleteDto.getIds();
         if (CollUtil.isNotEmpty(ids)) {
         if (CollUtil.isNotEmpty(ids)) {
             for (Long id : ids) {
             for (Long id : ids) {
@@ -83,8 +88,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return R.ok(Boolean.TRUE);
         return R.ok(Boolean.TRUE);
     }
     }
 
 
-    @Override
-    public R<SysRoleVo> getById(Long id) {
+    @ApiOperation(value = "获取角色详情", notes = "获取角色详情")
+    @GetMapping("{id}")
+    public R<SysRoleVo> getById(@PathVariable("id") Long id) {
         SysRole role = super.getById(id);
         SysRole role = super.getById(id);
         SysRoleVo sysRoleVo = copy(SysRoleVo.class, role);
         SysRoleVo sysRoleVo = copy(SysRoleVo.class, role);
         //角色菜单
         //角色菜单
@@ -92,7 +98,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return R.ok(sysRoleVo);
         return R.ok(sysRoleVo);
     }
     }
 
 
-    @Override
+    @ApiOperation(value = "分页获取角色信息", notes = "分页获取角色信息")
+    @GetMapping("page")
     public R<PageBean<SysRoleVo>> getRolePage(PageBean pageBean, SysRoleDto sysRoleDto) {
     public R<PageBean<SysRoleVo>> getRolePage(PageBean pageBean, SysRoleDto sysRoleDto) {
         IPage<SysRole> page = page(toIPage(pageBean), Wrappers.<SysRole>lambdaQuery()
         IPage<SysRole> page = page(toIPage(pageBean), Wrappers.<SysRole>lambdaQuery()
                 .like(StrUtil.isNotBlank(sysRoleDto.getName()), SysRole::getName, sysRoleDto.getName())
                 .like(StrUtil.isNotBlank(sysRoleDto.getName()), SysRole::getName, sysRoleDto.getName())
@@ -101,14 +108,16 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
 
     }
     }
 
 
-    @Override
-    public R<Boolean> saveRoleMenus(RoleMenuVo roleMenuVo) {
+    @ApiOperation(value = "编辑角色菜单", notes = "编辑角色菜单")
+    @PostMapping("saveRoleMenus")
+    public R<Boolean> saveRoleMenus(@RequestBody RoleMenuVo roleMenuVo) {
         return R.ok(sysRoleMenuService.saveRoleMenus(roleMenuVo));
         return R.ok(sysRoleMenuService.saveRoleMenus(roleMenuVo));
     }
     }
 
 
-    @Override
+    @ApiOperation(value = "删除角色", notes = "删除角色")
+    @DeleteMapping("{id}")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public R<Boolean> deleteRoleById(Long id) {
+    public R<Boolean> deleteRoleById(@PathVariable("id") Long id) {
         //角色 sys_role
         //角色 sys_role
         removeById(id);
         removeById(id);
         //角色菜单 sys_role_menu
         //角色菜单 sys_role_menu
@@ -120,13 +129,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return R.ok(Boolean.TRUE);
         return R.ok(Boolean.TRUE);
     }
     }
 
 
-    @Override
-    public R<List<SysRoleVo>> listBySysId(Long sysId) {
+    @ApiOperation(value = "根据系统获取角色列表", notes = "根据系统获取角色列表")
+    @GetMapping("listBySys/{sysId}")
+    public R<List<SysRoleVo>> listBySysId(@PathVariable("sysId") Long sysId) {
         List<SysRole> list = this.list(Wrappers.<SysRole>lambdaQuery().eq(SysRole::getSysId, sysId));
         List<SysRole> list = this.list(Wrappers.<SysRole>lambdaQuery().eq(SysRole::getSysId, sysId));
         return R.ok(copy(SysRoleVo.class, list));
         return R.ok(copy(SysRoleVo.class, list));
     }
     }
 
 
-    @Override
+    @ApiOperation(value = "获取当前登录用户创建的角色列表", notes = "获取当前登录用户创建的角色列表")
+    @GetMapping("myCreatedRoles}")
     public R<List<SysRoleGroupBySysVo>> myCreatedRoles() {
     public R<List<SysRoleGroupBySysVo>> myCreatedRoles() {
         List<SysRoleGroupBySysVo> sysRoleGroupBySysVos = new ArrayList<>(16);
         List<SysRoleGroupBySysVo> sysRoleGroupBySysVos = new ArrayList<>(16);
         Long curUserId = Long.parseLong(SaTokenUtils.getId().toString());
         Long curUserId = Long.parseLong(SaTokenUtils.getId().toString());

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

@@ -9,7 +9,6 @@ import com.xy.dto.SysSystemDto;
 import com.xy.entity.*;
 import com.xy.entity.*;
 import com.xy.mapper.*;
 import com.xy.mapper.*;
 import com.xy.redis.RedisCache;
 import com.xy.redis.RedisCache;
-import com.xy.service.SysRoleService;
 import com.xy.service.SysSystemService;
 import com.xy.service.SysSystemService;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.PageBean;
 import com.xy.utils.PageBean;
@@ -20,6 +19,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -58,12 +60,12 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
 
 
     private SysDeptMapper sysDeptMapper;
     private SysDeptMapper sysDeptMapper;
 
 
-    private SysRoleService sysRoleService;
+    private SysRoleServiceImpl sysRoleService;
 
 
-    @Override
+    @PostMapping("save")
     @ApiOperation("添加系统")
     @ApiOperation("添加系统")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public R<Long> save(SysSystemDto.Save save) {
+    public R<Long> save(@RequestBody @Validated SysSystemDto.Save save) {
         //校验
         //校验
         long count = count(new LambdaQueryWrapper<SysSystem>().eq(SysSystem::getCode, save.getCode()));
         long count = count(new LambdaQueryWrapper<SysSystem>().eq(SysSystem::getCode, save.getCode()));
         if (count > 0) {
         if (count > 0) {
@@ -90,17 +92,17 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return R.ok(sysSystem.getId());
         return R.ok(sysSystem.getId());
     }
     }
 
 
-    @Override
+    @PostMapping("update")
     @ApiOperation("修改系统")
     @ApiOperation("修改系统")
-    public R update(SysSystemDto.Update update) {
+    public R update(@RequestBody @Validated SysSystemDto.Update update) {
         SysSystem sysSystem = copy(SysSystem.class, update).update(Long.parseLong(SaTokenUtils.getId().toString()));
         SysSystem sysSystem = copy(SysSystem.class, update).update(Long.parseLong(SaTokenUtils.getId().toString()));
         updateById(sysSystem);
         updateById(sysSystem);
         return R.ok();
         return R.ok();
     }
     }
 
 
-    @Override
+    @PostMapping("list")
     @ApiOperation("登录人所属系统列表")
     @ApiOperation("登录人所属系统列表")
-    public R<List<SysSystemDto.Vo>> list(SysSystemDto.Select select) {
+    public R<List<SysSystemDto.Vo>> list(@RequestBody SysSystemDto.Select select) {
         List<Long> systemIds = RedisCache.getSystemIds(SaTokenUtils.getToken());
         List<Long> systemIds = RedisCache.getSystemIds(SaTokenUtils.getToken());
         LambdaQueryWrapper<SysSystem> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystem.class)
         LambdaQueryWrapper<SysSystem> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystem.class)
                 .in(SysSystem::getId, systemIds)
                 .in(SysSystem::getId, systemIds)
@@ -113,9 +115,9 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return R.ok(copy(SysSystemDto.Vo.class, list));
         return R.ok(copy(SysSystemDto.Vo.class, list));
     }
     }
 
 
-    @Override
+    @PostMapping("page")
     @ApiOperation("分页查询")
     @ApiOperation("分页查询")
-    public R<PageBean<SysSystemDto.Vo>> page(SysSystemDto.PageSelect pageSelect) {
+    public R<PageBean<SysSystemDto.Vo>> page(@RequestBody @Validated SysSystemDto.PageSelect pageSelect) {
         LambdaQueryWrapper<SysSystem> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(pageSelect, SysSystem.class)
         LambdaQueryWrapper<SysSystem> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(pageSelect, SysSystem.class)
                 .ge(SysSystem::getCreateTime, pageSelect.getBeginCreateTime())
                 .ge(SysSystem::getCreateTime, pageSelect.getBeginCreateTime())
                 .le(SysSystem::getCreateTime, pageSelect.getEndCreateTime())
                 .le(SysSystem::getCreateTime, pageSelect.getEndCreateTime())
@@ -127,10 +129,10 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return R.ok(toPageBean(SysSystemDto.Vo.class, page));
         return R.ok(toPageBean(SysSystemDto.Vo.class, page));
     }
     }
 
 
-    @Override
+    @PostMapping("del")
     @ApiOperation("删除系统")
     @ApiOperation("删除系统")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public R del(SysSystemDto.Del del) {
+    public R del(@RequestBody @Validated SysSystemDto.Del del) {
         //删除系统属性
         //删除系统属性
         sysSystemValueMapper.delete(new LambdaQueryWrapper<SysSystemValue>().in(SysSystemValue::getSysId, del.getId()));
         sysSystemValueMapper.delete(new LambdaQueryWrapper<SysSystemValue>().in(SysSystemValue::getSysId, del.getId()));
         //删除角色菜单
         //删除角色菜单

+ 6 - 5
authorize-api-service/src/main/java/com/xy/service/impl/SysSystemValueServiceImpl.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.Beans.copy;
@@ -34,7 +35,7 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "系统属性接口")
 @Api(tags = "系统属性接口")
 public class SysSystemValueServiceImpl extends ServiceImpl<SysSystemValueMapper, SysSystemValue> implements SysSystemValueService {
 public class SysSystemValueServiceImpl extends ServiceImpl<SysSystemValueMapper, SysSystemValue> implements SysSystemValueService {
 
 
-    @Override
+    @PostMapping("save")
     @ApiOperation("添加")
     @ApiOperation("添加")
     public R<Boolean> save(@RequestBody @Validated SysSystemValueDto.Save save) {
     public R<Boolean> save(@RequestBody @Validated SysSystemValueDto.Save save) {
         long count = count(new LambdaQueryWrapper<SysSystemValue>()
         long count = count(new LambdaQueryWrapper<SysSystemValue>()
@@ -50,9 +51,9 @@ public class SysSystemValueServiceImpl extends ServiceImpl<SysSystemValueMapper,
         return R.ok();
         return R.ok();
     }
     }
 
 
-    @Override
+    @PostMapping("page")
     @ApiOperation("分页查询")
     @ApiOperation("分页查询")
-    public R<PageBean<SysSystemValueDto.Vo>> page(SysSystemValueDto.Select select) {
+    public R<PageBean<SysSystemValueDto.Vo>> page(@RequestBody @Validated SysSystemValueDto.Select select) {
         LambdaQueryWrapper<SysSystemValue> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystemValue.class)
         LambdaQueryWrapper<SysSystemValue> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(select, SysSystemValue.class)
                 .ge(SysSystemValue::getCreateTime, select.getBeginCreateTime())
                 .ge(SysSystemValue::getCreateTime, select.getBeginCreateTime())
                 .le(SysSystemValue::getCreateTime, select.getEndCreateTime())
                 .le(SysSystemValue::getCreateTime, select.getEndCreateTime())
@@ -61,7 +62,7 @@ public class SysSystemValueServiceImpl extends ServiceImpl<SysSystemValueMapper,
         return R.ok(toPageBean(SysSystemValueDto.Vo.class, page));
         return R.ok(toPageBean(SysSystemValueDto.Vo.class, page));
     }
     }
 
 
-    @Override
+    @PostMapping("update")
     @ApiOperation("修改")
     @ApiOperation("修改")
     public R update(@RequestBody @Validated SysSystemValueDto.Update update) {
     public R update(@RequestBody @Validated SysSystemValueDto.Update update) {
         SysSystemValue sysSystemValue = copy(SysSystemValue.class, update).update(Long.parseLong(SaTokenUtils.getId().toString()));
         SysSystemValue sysSystemValue = copy(SysSystemValue.class, update).update(Long.parseLong(SaTokenUtils.getId().toString()));
@@ -69,7 +70,7 @@ public class SysSystemValueServiceImpl extends ServiceImpl<SysSystemValueMapper,
         return R.ok();
         return R.ok();
     }
     }
 
 
-    @Override
+    @PostMapping("del")
     @ApiOperation("删除")
     @ApiOperation("删除")
     public R del(@RequestBody @Validated SysSystemValueDto.Del del) {
     public R del(@RequestBody @Validated SysSystemValueDto.Del del) {
         removeByIds(del.getId());
         removeByIds(del.getId());

+ 4 - 28
authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.config.SaTokenAuthorizeConfig;
-import com.xy.dto.SysWorkUser.*;
+import com.xy.dto.SysWorkUser.AddDto;
+import com.xy.dto.SysWorkUser.DelDto;
+import com.xy.dto.SysWorkUser.LoginDto;
+import com.xy.dto.SysWorkUser.UpdateDto;
 import com.xy.entity.SysUserDept;
 import com.xy.entity.SysUserDept;
 import com.xy.entity.SysUserRole;
 import com.xy.entity.SysUserRole;
 import com.xy.entity.SysWorkUser;
 import com.xy.entity.SysWorkUser;
@@ -27,7 +29,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -49,10 +50,6 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
     private final SysUserRoleService sysUserRoleService;
     private final SysUserRoleService sysUserRoleService;
     private final SysUserDeptService sysUserDeptService;
     private final SysUserDeptService sysUserDeptService;
 
 
-    private final HttpServletRequest request;
-
-    private final SaTokenAuthorizeConfig saTokenAuthorizeConfig;
-
     private final SysUserRoleMapper sysUserRoleMapper;
     private final SysUserRoleMapper sysUserRoleMapper;
 
 
     private final SysUserDeptMapper sysUserDeptMapper;
     private final SysUserDeptMapper sysUserDeptMapper;
@@ -188,25 +185,4 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
         return R.ok();
         return R.ok();
     }
     }
 
 
-    @Override
-    public R<Boolean> authByLogin() {
-        return R.ok(true);
-    }
-
-    @Override
-    public R<Boolean> authByInterface(AuthByInterface authByInterface) {
-        List<String> menuInterfaceUri = RedisCache.getMenuInterfaceUri(SaTokenUtils.getToken(), authByInterface.getSystemId());
-        if (!menuInterfaceUri.contains(authByInterface.getUri())) {
-            return R.ok(false);
-        }
-        return R.ok(true);
-    }
-
-    @Override
-    public R<Boolean> authByData(AuthByInterface authByInterface) {
-        boolean dataAuth = RedisCache.getDataAuth(SaTokenUtils.getToken(), authByInterface.getSystemId(), authByInterface.getUri());
-        return R.ok(dataAuth);
-    }
-
-
 }
 }

+ 0 - 30
authorize-api/src/main/java/com/xy/service/SysDeptService.java

@@ -1,15 +1,6 @@
 package com.xy.service;
 package com.xy.service;
 
 
-import cn.hutool.core.lang.tree.Tree;
 import com.xy.annotate.RestMappingController;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.SysDeptDto;
-import com.xy.utils.R;
-import com.xy.vo.SysDeptVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
 
 
 /***
 /***
  * 部门管理服务类
  * 部门管理服务类
@@ -19,25 +10,4 @@ import java.util.List;
 @RestMappingController("sysDept")
 @RestMappingController("sysDept")
 public interface SysDeptService {
 public interface SysDeptService {
 
 
-    @ApiOperation(value = "新增、更新部门信息", notes = "新增、更新部门信息")
-    @PostMapping("saveOrUpdate")
-    R<Boolean> saveOrUpdate(@Valid @RequestBody SysDeptDto sysDeptDto);
-
-    @ApiOperation(value = "系统部门树", notes = "系统部门树")
-    @GetMapping("tree/{sysId}")
-    R<List<Tree<Long>>> deptTree(@PathVariable("sysId") Long sysId);
-
-    @ApiOperation(value = "根据ID获取部门信息", notes = "根据ID获取部门信息")
-    @GetMapping("{id}")
-    R<SysDeptVo> getById(@PathVariable("id") Long id);
-
-
-    @ApiOperation(value = "删除部门", notes = "删除部门")
-    @DeleteMapping("{id}")
-    R<Boolean> deleteById(@PathVariable("id") Long id);
-
-    @ApiOperation(value = "获取指定部门部门树", notes = "获取指定部门部门树")
-    @GetMapping("deptTree/{id}")
-    R<List<Tree<Long>>> getDeptTreeById(@PathVariable("id") Long id);
-
 }
 }

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

@@ -1,13 +1,6 @@
 package com.xy.service;
 package com.xy.service;
 
 
 import com.xy.annotate.RestMappingController;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.SysMenuDto;
-import com.xy.utils.R;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -20,46 +13,4 @@ import java.util.List;
 @RestMappingController("sys-menu")
 @RestMappingController("sys-menu")
 public interface SysMenuService {
 public interface SysMenuService {
 
 
-    /**
-     * 业务用户菜单树
-     *
-     * @return
-     */
-    @PostMapping("workMenu")
-    R<List<SysMenuDto.Vo>> workMenu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu);
-
-    /**
-     * 全部菜单树
-     *
-     * @return
-     */
-    @PostMapping("menu")
-    R<List<SysMenuDto.Vo>> menu(@RequestBody @Validated SysMenuDto.WorkMenu workMenu);
-
-    /**
-     * 添加菜单
-     *
-     * @param save
-     * @return
-     */
-    @PostMapping("save")
-    R save(@RequestBody @Validated SysMenuDto.Save save);
-
-    /**
-     * 修改菜单
-     *
-     * @param update
-     * @return
-     */
-    @PostMapping("update")
-    R update(@RequestBody @Validated SysMenuDto.Update update);
-
-    /**
-     * 删除菜单
-     *
-     * @param del
-     * @return
-     */
-    @PostMapping("del")
-    R del(@RequestBody @Validated SysMenuDto.Del del);
 }
 }

+ 0 - 77
authorize-api/src/main/java/com/xy/service/SysRoleService.java

@@ -1,18 +1,6 @@
 package com.xy.service;
 package com.xy.service;
 
 
 import com.xy.annotate.RestMappingController;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.BatchDeleteDto;
-import com.xy.dto.SysRoleDto;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import com.xy.vo.RoleMenuVo;
-import com.xy.vo.SysRoleGroupBySysVo;
-import com.xy.vo.SysRoleVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
 
 
 /***
 /***
  * 系统角色服务类
  * 系统角色服务类
@@ -22,69 +10,4 @@ import java.util.List;
 @RestMappingController("sysRole")
 @RestMappingController("sysRole")
 public interface SysRoleService {
 public interface SysRoleService {
 
 
-    /**
-     * 新增、更新角色信息
-     *
-     * @param sysRoleDto
-     * @return
-     */
-    @ApiOperation(value = "新增、更新角色信息", notes = "新增、更新角色信息")
-    @PostMapping("saveOrUpdate")
-    R<Long> saveOrUpdate(@Valid @RequestBody SysRoleDto sysRoleDto);
-
-    /**
-     * 批量删除角色
-     *
-     * @param batchDeleteDto
-     * @return
-     */
-    @ApiOperation(value = "删除角色", notes = "删除角色")
-    @DeleteMapping
-    R<Boolean> batchDelete(@Valid @RequestBody BatchDeleteDto batchDeleteDto);
-
-    /**
-     * 根据id获取角色信息
-     *
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "获取角色详情", notes = "获取角色详情")
-    @GetMapping("{id}")
-    R<SysRoleVo> getById(@PathVariable("id") Long id);
-
-    /**
-     * 分页查询角色信息
-     *
-     * @param page 分页对象 (current,size)
-     * @param page 筛选参数 sysRoleVo
-     * @return
-     */
-    @ApiOperation(value = "分页获取角色信息", notes = "分页获取角色信息")
-    @GetMapping("page")
-    R<PageBean<SysRoleVo>> getRolePage(PageBean page, SysRoleDto sysRoleDto);
-
-
-    /**
-     * 编辑角色菜单
-     *
-     * @param roleMenuVo
-     * @return
-     */
-    @ApiOperation(value = "编辑角色菜单", notes = "编辑角色菜单")
-    @PostMapping("saveRoleMenus")
-    R<Boolean> saveRoleMenus(@RequestBody RoleMenuVo roleMenuVo);
-
-
-    @ApiOperation(value = "删除角色", notes = "删除角色")
-    @DeleteMapping("{id}")
-    R<Boolean> deleteRoleById(@PathVariable("id") Long id);
-
-
-    @ApiOperation(value = "根据系统获取角色列表", notes = "根据系统获取角色列表")
-    @GetMapping("listBySys/{sysId}")
-    R<List<SysRoleVo>> listBySysId(@PathVariable("sysId") Long sysId);
-
-    @ApiOperation(value = "获取当前登录用户创建的角色列表", notes = "获取当前登录用户创建的角色列表")
-    @GetMapping("myCreatedRoles}")
-    R<List<SysRoleGroupBySysVo>> myCreatedRoles();
 }
 }

+ 0 - 51
authorize-api/src/main/java/com/xy/service/SysSystemService.java

@@ -1,14 +1,6 @@
 package com.xy.service;
 package com.xy.service;
 
 
 import com.xy.annotate.RestMappingController;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.SysSystemDto;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -21,47 +13,4 @@ import java.util.List;
 @RestMappingController("sys-system")
 @RestMappingController("sys-system")
 public interface SysSystemService {
 public interface SysSystemService {
 
 
-    /**
-     * 添加系统
-     *
-     * @param save
-     * @return
-     */
-    @PostMapping("save")
-    R<Long> save(@RequestBody @Validated SysSystemDto.Save save);
-
-    /**
-     * 修改系统
-     *
-     * @param update
-     * @return
-     */
-    @PostMapping("update")
-    R update(@RequestBody @Validated SysSystemDto.Update update);
-
-    /**
-     * 登录人所属系统列表
-     *
-     * @param select
-     * @return
-     */
-    @PostMapping("list")
-    R<List<SysSystemDto.Vo>> list(@RequestBody SysSystemDto.Select select);
-
-    /**
-     * 分页查询
-     *
-     * @param pageSelect
-     * @return
-     */
-    @PostMapping("page")
-    R<PageBean<SysSystemDto.Vo>> page(@RequestBody @Validated SysSystemDto.PageSelect pageSelect);
-
-    /**
-     * 删除系统
-     *
-     * @return
-     */
-    @PostMapping("del")
-    R del(@RequestBody @Validated SysSystemDto.Del del);
 }
 }

+ 0 - 41
authorize-api/src/main/java/com/xy/service/SysSystemValueService.java

@@ -1,12 +1,6 @@
 package com.xy.service;
 package com.xy.service;
 
 
 import com.xy.annotate.RestMappingController;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.SysSystemValueDto;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -19,39 +13,4 @@ import org.springframework.web.bind.annotation.RequestBody;
 @RestMappingController("sys-system-value")
 @RestMappingController("sys-system-value")
 public interface SysSystemValueService {
 public interface SysSystemValueService {
 
 
-    /**
-     * 分页查询
-     *
-     * @param select
-     * @return
-     */
-    @PostMapping("page")
-    R<PageBean<SysSystemValueDto.Vo>> page(@RequestBody @Validated SysSystemValueDto.Select select);
-
-    /**
-     * 添加
-     *
-     * @param save
-     * @return
-     */
-    @PostMapping("save")
-    R<Boolean> save(@RequestBody @Validated SysSystemValueDto.Save save);
-
-    /**
-     * 修改
-     *
-     * @param update
-     * @return
-     */
-    @PostMapping("update")
-    R update(@RequestBody @Validated SysSystemValueDto.Update update);
-
-    /**
-     * 删除
-     *
-     * @param del
-     * @return
-     */
-    @PostMapping("del")
-    R del(@RequestBody @Validated SysSystemValueDto.Del del);
 }
 }

+ 4 - 14
authorize-api/src/main/java/com/xy/service/SysWorkUserService.java

@@ -1,7 +1,10 @@
 package com.xy.service;
 package com.xy.service;
 
 
 import com.xy.annotate.RestMappingController;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.SysWorkUser.*;
+import com.xy.dto.SysWorkUser.AddDto;
+import com.xy.dto.SysWorkUser.DelDto;
+import com.xy.dto.SysWorkUser.LoginDto;
+import com.xy.dto.SysWorkUser.UpdateDto;
 import com.xy.utils.R;
 import com.xy.utils.R;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -18,7 +21,6 @@ import javax.validation.Valid;
 @RestMappingController("sysWorkUser")
 @RestMappingController("sysWorkUser")
 public interface SysWorkUserService {
 public interface SysWorkUserService {
 
 
-
     @ApiOperation(value = "注册", notes = "注册")
     @ApiOperation(value = "注册", notes = "注册")
     @PostMapping("register")
     @PostMapping("register")
     R<Long> register(@Valid @RequestBody AddDto addDto);
     R<Long> register(@Valid @RequestBody AddDto addDto);
@@ -38,16 +40,4 @@ public interface SysWorkUserService {
     @PostMapping("logout")
     @PostMapping("logout")
     @ApiOperation("登出")
     @ApiOperation("登出")
     R logout();
     R logout();
-
-    @PostMapping("authByLogin")
-    @ApiOperation("登录鉴权")
-    R<Boolean> authByLogin();
-
-    @PostMapping("authByInterface")
-    @ApiOperation("接口鉴权")
-    R<Boolean> authByInterface(@RequestBody @Validated AuthByInterface authByInterface);
-
-    @PostMapping("authByData")
-    @ApiOperation("数据鉴权")
-    R<Boolean> authByData(@RequestBody @Validated AuthByInterface authByInterface);
 }
 }