From 1286f6fd5625d3d058d1dcff11b8fda303d6c455 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 10:28:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvWarnController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..dd8602d 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) {
@@ -124,7 +124,7 @@
private void logPost(String param, String response, boolean success) {
apiLogService.save(
- "ESS浠诲姟鍥炶皟",
+ "ESS灏忚溅鎶ヨ鍥炶皟",
"/phyzwms/agv/task/event/status",
null,
null,
--
Gitblit v1.9.1