From 476993db15e73746fbcaefb669ee6e3ca5606587 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 28 Aug 2024 19:55:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=A5=E5=8F=A3=E6=97=A5=E5=BF=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResponsibilityController.java | 2 +- .../responsibility/UserDataController.java | 2 +- .../system/controller/AreaController.java | 8 +++--- .../system/controller/AuditController.java | 8 +++--- .../system/controller/ConfigController.java | 10 +++---- .../system/controller/DictDataController.java | 20 +++++++------- .../controller/EleEpdPqdController.java | 2 +- .../system/service/impl/AuditServiceImpl.java | 26 ++++++++++++------- .../user/controller/AuthClientController.java | 3 ++- .../user/controller/ComponentController.java | 6 ++--- .../njcn/user/controller/DeptController.java | 10 +++---- .../controller/PassWordRuleController.java | 6 ++--- .../njcn/user/controller/RoleController.java | 2 +- .../njcn/user/controller/UserController.java | 18 ++++++------- 14 files changed, 65 insertions(+), 58 deletions(-) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/ResponsibilityController.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/ResponsibilityController.java index 9b9a754b5..6c9889060 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/ResponsibilityController.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/ResponsibilityController.java @@ -41,7 +41,7 @@ public class ResponsibilityController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/responsibilityList") - @ApiOperation("列表分页") + @ApiOperation("查询责任划分列表分页") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) public HttpResult> responsibilityList(@RequestBody @Validated BaseParam queryParam) { String methodDescribe = getMethodDescribe("responsibilityList"); diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/UserDataController.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/UserDataController.java index 60ac897af..886e29cb3 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/UserDataController.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/responsibility/UserDataController.java @@ -47,7 +47,7 @@ public class UserDataController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/userDataList") - @ApiOperation("列表分页") + @ApiOperation("查询用户列表分页") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) public HttpResult> userDataList(@RequestBody @Validated BaseParam queryParam) { String methodDescribe = getMethodDescribe("userDataList"); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java index eae18b8f6..c46ae2e87 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java @@ -46,7 +46,7 @@ public class AreaController extends BaseController { /** * 分页查询行政区域 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/list") @ApiOperation("查询企业区域") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) @@ -63,7 +63,7 @@ public class AreaController extends BaseController { * @param id 行政区域id * @return 行政区域详情 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/selectIdArea/{id}") @ApiOperation("根据行政区域id查询详情") @ApiImplicitParam(name = "id", value = "查询参数", required = true) @@ -161,7 +161,7 @@ public class AreaController extends BaseController { * @param ids 行政区域ids * @return 行政区域查看所有子节点 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/selectPid") @ApiOperation("根据行政区域id查询") @ApiImplicitParam(name = "ids", value = "查询参数", required = true) @@ -247,7 +247,7 @@ public class AreaController extends BaseController { * @param name 行政区域名称 * @return 行政区域详情 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/selectAreaByName/{name}") @ApiOperation("根据行政区域名称查询详细") @ApiImplicitParam(name = "name", value = "查询参数", required = true) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java index 36545fc2d..2c62d3cd9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java @@ -43,7 +43,7 @@ public class AuditController extends BaseController { private final AuditService auditService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/getAuditLog") @ApiOperation("审计日志列表") @ApiImplicitParam(name = "auditParam", value = "审计日志参数", required = true) @@ -54,7 +54,7 @@ public class AuditController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,result,methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/logFileWriter") @ApiOperation("日志文件备份") public HttpResult logFileWriter(){ @@ -63,7 +63,7 @@ public class AuditController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/recoverLogFile") @ApiOperation("日志文件恢复") public HttpResult recoverLogFile() { @@ -72,7 +72,7 @@ public class AuditController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/censusAuditLog") @ApiOperation("审计日志统计") @ApiImplicitParam(name = "auditParam", value = "审计日志参数", required = true) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java index 137e4d166..ac79e625d 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java @@ -65,7 +65,7 @@ public class ConfigController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getSysConfigData") @ApiOperation("获取系统配置列表") public HttpResult> getSysConfigData() { @@ -80,7 +80,7 @@ public class ConfigController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getSysConfigById") @ApiOperation("根据配置Id获取系统配置") @ApiImplicitParam(name = "id", value = "参数id", required = true) @@ -96,7 +96,7 @@ public class ConfigController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/updateSysConfigById") @ApiOperation("根据配置Id更改(激活)系统状态") @ApiImplicitParam(name = "id", value = "参数id", required = true) @@ -116,7 +116,7 @@ public class ConfigController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/removeSysConfigById") @ApiOperation("根据配置Id删除系统配置") @ApiImplicitParam(name = "id", value = "参数id", required = true) @@ -155,7 +155,7 @@ public class ConfigController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) @PostMapping("/updateSysConfig") @ApiOperation("修改系统配置") @ApiImplicitParam(name = "configUpdateParam", value = "更新配置实体", required = true) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java index 9af23068d..095b3fe6a 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java @@ -133,7 +133,7 @@ public class DictDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataById") @ApiOperation("根据字典id查询字典数据") @ApiImplicitParam(name = "dicIndex", value = "查询参数", required = true) @@ -143,7 +143,7 @@ public class DictDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByTypeName") @ApiOperation("根据字典类型名称查询字典数据") @ApiImplicitParam(name = "dictTypeName", value = "查询参数", required = true) @@ -153,7 +153,7 @@ public class DictDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByName") @ApiOperation("根据字典名称查询字典数据") @ApiImplicitParam(name = "dicName", value = "查询参数", required = true) @@ -163,7 +163,7 @@ public class DictDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByNameAndType") @ApiOperation("根据字典名称查询字典数据") @ApiImplicitParams({ @@ -176,7 +176,7 @@ public class DictDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByCodeAndType") @ApiOperation("根据字典Code和字典类型查询字典数据") @ApiImplicitParams({ @@ -188,7 +188,7 @@ public class DictDataController extends BaseController { DictData result = dictDataService.getDicDataByCodeAndType(dicCode,typeCode); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByCode") @ApiOperation("根据字典code查询字典数据") @ApiImplicitParam(name = "code", value = "查询参数", required = true) @@ -201,7 +201,7 @@ public class DictDataController extends BaseController { /** * 根据系统类型获取不同指标参数 */ - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getLoadTypeBySys") @ApiOperation("根据系统类型获取不同指标参数") @ApiIgnore @@ -220,7 +220,7 @@ public class DictDataController extends BaseController { * @return 新增后的字典数据 */ @ApiIgnore - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/addDicData") @ApiOperation("后台新增字典数据") public HttpResult addDicData(String dicTypeName, String dicDataName) { @@ -236,7 +236,7 @@ public class DictDataController extends BaseController { * @return 字典数据 */ @ApiIgnore - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByNameAndTypeName") @ApiOperation("根据字典类型名称&数据名称获取字典数据") public HttpResult getDicDataByNameAndTypeName(String dicTypeName, String dicDataName) { @@ -245,7 +245,7 @@ public class DictDataController extends BaseController { } @ApiIgnore - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDicDataByTypeCode") @ApiOperation("根据字典类型code查询字典数据") @ApiImplicitParam(name = "dictTypeCode", value = "查询参数", required = true) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java index 996b9a0b8..b9f770008 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java @@ -97,7 +97,7 @@ public class EleEpdPqdController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/list") - @ApiOperation("列表分页") + @ApiOperation("查询模板列表分页") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) public HttpResult> getList(@RequestBody @Validated EleEpdPqdParam.EleEpdPqdQueryParam queryParam) { String methodDescribe = getMethodDescribe("getList"); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index fd1efc2df..15adcad54 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -111,7 +111,8 @@ public class AuditServiceImpl extends ServiceImpl implem QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper .between("sys_user_log.create_time", DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())), - DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime()))); + DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime()))) + .ne("sys_user_log.login_name", UNKNOWN_USER); if (StrUtil.isNotBlank(auditParam.getLoginName())) { queryWrapper.eq("sys_user_log.login_name", auditParam.getLoginName()); } @@ -187,23 +188,28 @@ public class AuditServiceImpl extends ServiceImpl implem userIndex = RequestUtil.getUserIndex(request); String result = CommonResponseEnum.SUCCESS.getMessage(); String ip = RequestUtil.getRealIp(request); - String type = LogEnum.BUSINESS_COMMON.getOperateType(); - String level = LogEnum.BUSINESS_COMMON.getOperateLevel(); + String type = LogEnum.SYSTEM_COMMON.getOperateType(); + String level = LogEnum.SYSTEM_COMMON.getOperateLevel(); String operateType = OperateType.QUERY; Integer severity = levelStringToNumber(level); - if(auditParam.isExport()){ + if (auditParam.isExport()) { methodDescribe = "审计日志列表导出"; - }else{ + LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, userName, ip, methodDescribe, operateType, result.equalsIgnoreCase("失败") ? 0 : 1, "", severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); + publisher.send("/userLog", PubUtils.obj2json(logInfoDTO), 2, false); + }else { if (StrUtil.isNotBlank(auditParam.getSortBy()) && StrUtil.isNotBlank(auditParam.getOrderBy())) { methodDescribe = methodDescribe.concat("并以") .concat(auditParam.getSortName()) .concat("进行") - .concat(auditParam.getOrderBy().equalsIgnoreCase("desc")?"降序":"升序") + .concat(auditParam.getOrderBy().equalsIgnoreCase("desc") ? "降序" : "升序") .concat("查询"); + LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, userName, ip, methodDescribe, operateType, result.equalsIgnoreCase("失败") ? 0 : 1, "", severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); + publisher.send("/userLog", PubUtils.obj2json(logInfoDTO), 2, false); + } } - LogInfoDTO logInfoDTO = new LogInfoDTO(loginName, userName, ip, methodDescribe, operateType, result.equalsIgnoreCase("失败") ? 0 : 1, "", severity, type.equalsIgnoreCase("业务事件") ? 0 : 1, generalInfo.getMicroServiceName(), userIndex, LocalDateTime.now()); - publisher.send("/userLog", PubUtils.obj2json(logInfoDTO), 2, false); + + } @Override @@ -392,9 +398,9 @@ public class AuditServiceImpl extends ServiceImpl implem public void clearHistoryLog() { Config config = iConfigService.getOne(new LambdaQueryWrapper().eq(Config::getState, DataStateEnum.ENABLE.getCode())); Integer logTime; - if(ObjectUtil.isNotNull(config)){ + if (ObjectUtil.isNotNull(config)) { logTime = config.getLogTime(); - }else{ + } else { logTime = clearHistoryLog; } LocalDateTime nowDate = LocalDateTime.now(); diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/AuthClientController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/AuthClientController.java index 843103cba..7f37fd5a1 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/AuthClientController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/AuthClientController.java @@ -2,6 +2,7 @@ package com.njcn.user.controller; import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; @@ -41,7 +42,7 @@ public class AuthClientController extends BaseController { private final IAuthClientService authClientService; - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getAuthClientByName/{clientName}") @ApiOperation("根据客户端名查询信息") @ApiImplicitParam(name = "clientName", value = "客户端名称", required = true) diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/ComponentController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/ComponentController.java index 3fd1a1aab..e34f39756 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/ComponentController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/ComponentController.java @@ -98,7 +98,7 @@ public class ComponentController extends BaseController { } } - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/componentTree") @ApiOperation("组件树") public HttpResult> getComponentTree(){ @@ -107,7 +107,7 @@ public class ComponentController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,list,methodDescribe); } - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/userComponentTree") @ApiOperation("用户组件树") public HttpResult> getUserComponentTree(){ @@ -116,7 +116,7 @@ public class ComponentController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,list,methodDescribe); } - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getFatherComponent") @ApiOperation("获取父组件节点") public HttpResult> getFatherComponent(@RequestParam @Validated String systemType){ diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java index 0a29d0d52..4c6b2c708 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java @@ -58,7 +58,7 @@ public class DeptController extends BaseController { /** * 分页查询部门信息 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/list") @ApiOperation("查询部门信息") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) @@ -233,7 +233,7 @@ public class DeptController extends BaseController { * 根据条件获取后代部门索引 * */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/getDeptDescendantIndexes") @ApiOperation("获取后代部门索引") @ApiImplicitParams({ @@ -257,7 +257,7 @@ public class DeptController extends BaseController { * @author xy * @date 2022/2/14 15:04 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDeptIdByArea") @ApiOperation("根据区域索引获取部门索引") @ApiIgnore @@ -281,7 +281,7 @@ public class DeptController extends BaseController { * @author denghuajun * @date 2022/2/24 15:04 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getAreaIdByDeptId") @ApiOperation("根据区域索引获取部门索引") @ApiImplicitParam(name = "deptId", value = "部门id", required = true) @@ -379,7 +379,7 @@ public class DeptController extends BaseController { @GetMapping("/getDepSonSelfCodetByDeptId") @ApiOperation("根据部门id获取所有子部门以及自身的code") public HttpResult> getDepSonSelfCodetByDeptId(@RequestParam("deptId")String deptId) { - String methodDescribe = getMethodDescribe("getDepSonSelfIdtByDeptId"); + String methodDescribe = getMethodDescribe("getDepSonSelfCodetByDeptId"); List deptList = deptService.getDepSonSelfCodetByDeptId(deptId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java index b712e3c68..c9132f413 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController; @AllArgsConstructor public class PassWordRuleController extends BaseController { private final PassWordRuleService passWordRuleService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("密码规则修改") @RequestMapping(value = "/ruleUpdate", method = RequestMethod.POST) public HttpResult ruleUpdate(@RequestBody @Validated PassWordRuleParam passWordRuleParam) { @@ -44,7 +44,7 @@ public class PassWordRuleController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("获取密码规则") @RequestMapping(value = "/getRule", method = RequestMethod.POST) public HttpResult getRule() { @@ -54,7 +54,7 @@ public class PassWordRuleController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, passWordRuleParam, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiOperation("获取用户策略") @RequestMapping(value = "/getUserStrategy", method = RequestMethod.POST) public HttpResult getUserStrategy() { diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/RoleController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/RoleController.java index 4ef3f4a2b..459996cbb 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/RoleController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/RoleController.java @@ -50,7 +50,7 @@ public class RoleController extends BaseController { /** * 分页查询角色信息 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/list") @ApiOperation("查询角色信息") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java index afbd544e5..7b4e2e129 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java @@ -73,7 +73,7 @@ public class UserController extends BaseController { private final RedisUtil redisUtil; - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getUserByName/{loginName}") @ApiOperation("根据登录名查询用户信息") @ApiImplicitParam(name = "loginName", value = "登录名", required = true) @@ -90,7 +90,7 @@ public class UserController extends BaseController { } - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @ApiIgnore @GetMapping("/getUserByPhone/{phone}") @ApiOperation("根据手机号查询用户信息") @@ -107,7 +107,7 @@ public class UserController extends BaseController { } } - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/judgeUserStatus/{loginName}") @ApiOperation("认证后根据用户名判断用户状态") @ApiImplicitParam(name = "loginName", value = "登录名", required = true) @@ -195,7 +195,7 @@ public class UserController extends BaseController { } } - @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPLOAD) @PostMapping("/uploadImage") @ApiOperation("上传头像") public HttpResult uploadImage(MultipartFile issuesFile) { @@ -204,7 +204,7 @@ public class UserController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new MinIoUploadResDTO(issuesFile.getOriginalFilename(), filePath), methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPLOAD) @PostMapping("/getUrl") @ApiOperation("获取头像url") public HttpResult getUrl(@RequestParam("headSculpture") String headSculpture) { @@ -216,7 +216,7 @@ public class UserController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/list") - @ApiOperation("列表分页") + @ApiOperation("查询用户列表分页") @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) public HttpResult> getUserList(@RequestBody @Validated UserParam.UserQueryParam queryParam) { String methodDescribe = getMethodDescribe("getUserList"); @@ -344,7 +344,7 @@ public class UserController extends BaseController { } } - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/generateSm2Key") @ApiOperation("根据登录名获取公钥") @ApiImplicitParam(name = "loginName", value = "登录名", required = true) @@ -433,7 +433,7 @@ public class UserController extends BaseController { * @param id 用户ID * @return */ - @OperateInfo + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) @PutMapping("/activateUser") @ApiOperation("用户激活") @ApiImplicitParam(name = "id", value = "用户id") @@ -573,7 +573,7 @@ public class UserController extends BaseController { * @author cdf * @date 2023/7/31 */ - @OperateInfo(info = LogEnum.SYSTEM_SERIOUS) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getUserListByRoleCode") @ApiOperation("根据角色Code集合查询用户信息") @ApiImplicitParam(name = "roleCode", value = "角色Code", required = true)