From bab6283f5c0b5da44b7a342f9daef35473a13ab7 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 16 四月 2026 14:54:57 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 612634e..4d685cb 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -154,6 +154,39 @@
return R.ok(outPage);
}
+// @RequestMapping(value = "/manLocDetl/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){
+ Long hostId = getHostId();
+ if (hostId != null) {
+ param.put("host_id", hostId);
+ }
+ Object nodeId = param.get("node_id");
+ if (Cools.isEmpty(nodeId)) {
+ nodeId = getOriginNode().getId();
+ param.put("node_id", String.valueOf(nodeId));
+ }
+ Object tagId = param.get("tag_id");
+ if (Cools.isEmpty(tagId)) {
+ tagId = getOriginTag().getId();
+ param.put("tag_id", String.valueOf(tagId));
+ }
+ if (!Cools.isEmpty(param.get("update_time"))){
+ String val = String.valueOf(param.get("update_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("update_time");
+ }
+ }
+ return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
+ }
+
@RequestMapping("/manLocDetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
@@ -161,19 +194,23 @@
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
-// @RequestMapping(value = "/manLocDetl/asrsAndSaas/list")
-// @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(required = false)String condition,
-// @RequestParam Map<String, Object> param){
-//
-// Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
-// Page<ManLocDetl> all = manLocDetlService.selectAllPage(manLocDetlPage);
-// return R.ok().add(all);
-// }
+ @RequestMapping(value = "/manLocDetl/asrsAndSaas/list")
+ @ManagerAuth
+ public R listAsrs(@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){
+
+ Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
+ Page<ManLocDetl> all = manLocDetlService.selectAllPage(manLocDetlPage);
+ return R.ok().add(all);
+ }
+
+
+
+
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());
@@ -182,10 +219,10 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("locNo")) {
+ if (entry.getKey().equals("loc_no")) {
wrapper.eq("loc_no", String.valueOf(entry.getValue()));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+// wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
}
}
--
Gitblit v1.9.1