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-11-23 16:33:53 +08:00
commit 997f1af022
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/BlockConstant.java
View File

@ -14,8 +14,8 @@ public interface BlockConstant {
String XE_133 = "Xe133";
String XE_135 = "Xe135";
String CH_Contant = "CH(x)";
String E_Contant = "E(x)";
String CH_Contant = "CH(x) = ";
String E_Contant = "E(x) = ";
String to_flag = " to ";
String arithmetic_flag = " +/- ";

3
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractAutoLogOrReport.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.spectrum;
import org.jeecg.common.util.NumberFormatUtil;
import org.jeecg.modules.base.abstracts.AbstractLogOrReport;
import org.jeecg.modules.base.enums.FittingEquation;
import org.jeecg.modules.service.BlockConstant;
@ -15,7 +16,7 @@ public abstract class AbstractAutoLogOrReport extends AbstractLogOrReport implem
protected String calibration(Integer fitting_type, List<Double> fitting_e_c){
String b_fittingEquation = this.getFittingEquation(fitting_type);
for(int i=0;i<fitting_e_c.size();i++){
b_fittingEquation = b_fittingEquation.replace("?"+(i+1),formatToStr6(fitting_e_c.get(i)));
b_fittingEquation = b_fittingEquation.replace("?"+(i+1), NumberFormatUtil.numberFormat(String.valueOf(fitting_e_c.get(i))));
}
return b_fittingEquation;
}

8
jeecg-module-beta-gamma-analyser/pom.xml
View File

@ -19,10 +19,10 @@
<dependencies>
<!-- 引入jeecg-boot-starter-cloud依赖 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-cloud</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jeecgframework.boot</groupId>-->
<!-- <artifactId>jeecg-boot-starter-cloud</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.jeecgframework.boot</groupId>