From ec57869b03ab548bca648d0b41e93f5e74fcca56 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期四, 08 一月 2026 16:05:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/application.yml | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java | 4 ++--
zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
index 911276d..89d873d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -28,8 +28,8 @@
@Service("staReserveService")
public class StaReserveServiceImpl extends ServiceImpl<StaReserveMapper, StaReserve> implements StaReserveService {
- public static final Long RESERVE_EXPIRE_TIME = 30 * 60 * 1000L;
- public static final Long WAITING_EXPIRE_TIME = 5 * 60 * 1000L;
+ public static final Long RESERVE_EXPIRE_TIME = 30 * 60L;
+ public static final Long WAITING_EXPIRE_TIME = 5 * 60L;
public static final Integer DEFAULT_QTY = 1;
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index bbd3c6f..99a4643 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -51,7 +51,7 @@
index: 8
convey-plc:
- host: 192.168.3.54
+ host: 10.10.10.212
port: 9090
floyd:
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
index 276331e..94eaa96 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
@@ -19,7 +19,7 @@
UPDATE man_sta_reserve
SET state = #{state},
waiting_at = IFNULL(waiting_at, NOW()),
- expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} MILLISECOND),
+ expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
update_time = NOW()
WHERE task_id = #{taskId}
AND sta_id = #{staId}
@@ -31,7 +31,7 @@
<update id="updateStateBackToWaiting">
UPDATE man_sta_reserve
SET state = #{state},
- expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} MILLISECOND),
+ expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
update_time = NOW()
WHERE task_id = #{taskId}
AND sta_id = #{staId}
--
Gitblit v1.9.1