From 371462edc6b3ee1de97c235d4a019b544badda0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 14 二月 2026 22:09:37 +0800
Subject: [PATCH] AGV工作档界面和逻辑调整
---
src/main/java/com/zy/asrs/controller/TaskLogController.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskLogController.java b/src/main/java/com/zy/asrs/controller/TaskLogController.java
index d4910b7..d7a8c1e 100644
--- a/src/main/java/com/zy/asrs/controller/TaskLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskLogController.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.service.TaskLogService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +21,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@RestController
public class TaskLogController extends BaseController {
@@ -40,24 +42,53 @@
@RequestParam(required = false) String orderByType,
@RequestParam(required = false) String condition,
@RequestParam Map<String, Object> param) {
- EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(TaskLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)) {
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ try {
+ log.info("TaskLog鏌ヨ璇锋眰锛屽弬鏁帮細curr={}, limit={}, param={}", curr, limit, param);
+ EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(TaskLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("appe_time",false);
+ Page<TaskLog> page = taskLogService.selectPage(new Page<>(curr, limit), wrapper);
+ log.info("TaskLog鏌ヨ鎴愬姛锛岃繑鍥瀧}鏉¤褰�", page.getRecords().size());
+ return R.ok(page);
+ } catch (Exception e) {
+ log.error("TaskLog鏌ヨ澶辫触", e);
+ e.printStackTrace();
+ return R.error("鏌ヨ澶辫触锛�" + e.getMessage());
}
- wrapper.orderBy("appe_time",false);
- return R.ok(taskLogService.selectPage(new Page<>(curr, limit), wrapper));
}
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());
+ if (Cools.isEmpty(val) || "null".equals(val)) {
+ continue;
+ }
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 if (val.contains(",") && !val.equals("null")) {
+ // 澶氬�兼煡璇細宸ヤ綔鐘舵�佺瓑澶氶�夌敤 IN锛堜笌 AGV 浠诲姟绠＄悊涓�鑷达級
+ String[] values = val.split(",");
+ List<Object> valueList = new ArrayList<>();
+ for (String v : values) {
+ v = v.trim();
+ if (!Cools.isEmpty(v) && !v.equals("null")) {
+ try {
+ valueList.add(Long.parseLong(v));
+ } catch (NumberFormatException e) {
+ valueList.add(v);
+ }
+ }
+ }
+ if (!valueList.isEmpty()) {
+ wrapper.in(entry.getKey(), valueList);
+ }
} else {
wrapper.like(entry.getKey(), val);
}
--
Gitblit v1.9.1