From 4fb7e0400fcd65efb71e96d010efea286bf3e37c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 21 五月 2024 15:43:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/OperateLogController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index da7f7b1..9ceccd0 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/operateLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(operateLogService.selectById(String.valueOf(id)));
+ return R.ok(operateLogService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/operateLog/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(operateLogService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == operateLog.getId()){
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
} else {
operateLogService.updateById(operateLog);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/operateLog/add/auth")
@ManagerAuth
public R add(OperateLog operateLog) {
- operateLogService.insert(operateLog);
+ operateLogService.save(operateLog);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- operateLogService.deleteBatchIds(Arrays.asList(ids));
+ operateLogService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("operateLog"));
convert(map, wrapper);
- List<OperateLog> list = operateLogService.selectList(wrapper);
+ List<OperateLog> list = operateLogService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/operateLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
+ QueryWrapper<OperateLog> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<OperateLog> page = operateLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OperateLog> page = operateLogService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (OperateLog operateLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1