From 2d2fd991826837d7189cc488aee6f309a6f5e216 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 22:48:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java b/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
index 0af88ad..a4c7dc7 100644
--- a/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDualCrnpOptController.java
@@ -2,9 +2,9 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasDualCrnpOpt;
import com.zy.asrs.service.BasDualCrnpOptService;
@@ -27,7 +27,7 @@
@RequestMapping(value = "/basDualCrnpOpt/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basDualCrnpOptService.selectById(String.valueOf(id)));
+ return R.ok(basDualCrnpOptService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/basDualCrnpOpt/list/auth")
@@ -38,24 +38,25 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasDualCrnpOpt.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("send_time", false);
- return R.ok(basDualCrnpOptService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));}
+ wrapper.orderBy(true, false, "send_time");
+ return R.ok(basDualCrnpOptService.page(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.like(column, val);
}
}
}
@@ -63,7 +64,7 @@
@RequestMapping(value = "/basDualCrnpOpt/add/auth")
@ManagerAuth
public R add(BasDualCrnpOpt basDualCrnpOpt) {
- basDualCrnpOptService.insert(basDualCrnpOpt);
+ basDualCrnpOptService.save(basDualCrnpOpt);
return R.ok();
}
@@ -81,7 +82,7 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Integer[] ids){
for (Integer id : ids){
- basDualCrnpOptService.deleteById(id);
+ basDualCrnpOptService.removeById(id);
}
return R.ok();
}
@@ -89,20 +90,20 @@
@RequestMapping(value = "/basDualCrnpOpt/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
- EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDualCrnpOpt"));
convert(map, wrapper);
- List<BasDualCrnpOpt> list = basDualCrnpOptService.selectList(wrapper);
+ List<BasDualCrnpOpt> list = basDualCrnpOptService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/basDualCrnpOptQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<>();
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<BasDualCrnpOpt> page = basDualCrnpOptService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDualCrnpOpt> page = basDualCrnpOptService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDualCrnpOpt basDualCrnpOpt : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -116,8 +117,8 @@
@RequestMapping(value = "/basDualCrnpOpt/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<BasDualCrnpOpt> wrapper = new EntityWrapper<BasDualCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDualCrnpOptService.selectOne(wrapper)){
+ QueryWrapper<BasDualCrnpOpt> wrapper = new QueryWrapper<BasDualCrnpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDualCrnpOptService.getOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(BasDualCrnpOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1