From b46f7fa6d77852ae9e28a062da234a2ddf9405fb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 31 三月 2025 16:09:51 +0800
Subject: [PATCH] 2025-3-22定制修改导出去掉容量和连接条
---
src/main/java/com/whyc/util/MathUtil.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/util/MathUtil.java b/src/main/java/com/whyc/util/MathUtil.java
index e264d88..11e82c0 100644
--- a/src/main/java/com/whyc/util/MathUtil.java
+++ b/src/main/java/com/whyc/util/MathUtil.java
@@ -1,11 +1,14 @@
package com.whyc.util;
+import com.whyc.config.I18nLocaleResolver;
import com.whyc.pojo.TestParam;
+import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import java.util.stream.Collectors;
public class MathUtil {
@@ -45,16 +48,64 @@
return flag;
}
//璇勫垽鏁寸粍鐨勫ソ鍧廸lag:1 鐢靛帇锛� 鍐呴樆瓒婂ぇ瓒婁笉濂�
- public static String getJudge(int flag){
- String judge="鏈煡";
+ public static String getJudge(boolean zhFlag,int flag){
+ String judge="";
+ if(zhFlag) {
+ judge="鏈煡";
+ }else{
+ judge="unknown";
+ }
switch (flag){
- case 1:judge="宸�";break;
+ /*case 1:judge="宸�";break;
case 2:judge="鑹�";break;
- case 3:judge="浼�";break;
+ case 3:judge="浼�";break;*/
+ case 1:
+ if(zhFlag) {
+ judge="宸�";
+ }else{
+ judge="bad";
+ }
+ break;
+ case 2:
+ if(zhFlag) {
+ judge="鑹�";
+ }else{
+ judge="good";
+ }
+ break;
+ case 3:
+ if(zhFlag) {
+ judge="浼�";
+ }else{
+ judge="excellent";
+ }
+ break;
}
return judge;
}
+ /*
+ (瀹归噺鐧惧垎姣旈浼拌绠楁柟寮忥級
+ A銆佺郴缁熻鍙栨祴璇曟枃浠跺唴鍙傝�冨�糝锛堟鏃跺苟娌℃湁鍒嗕粬鏄钩鍧囧�兼垨鍙傝�冨�硷紝鍙傝�冨�煎彲鏈夊湪鏂囦欢鎵撳紑鏃舵墜鍔ㄦ洿鏀癸級锛�
+ a銆佹祴璇曞�糝鈮ゅ弬鑰冨�糝鏃讹紝瀹归噺棰勪及鍊�=100%
+ b銆佹祴璇曞�糝鈮ュ弬鑰冨��2R鏃讹紝瀹归噺棰勪及鍊肩洿鎺ユ樉绀�1%
+ c銆佸弬鑰冨�糝锛滄祴璇曞�糝锛滃弬鑰冨��2R鏃讹紝瀹归噺棰勪及鍊�={100%~1%锛堟瘮鍊�=(1-锛圧娴�-R鍙傦級/R鍙�)*100%鈥濓級}
+ **/
+ public static float getPreCapTest(float testRes,float refRes){
+ float preCap=0f;
+ if(testRes<=refRes){
+ preCap=1;
+ }
+ if(testRes>=(2*refRes)){
+ preCap= (float) 0.01;
+ }
+ if((testRes>refRes)&&(testRes<(2*refRes))){
+ float radio=(1-(testRes-refRes)/refRes);
+ preCap= (float) (1-0.01*radio);
+ }
+ return preCap;
+ }
+
public static void main(String[] args) {
Float[] f = {3.54f,3.55f,3.55f,3.56f,3.57f,3.56f,3.58f,3.58f,3.56f};
Float[] f2 = {3.53f,3.55f,3.56f,3.57f,3.59f,3.58f,3.6f,3.6f,3.61f};
--
Gitblit v1.9.1