From ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑
---
src/main/java/com/zy/asrs/controller/BasWhsController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index bdd436f..2de999b 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -44,20 +44,21 @@
return R.ok(basWhsService.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.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/basWhs/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷娣诲姞")
public R add(BasWhs basWhs) {
basWhs.setModiUser(getUserId());
basWhs.setModiTime(new Date());
@@ -68,7 +69,7 @@
}
@RequestMapping(value = "/basWhs/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
public R update(BasWhs basWhs){
if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
return R.error();
@@ -80,7 +81,7 @@
}
@RequestMapping(value = "/basWhs/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷鍒犻櫎")
public R delete(@RequestParam String param){
List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
if (Cools.isEmpty(list)){
@@ -93,7 +94,7 @@
}
@RequestMapping(value = "/basWhs/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "搴撲綅绫诲瀷瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1