From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/StkPlcmController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StkPlcmController.java b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
index 32bad27..a76bf54 100644
--- a/src/main/java/com/zy/asrs/controller/StkPlcmController.java
+++ b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
@@ -45,40 +45,41 @@
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(memo = "鍫嗗灈鏈哄紓甯告棩蹇楁坊鍔�")
+ @ManagerAuth(memo = "response.stk_plcm_add")
public R add(StkPlcm stkPlcm) {
stkPlcmService.insert(stkPlcm);
- return R.ok();
+ return R.ok("response.operation_success");
}
@RequestMapping(value = "/stkPlcm/delete/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀垹闄�")
+ @ManagerAuth(memo = "response.stk_plcm_delete")
public R delete(@RequestParam String param){
List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.data_empty");
}
for (StkPlcm entity : list){
stkPlcmService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/stkPlcm/export/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀鍑�")
+ @ManagerAuth(memo = "response.stk_plcm_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
@@ -93,7 +94,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<StkPlcm> wrapper = new EntityWrapper<StkPlcm>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != stkPlcmService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(StkPlcm.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(StkPlcm.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1