From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index f7331c4..7201f48 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -46,56 +46,57 @@
return R.ok(basCrnStatusService.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 = "/basCrnStatus/add/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佹坊鍔�")
+ @ManagerAuth(memo = "response.crane_status_add")
public R add(BasCrnStatus basCrnStatus) {
basCrnStatus.setModiUser(getUserId());
basCrnStatus.setModiTime(new Date());
basCrnStatus.setAppeUser(getUserId());
basCrnStatus.setAppeTime(new Date());
basCrnStatusService.insert(basCrnStatus);
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
+ @ManagerAuth(memo = "response.crane_status_update")
public R update(BasCrnStatus basCrnStatus){
if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
- return R.error();
+ return R.error("response.param_error");
}
basCrnStatus.setModiUser(getUserId());
basCrnStatus.setModiTime(new Date());
basCrnStatusService.updateById(basCrnStatus);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/basCrnStatus/delete/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
+ @ManagerAuth(memo = "response.crane_status_delete")
public R delete(@RequestParam String param){
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (BasCrnStatus entity : list){
basCrnStatusService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/basCrnStatus/export/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
+ @ManagerAuth(memo = "response.crane_status_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1