From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 10:20:25 +0800
Subject: [PATCH] java 优化库位检索逻辑，添加AGV工作明细服务，修复定时任务
---
src/main/java/com/zy/asrs/controller/AgvWarnController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWarnController.java b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
index 4d1a0e9..9cd3b3a 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWarnController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
@@ -61,7 +61,7 @@
@PostMapping("/service/rest/agvCallbackService/warnCallback")
@AppAuth(memo = "AGV鍛婅鍥炶皟")
public Object taskEventStaus(@RequestBody AgvWarnCallBackParam param, HttpServletRequest request) {
- log.info("AGV鍛婅鍥炶皟:{}", JSON.toJSONString(param));
+ //og.info("AGV鍛婅鍥炶皟:{}", JSON.toJSONString(param));
AppAuthUtil.auth("", param, request);
List<AgvWarnBody> agvWarnBodies = param.getData();
// List<AgvWarnBody> agvWarnBodies = JSONArray.parseArray(data, AgvWarnBody.class);
@@ -69,13 +69,13 @@
List<AgvWarn> agvWarns = new ArrayList<>();
List<AgvWarn> updates = new ArrayList<>();
for (AgvWarnBody body : agvWarnBodies) {
- List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()).eq("warn_content", body.getWarnContent()));
+ List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("warn_content", body.getWarnContent()));
if (Cools.isEmpty(agvWarnList)) {
agvWarn = new AgvWarn();
- agvWarn.setBeginTime(body.getBeginTime());
+ agvWarn.setBeginTime(body.getBeginDate());
agvWarn.setAppeTime(new Date());
agvWarn.setTimes(0);
- agvWarn.setModiTime(DateUtils.convert(body.getBeginTime(), DateUtils.yyyyMMddHHmmss_F));
+ agvWarn.setModiTime(DateUtils.convert(body.getBeginDate(), DateUtils.yyyyMMddHHmmss_F));
agvWarn.setRobotCode(body.getRobotCode());
agvWarn.setWarnContent(body.getWarnContent());
if (body.getTaskCode() != null) {
--
Gitblit v1.9.1