lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-05-07 23:57:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat 还原日志列表的UI和接口

Browse Source 
feat 还原系统配置的显示
This commit is contained in:
damonyuan
2024-10-26 01:49:23 +08:00
parent b694076f45
commit 845d5a526a
6 changed files with 150 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java
View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@RestController
@RequestMapping("api/monitor")
@RequestMapping("adminapi/setting/system.system")
@Api(tags = "监控服务管理")
public class MonitorServerController {
@@ -23,7 +23,7 @@ public class MonitorServerController {
* @return AjaxResult<Map<String, Object>>
*/
@Log(title = "服务监控")
@GetMapping("/server")
@GetMapping("/info")
@ApiOperation(value="服务监控")
public AjaxResult<Map<String, Object>> info() {
ServerResult server = new ServerResult();

4
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java
View File

@@ -25,9 +25,9 @@ public class SystemLogsController {
@Resource
ISystemLogsServer iSystemLogsServer;
@GetMapping("/operate")
@GetMapping("/lists")
@ApiOperation(value="系统操作日志")
public AjaxResult<PageResult<SystemLogOperateVo>> operate(@Validated PageValidate pageValidate,
public AjaxResult<PageResult<SystemLogOperateVo>> lists(@Validated PageValidate pageValidate,
@Validated SystemSearchOperateValidate searchValidate) {
PageResult<SystemLogOperateVo> list = iSystemLogsServer.operate(pageValidate, searchValidate);
return AjaxResult.success(list);

6
server/like-admin/src/main/java/com/mdd/admin/service/impl/system/SystemLogsServerImpl.java
View File

@@ -52,13 +52,13 @@ public class SystemLogsServerImpl implements ISystemLogsServer {
MPJQueryWrapper<SystemLogOperate> mpjQueryWrapper = new MPJQueryWrapper<SystemLogOperate>()
.selectAll(SystemLogOperate.class)
.select("sa.username,sa.nickname")
.leftJoin("?_system_auth_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix))
.select("sa.account as username,sa.name nickname")
.leftJoin("?_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix))
.orderByDesc("id");
logOperateMapper.setSearch(mpjQueryWrapper, searchValidate, new String[]{
"like:title:str",
"like:username@sa.username:str",
"like:username@sa.name:str",
"like:ip:str",
"=:type:str",
"=:status:int",