From e767c2aaa289de32d89005ed8fda4d1abcd03303 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 21 五月 2021 17:08:01 +0800
Subject: [PATCH] 试验接口:修正阈值判断,增加Integer和Float类型判断
---
src/main/java/com/whyc/service/ExperimentService.java | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExperimentService.java b/src/main/java/com/whyc/service/ExperimentService.java
index 79dcde8..9367a78 100644
--- a/src/main/java/com/whyc/service/ExperimentService.java
+++ b/src/main/java/com/whyc/service/ExperimentService.java
@@ -146,17 +146,31 @@
Object preconditionActualValue = commonMapper.getPreconditionStatus(precondition);
/*String preconditionActualValueStr = preconditionActualValue.toString();
if(precondition.getValue().equals(preconditionActualValueStr)){*/
- //閲囩敤娴偣杩涜鏁板�煎姣�
- Float actualValue = (Float) preconditionActualValue;
- Float defaultValue = Float.parseFloat(precondition.getValue());
+ //閲囩敤娴偣/鏁村瀷杩涜鏁板�煎姣�
+ if(preconditionActualValue instanceof Integer) {
+ Integer actualValue = (Integer) preconditionActualValue;
+ Integer defaultValue = Integer.parseInt(precondition.getValue());
- if (defaultValue.equals(actualValue)) {
- precondition.setStatus(1);
- }else{
- precondition.setStatus(0);
- code.set(-1);
+ if (defaultValue.equals(actualValue)) {
+ precondition.setStatus(1);
+ } else {
+ precondition.setStatus(0);
+ code.set(-1);
+ }
+ precondition.setActualValue(actualValue.toString());
}
- precondition.setActualValue(actualValue.toString());
+ else if(preconditionActualValue instanceof Float) {
+ Float actualValue = (Float) preconditionActualValue;
+ Float defaultValue = Float.parseFloat(precondition.getValue());
+
+ if (defaultValue.equals(actualValue)) {
+ precondition.setStatus(1);
+ } else {
+ precondition.setStatus(0);
+ code.set(-1);
+ }
+ precondition.setActualValue(actualValue.toString());
+ }
});
return new Response().set(code.get(),preconditions);
}
@@ -178,15 +192,29 @@
preconditions.stream().forEach(precondition -> {
//鑾峰彇瀵瑰簲鐨勫��
Object preconditionActualValue = commonMapper.getPreconditionStatus(precondition);
- //閲囩敤娴偣杩涜鏁板�煎姣�
- Float actualValue = (Float) preconditionActualValue;
- Float defaultValue = Float.parseFloat(precondition.getValue());
+ //閲囩敤娴偣/鏁村瀷杩涜鏁板�煎姣�
+ if(preconditionActualValue instanceof Float) {
+ Float actualValue = (Float) preconditionActualValue;
+ Float defaultValue = Float.parseFloat(precondition.getValue());
- if (defaultValue.equals(actualValue)) {
- //鏉′欢杈炬垚,杈炬垚鏁颁笂+1
- passNum.set(passNum.get()+1);
- //璁板綍褰撳墠鍊�
- precondition.setActualValue(actualValue.toString());
+ if (defaultValue.equals(actualValue)) {
+ //鏉′欢杈炬垚,杈炬垚鏁颁笂+1
+ passNum.set(passNum.get() + 1);
+ //璁板綍褰撳墠鍊�
+ precondition.setActualValue(actualValue.toString());
+ }
+ }
+ //閲囩敤娴偣/鏁村瀷杩涜鏁板�煎姣�
+ if(preconditionActualValue instanceof Integer) {
+ Integer actualValue = (Integer) preconditionActualValue;
+ Integer defaultValue = Integer.parseInt(precondition.getValue());
+
+ if (defaultValue.equals(actualValue)) {
+ //鏉′欢杈炬垚,杈炬垚鏁颁笂+1
+ passNum.set(passNum.get() + 1);
+ //璁板綍褰撳墠鍊�
+ precondition.setActualValue(actualValue.toString());
+ }
}
});
}
--
Gitblit v1.9.1