Skip to content

Administrator / framework-tools

Go to a project
Commit 1640f338 by henry
Options

修改模块名称

1 parent 03dbd34d
Inline Side-by-side
Showing with 52 additions and 52 deletions
framework-system-manage/src/main/java/org/arch/manage/conterller/DictController.java
......@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
* @author audit
* @since 2020-08-27
*/
@Api(value = "/dict", tags = {"数据模型字典管理 前端控制器"})
@Api(value = "/dict", tags = {"系统功能 前端控制器"})
@RestController
@RequestMapping("/dict")
@AllArgsConstructor
......@@ -50,7 +50,7 @@ public class DictController {
@ApiOperation(value = "根据字典标识取字典")
@PostMapping(value = "/gDictByKey")
//@AutoLog(value = LogEventTypeEnum.SEARCH, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "根据标示获取字典")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "根据标示获取字典", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "根据标示获取字典", moduleName = "系统功能")
public Result<Object> getDictByKey(@RequestBody DictDTO model) {
String key = model.getKey();
return Result.success(dictService.getDictDetails(key));
......@@ -59,7 +59,7 @@ public class DictController {
@ApiOperation(value = "获取字典所有key")
@PostMapping(value = "/gAllDictKey")
//@AutoLog(value = LogEventTypeEnum.SEARCH, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "获取所有字典的KEY")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取所有字典的KEY", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取所有字典的KEY", moduleName = "系统功能")
public Result<Object> getDictByKey() {
return Result.success(dictService.getAllDict());
}
......@@ -67,7 +67,7 @@ public class DictController {
@GetMapping(value = "/getDictLabels")
@ApiOperation(value = "根据字典标识查询字典下拉列表", notes = "根据字典标识查询字典下拉列表")
//@AutoLog(value = LogEventTypeEnum.SEARCH, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "根据字典标识查询字典下拉列表")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "根据字典标识查询字典下拉列表", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "根据字典标识查询字典下拉列表", moduleName = "系统功能")
public Result<List<DictDetail>> getDictLabels(String typeValue) {
QueryWrapper<Dict> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type_value", typeValue);
......@@ -84,7 +84,7 @@ public class DictController {
@PostMapping(value = "/")
@ApiOperation(value = "数据字段列表管理", notes = "数据字段列表管理")
//@AutoLog(value = LogEventTypeEnum.SEARCH, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.LOW, description = "数据字段列表管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "数据字段列表管理", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "数据字段列表管理", moduleName = "系统功能")
public Result<Page<Dict>> list(@RequestBody DictListDTO dictListDTO) {
Integer current = dictListDTO.getCurrent();
Integer pageSize = dictListDTO.getPageSize();
......@@ -107,7 +107,7 @@ public class DictController {
@PostMapping(value = "/update")
@ApiOperation(value = "修改数据字典值", notes = "修改数据字典值")
//@AutoLog(value = LogEventTypeEnum.UPDATE, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.MIDDLE, description = "修改数据字典值")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "修改数据字典值", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "修改数据字典值", moduleName = "系统功能")
public Result<Object> update(@RequestBody Dict params) {
dictService.updateById(params);
return Result.success();
......@@ -117,7 +117,7 @@ public class DictController {
@PostMapping(value = "/create")
@ApiOperation(value = "新增数据字典值", notes = "新增数据字典值")
//@AutoLog(value = LogEventTypeEnum.INSERT, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.MIDDLE, description = "新增数据字典值")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "新增数据字典值", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "新增数据字典值", moduleName = "系统功能")
public Result<Object> create(@RequestBody Dict params) {
params.setCreateTime(DateTime.now());
// params.setCreateMan(getUserId()); // 从登录信息中拿当前登录人，暂时业务功能未实现
......@@ -129,7 +129,7 @@ public class DictController {
@PostMapping(value = "/delete")
@ApiOperation(value = "是否禁用-数据字典值", notes = "是否禁用-数据字典值")
//@AutoLog(value = LogEventTypeEnum.UPDATE, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.MIDDLE, description = "是否禁用-数据字典值")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "是否禁用", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "是否禁用", moduleName = "系统功能")
public Result<Object> delete(@RequestBody String id) {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -151,7 +151,7 @@ public class DictController {
@PostMapping(value = "/phyDel")
@ApiOperation(value = "物理删除-数据字典值", notes = "物理删除-数据字典值")
//@AutoLog(value = LogEventTypeEnum.DELETE, LogTypeValue = LogTypeEnum.BUSI_LOG, LogLevValue = LogLevEnum.HIGH, description = "物理删除-数据字典值")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "物理删除", moduleName = "数据模型字典管理")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "物理删除", moduleName = "系统功能")
public Result<Object> phyDel(@RequestBody String id) {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......
framework-system-manage/src/main/java/org/arch/manage/conterller/MenuController.java
......@@ -32,7 +32,7 @@ import org.arch.manage.conterller.BaseController;
import org.arch.manage.util.UserUtil;
@Api(tags = "功能管理")
@Api(tags = "系统功能")
@RestController
@RequestMapping("/menu")
public class MenuController extends BaseController {
......@@ -46,9 +46,9 @@ public class MenuController extends BaseController {
@Autowired
private RedisService redisService;
@ApiOperation(value = "功能管理树形接口", notes = "与添加所需树形结构通用")
@ApiOperation(value = "系统功能树形接口", notes = "与添加所需树形结构通用")
@PostMapping("/list")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-功能管理树形接口", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-系统功能树形接口", moduleName = "系统功能")
/* public Result<List<MenuDto>> list(
@ApiParam(value = "类型",required = false)
@RequestParam(required = false) Integer category,
......@@ -88,7 +88,7 @@ public class MenuController extends BaseController {
@ApiOperation(value = "菜单权限", notes = "菜单权限")
@PostMapping("/isclist")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-菜单权限", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-菜单权限", moduleName = "系统功能")
/* public Result<List<MenuDto>> isclist(
@ApiParam(value = "类型",required = false)
@RequestParam(required = false) Integer category) throws Exception {*/
......@@ -197,7 +197,7 @@ public class MenuController extends BaseController {
@PostMapping("/add")
@ApiOperationSupport(ignoreParameters = {"iFrame", "id", "pids", "permission", "component",
"cache", "componentName", "children", "createTime", "category"})
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-添加新功能", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-添加新功能", moduleName = "系统功能")
public Result add(@RequestBody MenuDto menuDto) {
String pid = menuDto.getPid();
......@@ -226,7 +226,7 @@ public class MenuController extends BaseController {
/* @ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "菜单名称", required = true, dataType = "String", paramType = "query")
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-名称检查", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-名称检查", moduleName = "系统功能")
// public Result<Object> checkName(String name){
public Result<Object> checkName(@RequestBody String name) {
QueryWrapper<Menu> queryWrapper = Wrappers.query();
......@@ -248,7 +248,7 @@ public class MenuController extends BaseController {
*/
@ApiOperation(value = "单条信息", notes = "单条信息")
@PostMapping("/get")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-单条信息", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-单条信息", moduleName = "系统功能")
public Result<MenuDto> 单条信息(@RequestBody String id) {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -269,7 +269,7 @@ public class MenuController extends BaseController {
@PostMapping("/upd")
@ApiOperationSupport(ignoreParameters = {"iFrame", "pids", "permission", "component",
"cache", "componentName", "children", "createTime", "category"})
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-修改", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-修改", moduleName = "系统功能")
public Result upd(@RequestBody MenuDto menuDto) {
Long id = menuDto.getId();
......@@ -316,7 +316,7 @@ public class MenuController extends BaseController {
*/
@ApiOperation("删除")
@PostMapping("/del")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-删除", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-删除", moduleName = "系统功能")
public Result del(@RequestBody String id) {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -338,7 +338,7 @@ public class MenuController extends BaseController {
*/
@ApiOperation("批量删除")
@PostMapping("/delArray")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-批量删除", moduleName = "功能管理")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-批量删除", moduleName = "系统功能")
public Result delArray(@ApiParam(value = "主键id集合", required = true) @RequestBody List<Long> ids) {
QueryWrapper<Menu> pid = new QueryWrapper<Menu>().in("pid", ids);
......
framework-system-manage/src/main/java/org/arch/manage/conterller/OrgController.java
......@@ -32,7 +32,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/org")
@Api(tags = "组织机构管理")
@Api(tags = "系统功能")
@Log
public class OrgController extends MenuController.BaseController {
......@@ -47,7 +47,7 @@ public class OrgController extends MenuController.BaseController {
@ApiImplicitParam(name = "pageSize", value = "页面显示数量", required = true, defaultValue = "10", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "orgName", value = "组织名称", required = false, dataType = "string", paramType = "query"),
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-列表查询接口", moduleName = "组织机构管理")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-列表查询接口", moduleName = "系统功能")
/*public Result<Page<Org>> list(@RequestParam(required = true, defaultValue = "1", name = "current") Integer current,
@RequestParam(required = true, defaultValue = "10", name = "pageSize") Integer pageSize,
Org org) {*/
......@@ -76,7 +76,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/details")
@ApiOperation(value = "获取单条组织详情", notes = "获取单条组织详情")
@ApiImplicitParam(name = "id", value = "组织的主键ID", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取单条组织详情", moduleName = "获取单条组织详情")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取单条组织详情", moduleName = "系统功能")
// public Result<Org> getById(Long id) {
public Result<Org> getById(@RequestBody Long id) {
Org byId = orgService.getById(id);
......@@ -89,7 +89,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/create")
@ApiOperation(value = "保存组织详情", notes = "新增组织详情")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-保存组织详情", moduleName = "保存组织详情")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-保存组织详情", moduleName = "系统功能")
public Result<Object> create(@RequestBody Org params) {
if (ObjectUtil.isNotNull(params.getParentOrgId()) && params.getParentOrgId() != 0) {
Org byId = orgService.getById(params.getParentOrgId());
......@@ -115,7 +115,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/delete")
@ApiOperation(value = "删除单条组织", notes = "删除单条组织")
@ApiImplicitParam(name = "id", value = "组织的主键ID", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-删除单条组织", moduleName = "删除单条组织")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-删除单条组织", moduleName = "删除单系统功能条组织")
public Result<Object> delete(@RequestBody String id) throws BaseException {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -132,7 +132,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除组织", notes = "批量删除组织")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-批量删除组织", moduleName = "批量删除组织")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-批量删除组织", moduleName = "系统功能")
public Result<Object> batchDelete(@ApiParam(value = "组织ID集合", required = true) @RequestBody List<Long> ids) throws BaseException {
if (ids == null || ids.size() < 1) {
throw new BaseException(201, "参数错误");
......@@ -161,7 +161,7 @@ public class OrgController extends MenuController.BaseController {
@ApiImplicitParam(name = "parentOrgId", value = "组织的ID", required = false, dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "orgStatus", value = "组织状态：1启用 0禁用", required = false, dataType = "String", paramType = "query")
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织树形", moduleName = "获取组织树形")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取组织树形", moduleName = "系统功能")
//public Result<List<Org>> tree(Long parentOrgId, String orgStatus) {
public Result<List<Org>> tree(@RequestBody Map<String, Object> map) {
Long parentOrgId = (Long) map.get("parentOrgId");
......@@ -177,7 +177,7 @@ public class OrgController extends MenuController.BaseController {
@ApiImplicitParam(name = "parentOrgId", value = "组织的ID", required = false, dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "orgStatus", value = "组织状态：1启用 0禁用", required = false, dataType = "String", paramType = "query")
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织树形", moduleName = "获取组织树形")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取组织树形", moduleName = "系统功能")
// public Result<List<Org>> treeNew(Long parentOrgId, String deptFlag) {
public Result<List<Org>> treeNew(@RequestBody Map<String, Object> map) {
Long parentOrgId = (Long) map.get("parentOrgId");
......@@ -193,7 +193,7 @@ public class OrgController extends MenuController.BaseController {
@ApiImplicitParam(name = "parentOrgId", value = "组织的ID", required = false, dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "orgStatus", value = "组织状态：1启用 0禁用", required = false, dataType = "String", paramType = "query")
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织树形", moduleName = "获取组织树形")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取组织树形", moduleName = "系统功能")
//public Result<List<Org>> treeNewForDepet(Long parentOrgId, String deptFlag) {
public Result<List<Org>> treeNewForDepet(@RequestBody Map<String, Object> map) {
......@@ -206,7 +206,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/getSelect")
@ApiOperation(value = "获取组织下拉", notes = "获取组织下拉")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织下拉", moduleName = "获取组织下拉")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取组织下拉", moduleName = "系统功能")
public Result<List<Org>> getSelect() {
List<Org> orgs = orgService.getSelect();
return Result.success(orgs);
......@@ -214,7 +214,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/getdeptList")
@ApiOperation(value = "获取本部下的所有部门", notes = "获取本部下的所有部门")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取本部下的所有部门", moduleName = "获取本部下的所有部门")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取本部下的所有部门", moduleName = "系统功能")
public Result<List<Org>> getdeptList() {
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("parent_org_id", 51);
......@@ -225,7 +225,7 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/getdepttmentList")
@ApiImplicitParam(name = "id", value = "部门id", required = true, dataType = "Long", paramType = "path")
@ApiOperation(value = "获取本部下部门的处室", notes = "获取本部下部门的处室")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取本部下部门的处室", moduleName = "获取本部下部门的处室")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "系统功能-获取本部下部门的处室", moduleName = "系统功能")
//public Result<List<Org>> getdepttmentList(Long id) {
public Result<List<Org>> getdepttmentList(@RequestBody Long id) {
......
framework-system-manage/src/main/java/org/arch/manage/conterller/RoleController.java
......@@ -41,7 +41,7 @@ public class RoleController {
*/
@ApiOperation(value = "根据条件分页查询", notes = "根据条件分页查询")
@PostMapping("/page")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "角色管理相关接口")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "系统功能")
public Result<Page<RoleDto>> page(@RequestBody RoleQueryDto roleQueryDto) {
IPage<Role> queryPage = new Page<>();
queryPage.setCurrent((roleQueryDto.getCurrPage() == null || roleQueryDto.getCurrPage() <= 0) ? 1 : roleQueryDto.getCurrPage());
......@@ -82,7 +82,7 @@ public class RoleController {
*/
@ApiOperation(value = "添加角色信息", notes = "添加角色信息")
@PostMapping("/add")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加角色信息", moduleName = "添加角色信息")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加角色信息", moduleName = "系统功能")
public Result create(@RequestBody RoleAddDto roleAdd) {
boolean flag = roleService.create(roleAdd);
if (flag) {
......@@ -99,7 +99,7 @@ public class RoleController {
*/
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/update")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "系统功能")
public Result update(@RequestBody RoleUpdateDto roleUpdate) {
boolean flag = roleService.update(roleUpdate);
if (flag) {
......@@ -117,7 +117,7 @@ public class RoleController {
@ApiOperation(value = "根据id删除角色", notes = "根据id删除角色")
@PostMapping("/delete")
// @ApiImplicitParam(name = "id", value = "角色id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据id删除角色", moduleName = "根据id删除角色")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据id删除角色", moduleName = "系统功能")
//public Result delete(Long id){
public Result delete(@RequestBody Long id) {
if (id == null) {
......@@ -140,7 +140,7 @@ public class RoleController {
*/
@PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除角色", notes = "批量删除角色")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除角色", moduleName = "批量删除角色")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除角色", moduleName = "系统功能")
public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids) {
if (ids == null || ids.size() < 1) {
throw new BDException("角色id不能为空");
......@@ -159,7 +159,7 @@ public class RoleController {
*/
@PostMapping(value = "/getAll")
@ApiOperation(value = "获取所有角色", notes = "获取所有角色")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取所有角色", moduleName = "获取所有角色")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取所有角色", moduleName = "系统功能")
public Result<List<RoleSmallDto>> getAll() {
List<Role> roles = roleService.list();
List<RoleSmallDto> roleSmallDtos = new ArrayList<>();
......@@ -176,7 +176,7 @@ public class RoleController {
@PostMapping(value = "/getById")
@ApiOperation(value = "根据id获取角色信息", notes = "根据id获取角色信息")
// @ApiImplicitParam(name = "roleId", value = "角色id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据id获取角色信息", moduleName = "根据id获取角色信息")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据id获取角色信息", moduleName = "系统功能")
// public Result<RoleDto> getById(Long roleId){
public Result<RoleDto> getById(@RequestBody Map<String, Long> map) {
Long roleId = map.get("roleId");
......@@ -195,7 +195,7 @@ public class RoleController {
@ApiImplicitParam(name = "roleId", value = "角色id",required = true, dataType = "long", paramType = "path"),
@ApiImplicitParam(name = "enable", value = "禁用或者启用 0:禁用 1：启用", required = true, dataType = "long", paramType = "path"),
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-启用或者禁用角色", moduleName = "启用或者禁用角色")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-启用或者禁用角色", moduleName = "系统功能")
/* public Result enableOrUnEnable( Long roleId
,Integer enable){*/
public Result enableOrUnEnable(@RequestBody Map<String, Object> map) {
......@@ -216,7 +216,7 @@ public class RoleController {
*/
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/updateUserRoles")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "系统功能")
public Result updateUserRoles(@RequestBody RoleUpdateDto roleUpdate) {
boolean flag = roleService.update(roleUpdate);
if (flag) {
......
framework-system-manage/src/main/java/org/arch/manage/conterller/UserController.java
......@@ -56,7 +56,7 @@ public class UserController {
*/
@ApiOperation(value = "根据条件分页查询", notes = "根据条件分页查询")
@PostMapping("/page")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "根据条件分页查询")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "系统功能")
public Result<Page<UserDto>> page(@RequestBody @Validated UserQueryDto userQuery){
IPage<User> queryPage = new Page<>();
queryPage.setCurrent((userQuery.getCurrPage()==null || userQuery.getCurrPage()<=0)?1:userQuery.getCurrPage());
......@@ -107,7 +107,7 @@ public class UserController {
*/
@ApiOperation(value = "添加用户信息", notes = "添加用户信息")
@PostMapping("/add")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "添加用户信息")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "系统功能")
public Result create(@RequestBody UserAddDto user){
boolean flag = userService.create(user);
if(flag){
......@@ -123,7 +123,7 @@ public class UserController {
*/
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/update")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "系统功能")
public Result update(@RequestBody UserUpdateDto user){
boolean flag = userService.update(user);
if(flag){
......@@ -135,7 +135,7 @@ public class UserController {
@ApiOperation(value = "根据用户id获取用户信息", notes = "根据用户id获取用户信息")
@PostMapping("/get")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户id获取用户信息", moduleName = "根据用户id获取用户信息")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户id获取用户信息", moduleName = "系统功能")
public Result<UserDto> getById(@RequestBody String id){
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -151,7 +151,7 @@ public class UserController {
@ApiOperation(value = "删除用户信息", notes = "删除用户信息")
@PostMapping("/delete")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-删除用户信息", moduleName = "删除用户信息")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-删除用户信息", moduleName = "系统功能")
public Result delete(@RequestBody String id){
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -174,7 +174,7 @@ public class UserController {
*/
@PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除用户", notes = "批量删除用户")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除用户", moduleName = "批量删除用户")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除用户", moduleName = "系统功能")
public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids){
if(ids == null || ids.size() < 1){
throw new BDException("用户id不能为空");
......@@ -193,7 +193,7 @@ public class UserController {
*/
@PostMapping(value = "/getUserTypes")
@ApiOperation(value = "获取员工类型", notes = "获取员工类型")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工类型", moduleName = "获取员工类型")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工类型", moduleName = "系统功能")
public Result<List<UserTypeDto>> getUserTypes(){
List<UserTypeDto> userTypeDtos = new ArrayList<>();
for (UserTypeEnum entity : UserTypeEnum.values()){
......@@ -211,7 +211,7 @@ public class UserController {
*/
@PostMapping(value = "/getUserSex")
@ApiOperation(value = "获取员工性别", notes = "获取员工性别")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工性别", moduleName = "获取员工性别")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工性别", moduleName = "系统功能")
public Result<List<UserTypeDto>> getUserSex(){
List<UserSexDto> userSexDtos = new ArrayList<>();
for (SexEnum entity : SexEnum.values()){
......@@ -230,7 +230,7 @@ public class UserController {
*/
@PostMapping(value = "/getIscUserByName")
@ApiOperation(value = "根据用户名获取isc用户信息", notes = "根据用户名获取isc用户信息")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户名获取isc用户信息", moduleName = "根据用户名获取isc用户信息")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户名获取isc用户信息", moduleName = "系统功能")
// public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
// public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
public Result<List<User>> getIscUserByName(@RequestBody Map<String, String> map) throws Exception{
......@@ -278,7 +278,7 @@ public class UserController {
*/
@ApiOperation(value = "添加用户信息", notes = "添加用户信息")
@PostMapping("/addIscUser")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "添加用户信息")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "系统功能")
public Result addIscUser(@ApiParam(value = "用户集合", required = true) @RequestBody List<User> userList){
QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("role_sign", "bus_user");
......@@ -316,7 +316,7 @@ public class UserController {
*/
@ApiOperation(value = "根据角色查询用户集合", notes = "根据角色查询用户集合")
@PostMapping("/getUserList")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合", moduleName = "根据角色查询用户集合")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合", moduleName = "系统功能")
public Result<List<UserDto>> getUserList(@RequestBody RoleUpdateDto roleUpdate){
return Result.success(userService.getUserList(roleUpdate));
......@@ -325,7 +325,7 @@ public class UserController {
@ApiOperation(value = "根据角色查询用户集合(包括所在部门)", notes = "根据角色查询用户集合(包括所在部门)")
@PostMapping("/getUserListAll")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合(包括所在部门)", moduleName = "根据角色查询用户集合(包括所在部门)")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合(包括所在部门)", moduleName = "系统功能")
public Result<List<UserDto>> getUserList1(@RequestBody RoleUpdateDto roleUpdate){
List<UserDto> userListAll = userService.getUserListAll(roleUpdate);
return Result.success(userListAll);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!