From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 83 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 9c9d979..7a37f37 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,39 +32,42 @@
@RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ allLike(WrkMast.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("io_time", false);
}
return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper 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())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ 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]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.eq(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/wrkMast/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ坊鍔�")
public R add(WrkMast wrkMast) {
wrkMast.setModiUser(getUserId());
wrkMast.setModiTime(new Date());
@@ -74,10 +77,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMast/update/auth")
- @ManagerAuth
- public R update(WrkMast wrkMast){
- if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
+ @RequestMapping(value = "/wrkMast/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
+ public R update(WrkMast wrkMast) {
+ if (Cools.isEmpty(wrkMast) || null == wrkMast.getWrkNo()) {
return R.error();
}
wrkMast.setModiUser(getUserId());
@@ -87,21 +90,21 @@
}
@RequestMapping(value = "/wrkMast/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam String param){
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
+ public R delete(@RequestParam String param) {
List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkMast entity : list){
+ for (WrkMast entity : list) {
wrkMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
}
@RequestMapping(value = "/wrkMast/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
@@ -117,7 +120,7 @@
wrapper.like("wrk_no", condition);
Page<WrkMast> page = wrkMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMast wrkMast : page.getRecords()){
+ for (WrkMast wrkMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMast.getWrkNo());
map.put("value", wrkMast.getWrkNo());
@@ -130,26 +133,32 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastService.selectOne(wrapper)){
+ if (null != wrkMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
@RequestMapping(value = "/wrkMast/add/pri/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
public R addPri(@RequestBody List<WrkMast> list) {
- for (WrkMast entity : list){
- entity.setIoPri(entity.getIoPri() + 1);
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
+ for (WrkMast entity : list) {
+ entity.setIoPri(entity.getIoPri() + 1);
}
wrkMastService.updateBatchById(list);
return R.ok();
}
@RequestMapping(value = "/wrkMast/red/pri/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
public R redPri(@RequestBody List<WrkMast> list) {
- for (WrkMast entity : list){
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
+ for (WrkMast entity : list) {
entity.setIoPri(entity.getIoPri() - 1);
}
wrkMastService.updateBatchById(list);
--
Gitblit v1.9.1