root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:去掉SWAGGER

Browse Source
This commit is contained in:
ludj
2023-12-29 09:43:11 +08:00
parent a7e2b8d7cd
commit 14eb8b81c5
223 changed files with 1057 additions and 1529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lms/nladmin-system/src/main/java/org/nl/system/controller/dept/DeptController.java
View File

@@ -18,8 +18,6 @@ package org.nl.system.controller.dept;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
@@ -44,20 +42,20 @@ import java.util.Set;
*/
@RestController
@RequiredArgsConstructor
@Api(tags = "系统：部门管理")
@RequestMapping("/api/dept")
public class DeptController {
private final ISysDeptService deptService;
@ApiOperation("查询部门")
@GetMapping
public ResponseEntity<Object> query(DeptQuery query) throws Exception {
List<SysDept> list = deptService.list(query.build());
return new ResponseEntity<>(PageUtil.toPage(list, list.size()), HttpStatus.OK);
}
@ApiOperation("查询部门")
@GetMapping("/vo")
public ResponseEntity queryvo(DeptQuery query, PageQuery pageQuery) throws Exception {
Page deptPage = deptService.queryVo(query, pageQuery);
@@ -65,13 +63,12 @@ public class DeptController {
}
@ApiOperation("查询所有部门树")
@GetMapping("/allTree")
public ResponseEntity<Object> allTree(DeptQuery query) {
return new ResponseEntity<>(deptService.buildTree(query), HttpStatus.OK);
}
@ApiOperation("查询部门:根据ID获取同级与上级数据")
@PostMapping("/superior")
@SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND)
public ResponseEntity<Object> getSuperior(@RequestBody List<Long> ids) {
@@ -83,7 +80,7 @@ public class DeptController {
//
@Log("新增部门")
@ApiOperation("新增部门")
@PostMapping
// @SaCheckPermission("dept:add")
public ResponseEntity<Object> create(@Validated @RequestBody SysDept resources) {
@@ -93,7 +90,7 @@ public class DeptController {
//
@Log("修改部门")
@ApiOperation("修改部门")
@PutMapping
// @SaCheckPermission("dept:edit")
public ResponseEntity<Object> update(@Validated @RequestBody SysDept dept) {
@@ -106,7 +103,7 @@ public class DeptController {
//
@Log("删除部门")
@ApiOperation("删除部门")
@DeleteMapping
// @SaCheckPermission("dept:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> deptIds) {

19
lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java
View File

@@ -2,7 +2,6 @@ package org.nl.system.controller.dict;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
@@ -37,7 +36,7 @@ public class SysDictController {
@Log("查询字典")
@GetMapping
@ApiOperation("查询字典")
// @SaCheckPermission("dict:list")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery pageable) {
return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson, pageable)), HttpStatus.OK);
@@ -45,7 +44,7 @@ public class SysDictController {
@Log("新增字典")
@PostMapping
@ApiOperation("新增字典")
// @SaCheckPermission("dict:add")
public ResponseEntity<Object> create(@RequestBody Dict dict) {
dictService.create(dict);
@@ -54,7 +53,7 @@ public class SysDictController {
@PutMapping
@Log("修改字典")
@ApiOperation("修改字典")
//@SaCheckPermission("@el.check('dict:edit')")
public ResponseEntity<Object> updateDict(@Validated @RequestBody Dict dto) {
dictService.updateDict(dto);
@@ -62,7 +61,7 @@ public class SysDictController {
}
@Log("删除字典")
@ApiOperation("删除字典")
@DeleteMapping
// @SaCheckPermission("dict:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -71,13 +70,13 @@ public class SysDictController {
}
@GetMapping("/dictDetail")
@ApiOperation("查询字典详情")
public ResponseEntity<Object> queryDetails(@RequestParam Map criteria, PageQuery pageable) {
DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class);
return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery, pageable)), HttpStatus.OK);
}
@ApiOperation("查询多个字典详情")
@GetMapping(value = "/dictDetail/map")
public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName) {
String[] names = dictName.split("[,，]");
@@ -89,7 +88,7 @@ public class SysDictController {
}
@Log("新增字典详情")
@ApiOperation("新增字典详情")
@PostMapping("/dictDetail")
// @SaCheckPermission("dict:add")
public ResponseEntity<Object> createDetail(@RequestBody Dict resources) {
@@ -98,7 +97,7 @@ public class SysDictController {
}
@Log("修改字典详情")
@ApiOperation("修改字典详情")
@PutMapping("/dictDetail")
// @SaCheckPermission("dict:edit")
public ResponseEntity<Object> updateDetail(@RequestBody Dict resources) {
@@ -107,7 +106,7 @@ public class SysDictController {
}
@Log("删除字典详情")
@ApiOperation("删除字典详情")
@DeleteMapping(value = "/dictDetail/{id}")
// @SaCheckPermission("dict:del")
public ResponseEntity<Object> deleteDetail(@PathVariable String id) {

19
lms/nladmin-system/src/main/java/org/nl/system/controller/menu/SysMenuController.java
View File

@@ -5,7 +5,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
@@ -37,20 +36,20 @@ public class SysMenuController {
private final ISysMenuService iSysMenuService;
@GetMapping(value = "/build")
@ApiOperation("根据用户获取菜单")
public ResponseEntity<Object> buildMenus(@Validated String systemType) {
//校验系统表是否存在该系统类型
return new ResponseEntity(iSysMenuService.buildMenus(systemType), HttpStatus.OK);
}
@ApiOperation("返回全部的菜单")
@GetMapping(value = "/lazy")
@SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND)
public ResponseEntity<Object> query(@RequestParam String pid) {
return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK);
}
@ApiOperation("获取菜单列表")
@PostMapping(value = "/getMenusByRole")
@SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND)
public ResponseEntity<Object> getMenusByRole(@RequestBody JSONObject json) {
@@ -60,7 +59,7 @@ public class SysMenuController {
return new ResponseEntity<>(iSysMenuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK);
}
@ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID")
@GetMapping(value = "/child")
@SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND)
public ResponseEntity<Object> child(@RequestParam String id) {
@@ -73,14 +72,14 @@ public class SysMenuController {
}
@GetMapping
@ApiOperation("查询菜单")
@SaCheckPermission("menu:list")
public ResponseEntity<Object> pageQuery(MenuQuery query, PageQuery page) throws Exception {
List list = iSysMenuService.query(query, page);
return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
}
@ApiOperation("查询菜单:根据ID获取同级与上级数据")
@PostMapping("/superior")
@SaCheckPermission("menu:list")
public ResponseEntity<Object> getSuperior(@RequestBody JSONObject param) {
@@ -94,7 +93,7 @@ public class SysMenuController {
}
@Log("新增菜单")
@ApiOperation("新增菜单")
@PostMapping
@SaCheckPermission("menu:add")
public ResponseEntity<Object> create(@RequestBody SysMenu form) {
@@ -103,7 +102,7 @@ public class SysMenuController {
}
@Log("修改菜单")
@ApiOperation("修改菜单")
@PutMapping
@SaCheckPermission("menu:edit")
public ResponseEntity<Object> update(@RequestBody SysMenu form) {
@@ -112,7 +111,7 @@ public class SysMenuController {
}
@Log("删除菜单")
@ApiOperation("删除菜单")
@DeleteMapping
@SaCheckPermission("menu:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {

14
lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
View File

@@ -1,8 +1,6 @@
package org.nl.system.controller.notice;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
@@ -24,7 +22,7 @@ import java.util.Set;
**/
@Slf4j
@RestController
@Api(tags = "消息通知管理")
@RequestMapping("/api/notice")
public class SysNoticeController {
@@ -33,7 +31,7 @@ public class SysNoticeController {
@GetMapping
@Log("查询消息通知")
@ApiOperation("查询消息通知")
//@SaCheckPermission("@el.check('sysNotice:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson, page)), HttpStatus.OK);
@@ -41,7 +39,7 @@ public class SysNoticeController {
@PostMapping
@Log("新增消息通知")
@ApiOperation("新增消息通知")
//@SaCheckPermission("@el.check('sysNotice:add')")
public ResponseEntity<Object> create(@Validated @RequestBody SysNotice entity) {
noticeService.create(entity);
@@ -50,7 +48,7 @@ public class SysNoticeController {
@PutMapping
@Log("修改消息通知")
@ApiOperation("修改消息通知")
//@SaCheckPermission("@el.check('sysNotice:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody SysNotice entity) {
noticeService.update(entity);
@@ -58,7 +56,7 @@ public class SysNoticeController {
}
@Log("删除消息通知")
@ApiOperation("删除消息通知")
//@SaCheckPermission("@el.check('sysNotice:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -100,7 +98,7 @@ public class SysNoticeController {
@Log("批量已读")
@PostMapping("/changeRead")
@ApiOperation("批量已读")
public ResponseEntity<Object> changeRead(@RequestBody JSONObject jsonObject) {
noticeService.changeRead(jsonObject);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);

14
lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java
View File

@@ -1,8 +1,6 @@
package org.nl.system.controller.param;
import cn.dev33.satoken.annotation.SaIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
@@ -27,7 +25,7 @@ import java.util.Map;
* @author generator
* @since 2022-12-14
*/
@Api(tags = "系统参数管理")
@Slf4j
@RestController
@RequestMapping("/api/param")
@@ -37,7 +35,7 @@ class SysParamController {
@GetMapping
@Log(value = "查询系统参数", isAddLogTable = true, isInterfaceLog = true)
@ApiOperation("查询系统参数")
//@SaCheckPermission("param:list")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK);
@@ -45,7 +43,7 @@ class SysParamController {
@PostMapping
@Log("新增系统参数")
@ApiOperation("新增系统参数")
//@SaCheckPermission("param:add")
public ResponseEntity<Object> create(@Validated @RequestBody Param param) {
paramService.create(param);
@@ -54,7 +52,7 @@ class SysParamController {
@PutMapping
@Log("修改系统参数")
@ApiOperation("修改系统参数")
//@SaCheckPermission("param:edit")
public ResponseEntity<Object> update(@Validated @RequestBody Param param) {
paramService.update(param);
@@ -62,7 +60,7 @@ class SysParamController {
}
@Log("删除系统参数")
@ApiOperation("删除系统参数")
//@SaCheckPermission("param:del")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
@@ -73,7 +71,7 @@ class SysParamController {
@PostMapping("/getValueByCode/{code}")
@Log("根据编码获取值")
@ApiOperation("根据编码获取值")
@SaIgnore
public ResponseEntity<Object> getValueByCode(@PathVariable String code) {
return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED);

22
lms/nladmin-system/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
View File

@@ -2,8 +2,6 @@ package org.nl.system.controller.permission;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
@@ -30,7 +28,7 @@ import java.util.Set;
@Slf4j
@RestController
@RequiredArgsConstructor
@Api(tags = "数据管理")
@RequestMapping("/api/dataPermission")
public class SysDataPermissionController {
@@ -38,7 +36,7 @@ public class SysDataPermissionController {
@GetMapping
@Log("查询数据权限")
@ApiOperation("查询数据权限")
//@SaCheckPermission("@el.check('dataPermission:list')")
public ResponseEntity<Object> query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK);
@@ -46,7 +44,7 @@ public class SysDataPermissionController {
@PostMapping
@Log("新增数据权限")
@ApiOperation("新增数据权限")
//@SaCheckPermission("@el.check('dataPermission:add')")
public ResponseEntity<Object> create(@Validated @RequestBody SysDataPermission permission) {
dataPermissionService.create(permission);
@@ -55,7 +53,7 @@ public class SysDataPermissionController {
@PutMapping
@Log("修改数据权限")
@ApiOperation("修改数据权限")
//@SaCheckPermission("@el.check('dataPermission:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody SysDataPermission permission) {
dataPermissionService.update(permission);
@@ -63,7 +61,7 @@ public class SysDataPermissionController {
}
@Log("删除数据权限")
@ApiOperation("删除数据权限")
//@SaCheckPermission("@el.check('dataPermission:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -73,21 +71,21 @@ public class SysDataPermissionController {
@GetMapping("/scopeType")
@Log("获取数据权限范围")
@ApiOperation("获取数据权限范围")
public ResponseEntity<Object> getDataScopeType() {
return new ResponseEntity<>(dataPermissionService.getDataScopeType(), HttpStatus.OK);
}
@GetMapping("/dataPermissionOption")
@Log("获取数据权限下拉框")
@ApiOperation("获取数据权限下拉框")
public ResponseEntity<Object> getDataPermissionOption() {
return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(), HttpStatus.OK);
}
@PostMapping("/saveDataPermission")
@Log("保存数据权限")
@ApiOperation("保存数据权限")
public ResponseEntity<Object> saveDataPermission(@RequestBody JSONObject datas) {
dataPermissionService.savePermission(datas);
return new ResponseEntity<>(HttpStatus.CREATED);
@@ -95,14 +93,14 @@ public class SysDataPermissionController {
@PostMapping("/dataShow")
@Log("查看数据权限")
@ApiOperation("查看数据权限")
public ResponseEntity<Object> getDataShow(@RequestBody String id) {
return new ResponseEntity<>(dataPermissionService.getDataShow(id), HttpStatus.OK);
}
@PostMapping("/dataDetail")
@Log("查看数据明细")
@ApiOperation("查看数据明细")
public ResponseEntity<Object> getDataDetail(@RequestBody JSONObject data) {
return new ResponseEntity<>(dataPermissionService.getDataDetail(data), HttpStatus.OK);
}

18
lms/nladmin-system/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java
View File

@@ -2,8 +2,6 @@ package org.nl.system.controller.quartz;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
@@ -32,20 +30,20 @@ import java.util.Set;
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/jobs")
@Api(tags = "系统:定时任务管理")
public class SysQuartzJobController {
private static final String ENTITY_NAME = "quartzJob";
private final ISysQuartzJobService quartzJobService;
@ApiOperation("查询定时任务")
@GetMapping
@SaCheckPermission("timing:list")
public ResponseEntity<Object> query(JobQuery criteria, PageQuery pageable) {
return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAll(criteria, pageable)), HttpStatus.OK);
}
@ApiOperation("查询任务执行日志")
@GetMapping(value = "/logs")
@SaCheckPermission("timing:list")
public ResponseEntity<Object> queryJobLog(JobQuery criteria, PageQuery pageable) {
@@ -53,7 +51,7 @@ public class SysQuartzJobController {
}
@Log("新增定时任务")
@ApiOperation("新增定时任务")
@PostMapping
@SaCheckPermission("timing:add")
public ResponseEntity<Object> create(@Validated @RequestBody SysQuartzJob resources) {
@@ -65,7 +63,7 @@ public class SysQuartzJobController {
}
@Log("修改定时任务")
@ApiOperation("修改定时任务")
@PutMapping
@SaCheckPermission("timing:edit")
public ResponseEntity<Object> update(@Validated @RequestBody SysQuartzJob resources) {
@@ -74,7 +72,7 @@ public class SysQuartzJobController {
}
@Log("更改定时任务状态")
@ApiOperation("更改定时任务状态")
@PutMapping(value = "/{id}")
@SaCheckPermission("timing:edit")
public ResponseEntity<Object> update(@PathVariable String id) {
@@ -83,7 +81,7 @@ public class SysQuartzJobController {
}
@Log("执行定时任务")
@ApiOperation("执行定时任务")
@PutMapping(value = "/exec/{id}")
@SaCheckPermission("timing:edit")
public ResponseEntity<Object> execution(@PathVariable String id) {
@@ -92,7 +90,7 @@ public class SysQuartzJobController {
}
@Log("删除定时任务")
@ApiOperation("删除定时任务")
@DeleteMapping
@SaCheckPermission("timing:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {

13
lms/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java
View File

@@ -2,7 +2,6 @@ package org.nl.system.controller.role;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
@@ -30,21 +29,21 @@ public class SysRoleController {
private final ISysRoleService roleService;
@ApiOperation("分页查询角色")
@GetMapping
@SaCheckPermission("roles:list")
public ResponseEntity<Object> pageQuery(@RequestParam Map param, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK);
}
@ApiOperation("查询所有角色")
@GetMapping("/all")
public ResponseEntity<Object> queryAll() {
return new ResponseEntity<>(roleService.list(), HttpStatus.OK);
}
@Log("新增角色")
@ApiOperation("新增角色")
@PostMapping
@SaCheckPermission("roles:add")
public ResponseEntity<Object> create(@RequestBody JSONObject param) {
@@ -53,7 +52,7 @@ public class SysRoleController {
}
@Log("修改角色")
@ApiOperation("修改角色")
@PutMapping
@SaCheckPermission("roles:edit")
public ResponseEntity<Object> update(@RequestBody JSONObject param) {
@@ -62,7 +61,7 @@ public class SysRoleController {
}
@Log("删除角色")
@ApiOperation("删除角色")
@DeleteMapping
@SaCheckPermission("roles:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -71,7 +70,7 @@ public class SysRoleController {
}
@Log("修改角色菜单")
@ApiOperation("修改角色菜单")
@PutMapping(value = "/menu")
@SaCheckPermission("roles:edit")
public ResponseEntity<Object> updateMenu(@RequestBody JSONObject form) {

13
lms/nladmin-system/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
View File

@@ -21,8 +21,6 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.wf.captcha.base.Captcha;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
@@ -54,7 +52,7 @@ import java.util.concurrent.TimeUnit;
@RestController
@RequestMapping("/auth")
@RequiredArgsConstructor
@Api(tags = "系统：系统授权接口")
public class AuthorizationController {
private final RedisUtils redisUtils;
private final OnlineUserService onlineUserService;
@@ -63,7 +61,7 @@ public class AuthorizationController {
@Resource
private LoginProperties loginProperties;
@ApiOperation("登录授权")
@PostMapping(value = "/login")
public ResponseEntity<Object> login(@RequestBody Map authMap) throws Exception {
if (ObjectUtil.isEmpty(authMap)) {
@@ -73,7 +71,6 @@ public class AuthorizationController {
}
@ApiOperation("获取用户信息")
@GetMapping(value = "/info")
public ResponseEntity<Object> getUserInfo() {
CurrentUser currentUser = SecurityUtils.getCurrentUser();
@@ -87,7 +84,7 @@ public class AuthorizationController {
return ResponseEntity.ok(jsonObject);
}
@ApiOperation("获取指定用户信息")
@GetMapping(value = "/userInfo")
public ResponseEntity<Object> getUserInfo(Long loginId) {
if (loginId != null) {
@@ -98,7 +95,7 @@ public class AuthorizationController {
return ResponseEntity.noContent().build();
}
@ApiOperation("获取验证码")
@GetMapping(value = "/code")
public ResponseEntity<Object> getCode() {
// 获取运算的结果
@@ -119,7 +116,7 @@ public class AuthorizationController {
return ResponseEntity.ok(imgResult);
}
@ApiOperation("退出登录")
@DeleteMapping(value = "/logout")
public ResponseEntity<Object> logout(HttpServletRequest request) {
if (ObjectUtil.isNotEmpty(StpUtil.getTokenValue())) {

11
lms/nladmin-system/src/main/java/org/nl/system/controller/user/OnlineController.java
View File

@@ -15,8 +15,7 @@
*/
package org.nl.system.controller.user;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.modules.common.utils.EncryptUtils;
import org.nl.system.service.secutiry.impl.OnlineUserService;
@@ -35,26 +34,26 @@ import java.util.Set;
@RestController
@RequiredArgsConstructor
@RequestMapping("/auth/online")
@Api(tags = "系统：在线用户管理")
public class OnlineController {
private final OnlineUserService onlineUserService;
@ApiOperation("查询在线用户")
@GetMapping
// @SaCheckPermission("@el.check()")
public ResponseEntity<Object> query(String filter, Pageable pageable) {
return new ResponseEntity<>(onlineUserService.getAll(filter, pageable), HttpStatus.OK);
}
@ApiOperation("导出数据")
@GetMapping(value = "/download")
// @SaCheckPermission("@el.check()")
public void download(HttpServletResponse response, String filter) throws IOException {
onlineUserService.download(onlineUserService.getAll(filter), response);
}
@ApiOperation("踢出用户")
@DeleteMapping
// @SaCheckPermission("@el.check()")
public ResponseEntity<Object> delete(@RequestBody Set<String> keys) throws Exception {

21
lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java
View File

@@ -20,8 +20,6 @@ import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
@@ -46,7 +44,7 @@ import java.util.Set;
* @author Zheng Jie
* @date 2018-11-23
*/
@Api(tags = "系统：用户管理")
@RestController
@RequestMapping("/api/users")
@RequiredArgsConstructor
@@ -56,13 +54,12 @@ public class UserController {
ISysUserService userService;
@ApiOperation("查询用户")
@GetMapping
public ResponseEntity<Object> query(UserQuery query, PageQuery page) {
return new ResponseEntity(userService.getUserDetail(query, page), HttpStatus.OK);
}
@ApiOperation("查询用户")
@PostMapping(value = "/getUserList")
public ResponseEntity<Object> query() {
List<SysUser> userList = userService.list(new QueryWrapper<SysUser>().eq("is_used", true));
@@ -70,7 +67,7 @@ public class UserController {
}
@Log("新增用户")
@ApiOperation("新增用户")
@PostMapping
// @SaCheckPermission("user:add")
public ResponseEntity<Object> create(@RequestBody Map user) {
@@ -79,7 +76,7 @@ public class UserController {
}
@Log("修改用户")
@ApiOperation("修改用户")
@PutMapping
// @SaCheckPermission("user:edit")
public ResponseEntity<Object> update(@RequestBody Map resources) throws Exception {
@@ -88,7 +85,7 @@ public class UserController {
}
@Log("修改用户：个人中心")
@ApiOperation("修改用户：个人中心")
// @PutMapping(value = "center")
public ResponseEntity<Object> center(@RequestBody SysUser resources) {
if (!resources.getUserId().equals(StpUtil.getLoginIdAsLong())) {
@@ -99,7 +96,7 @@ public class UserController {
}
@Log("删除用户")
@ApiOperation("删除用户")
@DeleteMapping
// @SaCheckPermission("user:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -107,21 +104,21 @@ public class UserController {
return new ResponseEntity<>(HttpStatus.OK);
}
@ApiOperation("修改密码")
@PostMapping(value = "/updatePass")
public ResponseEntity<Object> updatePass(@RequestBody JSONObject passVo) throws Exception {
userService.updatePass(passVo);
return new ResponseEntity<>(HttpStatus.OK);
}
@ApiOperation("修改头像")
@PostMapping(value = "/updateAvatar")
public ResponseEntity<Object> updateAvatar(@RequestParam MultipartFile avatar) {
return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
}
@Log("修改邮箱")
@ApiOperation("修改邮箱")
@PostMapping(value = "/updateEmail/{code}")
public ResponseEntity<Object> updateEmail(@PathVariable String code, @RequestBody SysUser user) throws Exception {
String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, user.getPassword());

11
lms/nladmin-system/src/main/java/org/nl/system/service/dept/dto/DeptVo.java
View File

@@ -15,7 +15,7 @@
*/
package org.nl.system.service.dept.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.nl.modules.common.base.BaseDTO;
@@ -41,22 +41,21 @@ public class DeptVo extends BaseDTO implements Serializable {
private String extId;
@ApiModelProperty(value = "排序")
private Integer deptSort;
@NotBlank
@ApiModelProperty(value = "部门名称")
private String name;
@NotNull
@ApiModelProperty(value = "是否启用")
private Boolean isUsed;
@ApiModelProperty(value = "上级部门")
private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true)
private Integer subCount = 0;
//前端显示
private Boolean hasChildren = Boolean.FALSE;

17
lms/nladmin-system/src/main/java/org/nl/system/service/notice/dao/SysNotice.java
View File

@@ -3,7 +3,6 @@ package org.nl.system.service.notice.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -26,28 +25,28 @@ public class SysNotice implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "notice_id", type = IdType.NONE)
@ApiModelProperty(value = "信息标识")
private String notice_id;
@ApiModelProperty(value = "信息标题")
private String notice_title;
@ApiModelProperty(value = "信息内容")
private String notice_content;
@ApiModelProperty(value = "信息类型")
private String notice_type;
@ApiModelProperty(value = "读取状态")
private String have_read;
@ApiModelProperty(value = "读取时间")
private String read_time;
@ApiModelProperty(value = "处理状态")
private String deal_status;
@ApiModelProperty(value = "创建时间")
private String create_time;
}

3
lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java
View File

@@ -1,8 +1,5 @@
package org.nl.system.service.param;
import com.alicp.jetcache.anno.CacheType;
import com.alicp.jetcache.anno.CacheUpdate;
import com.alicp.jetcache.anno.Cached;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;

6
lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java
View File

@@ -2,6 +2,7 @@ package org.nl.system.service.quartz.utils;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.yomahub.tlog.task.quartz.TLogQuartzJobBean;
import lombok.extern.slf4j.Slf4j;
import org.nl.config.thread.ThreadPoolExecutorUtil;
import org.nl.modules.common.utils.RedisUtils;
@@ -16,7 +17,6 @@ import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.quartz.QuartzJobBean;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadPoolExecutor;
@@ -30,7 +30,7 @@ import java.util.concurrent.ThreadPoolExecutor;
@SuppressWarnings({"unchecked", "all"})
@Slf4j
@DisallowConcurrentExecution
public class ExecutionJob extends QuartzJobBean {
public class ExecutionJob extends TLogQuartzJobBean {
/**
* 该处仅供参考
@@ -38,7 +38,7 @@ public class ExecutionJob extends QuartzJobBean {
private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll();
@Override
protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
public void executeTask(JobExecutionContext context) throws JobExecutionException {
SysQuartzJob quartzJob = (SysQuartzJob) context.getMergedJobDataMap().get(SysQuartzJob.JOB_KEY);
// 获取spring bean
ISysQuartzJobService quartzJobService = SpringContextHolder.getBean(SysQuartzJobServiceImpl.class);