From 9d53846856cdd55622b04f88863bc24b77308ac6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 02 十一月 2022 09:17:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WrkChargeService.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java | 9 +++++----
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WrkChargeService.java b/src/main/java/com/zy/asrs/service/WrkChargeService.java
index ecad01e..8efa9ed 100644
--- a/src/main/java/com/zy/asrs/service/WrkChargeService.java
+++ b/src/main/java/com/zy/asrs/service/WrkChargeService.java
@@ -2,9 +2,10 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkCharge;
+import com.zy.common.model.enums.WrkChargeType;
public interface WrkChargeService extends IService<WrkCharge> {
- WrkCharge selectWorking(Integer steNo, String memo);
+ WrkCharge selectWorking(Integer steNo, WrkChargeType type);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 0d9041e..172d9b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2484,7 +2484,7 @@
*/
@SuppressWarnings("serial")
public synchronized void loopSteCharge() {
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset.toString())) {
+ if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
return;
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -2509,7 +2509,7 @@
if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
continue;
}
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge.toString());
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge);
if (wrkCharge == null && steProtocol.getChargeStatus() == 0) {
// 瀵绘壘绌洪棽鍏呯數妗�
@@ -2720,7 +2720,7 @@
*/
public synchronized void queryChargeLocOfComplete() {
// 涓庡厖鐢典换鍔′笉鍚屾杩涜
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge.toString())) { return; }
+ if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
// 妫�绱㈠厖鐢垫々
for (SteChargeType value : SteChargeType.values()) {
@@ -2757,7 +2757,7 @@
continue;
}
- WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset.toString());
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);
if (wrkCharge == null) {
// 寮�濮嬬┛姊溅澶嶄綅浠诲姟
@@ -2783,7 +2783,7 @@
* 灏忚溅浠庡厖鐢垫々 鑷� 寰呮満搴撲綅
*/
public synchronized void steFromChargeToIdleLoc() {
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset.toString());
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
if (wrkCharge == null) { return; }
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
SteProtocol steProtocol = steThread.getSteProtocol();
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
index 5ce66bd..fd56583 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java
@@ -4,17 +4,18 @@
import com.zy.asrs.entity.WrkCharge;
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.service.WrkChargeService;
+import com.zy.common.model.enums.WrkChargeType;
import org.springframework.stereotype.Service;
@Service("wrkChargeService")
public class WrkChargeServiceImpl extends ServiceImpl<WrkChargeMapper, WrkCharge> implements WrkChargeService {
@Override
- public WrkCharge selectWorking(Integer steNo, String memo) {
- switch (memo) {
- case "charge":
+ public WrkCharge selectWorking(Integer steNo, WrkChargeType type) {
+ switch (type) {
+ case charge:
return this.baseMapper.selectWorkingOfCharge(steNo);
- case "reset":
+ case reset:
return this.baseMapper.selectWorkingOfReset(steNo);
}
return null;
--
Gitblit v1.9.1