From c1f8b80068acb234ad01873ee7756a1cc29ee0be Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 16 一月 2024 08:25:30 +0800
Subject: [PATCH] 修改
---
src/main/java/com/whyc/service/FileParamService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/FileParamService.java b/src/main/java/com/whyc/service/FileParamService.java
index ebf8d4f..5400af6 100644
--- a/src/main/java/com/whyc/service/FileParamService.java
+++ b/src/main/java/com/whyc/service/FileParamService.java
@@ -6,6 +6,7 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.config.I18nLocaleResolver;
import com.whyc.dto.*;
import com.whyc.mapper.*;
import com.whyc.pojo.*;
@@ -39,6 +40,9 @@
@Autowired(required = false)
private BattgroupInfoMapper groupInfoMapper;
+
+ @Autowired
+ private I18nLocaleResolver i18nLocaleResolver;
//瑙ｆ瀽xml鏂囦欢(浼犲弬涓�涓枃浠�)
public Response getXmlValue(String filePath) {
@@ -157,6 +161,8 @@
}
//鎸夌収绛涢�夋潯浠舵煡璇㈡暟鎹簱淇℃伅(鍐呴樆璇勪环锛氬唴闃昏秺澶ц秺宸�)锛岀劧鍚庡啀鏍规嵁鍐呴樆鎵嬪姩鍒嗛〉
public Response getDataByCondition(Date testTime1, Date testTime2, String battVol,int pageCurr,int pageSize,int flag) {
+ Locale local = i18nLocaleResolver.getLocal();
+ boolean zhFlag = local.getLanguage().toLowerCase().equals("zh");
//PageHelper.startPage(pageCurr,pageSize);
List<FileParam> list=mapper.getDataByCondition(testTime1,testTime2,Float.valueOf(battVol));
List flagList=new ArrayList();//瀛樻斁璇勪环缁撴灉
@@ -192,7 +198,7 @@
binfo.setSdBasebs(MathUtil.getStandardDeviation(listBs));
binfo.setSdBasecr(MathUtil.getStandardDeviation(listCr));
resFlag=MathUtil.getflag(maxStd,std,testParam);
- binfo.setBrJudge(MathUtil.getJudge(resFlag));
+ binfo.setBrJudge(MathUtil.getJudge(zhFlag,resFlag));
}
break;
}
--
Gitblit v1.9.1