xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/station' into station

Browse Source
This commit is contained in:
nieziyan 2023-10-24 17:14:07 +08:00
commit 27dea46773
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/NameStandUtil.java
View File

@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.HashMap;
import java.util.LinkedList;
@ -86,34 +87,19 @@ public class NameStandUtil {
public String GetSuffix(String dataType, String Fulltype, String LT) {
String rData = "";
BigDecimal bd = new BigDecimal(LT);
DecimalFormat df = new DecimalFormat("#.##########");
//AUX09_003-20151226_1855 _S_FULL_40184.8.PHD
//将acquisition_live_time保留一位小数 如果保留一位小数后小数点后的值是0则四舍五入保留整数，否则按正常条件四舍五入保留小数位
String scale = bd.setScale(1, RoundingMode.HALF_UP).toString();
//将acquisition_live_time保留六位有效数字 如果保留一位小数后小数点后的值是0则四舍五入保留整数，否则按正常条件四舍五入保留小数位
String numberCal = NumberFormatUtil.numberCal(LT);
numberCal = df.format(Double.valueOf(numberCal));
if(dataType.contains(DataType.SAMPLEPHD.getType())) {
if (scale.indexOf(".0") > 0) {
bd = bd.setScale(0, RoundingMode.HALF_UP);
} else {
bd = bd.setScale(1, RoundingMode.HALF_UP);
}
rData = "_S_"+Fulltype+"_"+bd+".PHD";
rData = "_S_"+Fulltype+"_"+numberCal+".PHD";
} else if(dataType.contains(DataType.GASBKPHD.getType())){
if (scale.indexOf(".0") > 0) {
bd = bd.setScale(0, RoundingMode.HALF_UP);
} else {
bd = bd.setScale(1, RoundingMode.HALF_UP);
}
rData = "_G_"+Fulltype+"_"+bd+".PHD";
rData = "_G_"+Fulltype+"_"+numberCal+".PHD";
}else if(dataType.contains(DataType.DETBKPHD.getType())){
bd = bd.setScale(0, RoundingMode.HALF_UP);
rData = "_D_"+Fulltype+"_"+bd+".PHD";
rData = "_D_"+Fulltype+"_"+numberCal+".PHD";
}else if(dataType.contains(DataType.QCPHD.getType())){
if (scale.indexOf(".0") > 0) {
bd = bd.setScale(0, RoundingMode.HALF_UP);
} else {
bd = bd.setScale(2, RoundingMode.HALF_UP);
}
rData = "_Q_"+Fulltype+"_"+bd+".PHD";
rData = "_Q_"+Fulltype+"_"+numberCal+".PHD";
}
return rData;
}

6
jeecg-module-web-statistics/src/main/java/org/jeecg/common/util/ReadLineUtil.java
View File

@ -44,6 +44,7 @@ public class ReadLineUtil {
throw new RuntimeException("ftp连接失败!");
}
InputStream iStream = null;
File file = null;
try {
ftpClient.enterLocalPassiveMode();
String fileName = filePath.substring(filePath.lastIndexOf(StringPool.SLASH) + 1);
@ -63,7 +64,7 @@ public class ReadLineUtil {
//读取ftp文件的输入流
iStream=ftpClient.retrieveFileStream(ftpFile.getName());
//声明一个临时文件
File file = File.createTempFile("betaGamma", null);
file = File.createTempFile("betaGamma", null);
//将ftp文件的输入流复制给临时文件
FileUtils.copyInputStreamToFile(iStream, file);
List<String> allLines = FileUtils.readLines(file, encoding);
@ -93,6 +94,9 @@ public class ReadLineUtil {
if (Objects.nonNull(iStream)){
iStream.close();
}
if (Objects.nonNull(file)) {
file.delete();
}
} catch (IOException e) {
throw new RuntimeException(e);
}