Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.接口日志类型调整

Browse Source
This commit is contained in:
cdf
2024-08-28 19:55:36 +08:00
parent cccc7953ed
commit 476993db15
14 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java
View File

@@ -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)

8
pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java
View File

@@ -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)

10
pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java
View File

@@ -65,7 +65,7 @@ public class ConfigController extends BaseController {
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getSysConfigData")
@ApiOperation("获取系统配置列表")
public HttpResult<List<Config>> 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)

20
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java
View File

@@ -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<DictData> 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<DictData> 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)

2
pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
View File

@@ -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<Page<EleEpdPqdVO>> getList(@RequestBody @Validated EleEpdPqdParam.EleEpdPqdQueryParam queryParam) {
String methodDescribe = getMethodDescribe("getList");

26
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
View File

@@ -111,7 +111,8 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
QueryWrapper<UserLog> 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<UserLogMapper, UserLog> 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<UserLogMapper, UserLog> implem
public void clearHistoryLog() {
Config config = iConfigService.getOne(new LambdaQueryWrapper<Config>().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();