From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 10:20:25 +0800
Subject: [PATCH] java 优化库位检索逻辑，添加AGV工作明细服务，修复定时任务
---
src/main/java/com/zy/asrs/controller/StkPlcmController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StkPlcmController.java b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
index 056da4b..a5957da 100644
--- a/src/main/java/com/zy/asrs/controller/StkPlcmController.java
+++ b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
@@ -45,31 +45,32 @@
return R.ok(stkPlcmService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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())));
+ 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.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/stkPlcm/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楁坊鍔�")
public R add(StkPlcm stkPlcm) {
stkPlcmService.insert(stkPlcm);
return R.ok();
}
@RequestMapping(value = "/stkPlcm/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀垹闄�")
public R delete(@RequestParam String param){
List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (StkPlcm entity : list){
stkPlcmService.delete(new EntityWrapper<>(entity));
@@ -78,7 +79,7 @@
}
@RequestMapping(value = "/stkPlcm/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1