From fd837cb1e5b3f5ebfba12c29f32fe34dd4c38669 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 18:38:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 4 ++--
src/main/java/com/zy/asrs/entity/WrkLastno.java | 8 ++++----
src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java | 4 ++--
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7cc8cee..e3c8f29 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -160,10 +160,10 @@
}
private boolean isInRange(Integer taskNo, WrkLastno taskRange) {
- if (taskRange == null || taskRange.getSNo() == null || taskRange.getENo() == null) {
+ if (taskRange == null || taskRange.getsNo() == null || taskRange.geteNo() == null) {
return false;
}
- return taskNo >= taskRange.getSNo() && taskNo <= taskRange.getENo();
+ return taskNo >= taskRange.getsNo() && taskNo <= taskRange.geteNo();
}
@PostMapping("/latest/data/crn")
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 38a16ee..4d3d219 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -189,19 +189,19 @@
this.appeTime = appeTime;
}
- public Integer getSNo() {
+ public Integer getsNo() {
return sNo;
}
- public void setSNo(Integer sNo) {
+ public void setsNo(Integer sNo) {
this.sNo = sNo;
}
- public Integer getENo() {
+ public Integer geteNo() {
return eNo;
}
- public void setENo(Integer eNo) {
+ public void seteNo(Integer eNo) {
this.eNo = eNo;
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 68468a9..84086d2 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -59,8 +59,8 @@
}
int workNo = wrkLastno.getWrkNo();
- int sNo = wrkLastno.getSNo();
- int eNo = wrkLastno.getENo();
+ int sNo = wrkLastno.getsNo();
+ int eNo = wrkLastno.geteNo();
workNo = workNo>=eNo ? sNo : workNo+1;
while (true) {
WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo);
diff --git a/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java b/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java
index 2379e10..445aedf 100644
--- a/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java
+++ b/src/main/java/com/zy/core/config/FakeTaskNoAreaInitializer.java
@@ -30,8 +30,8 @@
}
HashMap<String, Object> map = new HashMap<>();
- map.put("start", wrkLastno.getSNo());
- map.put("end", wrkLastno.getENo());
+ map.put("start", wrkLastno.getsNo());
+ map.put("end", wrkLastno.geteNo());
redisUtil.set(RedisKeyType.FAKE_TASK_NO_AREA.key, JSON.toJSONString(map));
}
--
Gitblit v1.9.1