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

格式化代码

Browse Source
This commit is contained in:
duwenyuan 2025-07-15 16:49:14 +08:00
parent 84cb8e45a1
commit b73dc2b9e2
3 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateDataRateThread.java
View File

@ -106,19 +106,19 @@ public class CalculateDataRateThread implements Runnable {
//修改使用efficCalculType判断台站类型 //修改使用efficCalculType判断台站类型
String efficCalculType = calculateDataRate.getMEfficCalculType(); String efficCalculType = calculateDataRate.getMEfficCalculType();
//判断台站编码及台站类型 //判断台站编码及台站类型
if ((StringUtils.isNotBlank(stationCode) && stationCode.substring(2, 3).equals("X")) && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SAUNA"))) { if ((StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'X') && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SAUNA"))) {
//切割台站编码 如果 第三个字符是 X 并且 台站类型是 SAUNA //切割台站编码 如果 第三个字符是 X 并且 EFFIC_CALCUL_TYPE类型是 SAUNA
mRate = saunacalc(calculateDataRate); mRate = saunacalc(calculateDataRate);
} else if ((StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'X') && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SAUNA2"))) { } else if ((StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'X') && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SAUNA2"))) {
//切割台站编码 如果 第三个字符是 X 并且 EFFIC_CALCUL_TYPE类型是 SAUNA2 //切割台站编码 如果 第三个字符是 X 并且 EFFIC_CALCUL_TYPE类型是 SAUNA2
mRate = saunacalc2(calculateDataRate); mRate = saunacalc2(calculateDataRate);
} else if ((StringUtils.isNotBlank(stationCode) && stationCode.substring(2, 3).equals("X")) && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SPALAX"))) { } else if ((StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'X') && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SPALAX"))) {
//切割台站编码 如果 第三个字符是 X 并且 台站类型是 SPALAX //切割台站编码 如果 第三个字符是 X 并且 EFFIC_CALCUL_TYPE类型是 SPALAX
mRate = spalaxcalc(calculateDataRate); mRate = spalaxcalc(calculateDataRate);
} else if ((StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'X') && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SPALAX_PLC"))) { } else if ((StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'X') && (StringUtils.isNotBlank(efficCalculType) && efficCalculType.equals("SPALAX_PLC"))) {
//切割台站编码 如果 第三个字符是 X 并且 EFFIC_CALCUL_TYPE类型是 SPALAX-PLC //切割台站编码 如果 第三个字符是 X 并且 EFFIC_CALCUL_TYPE类型是 SPALAX-PLC
mRate = spalaxcalcPLC(calculateDataRate); mRate = spalaxcalcPLC(calculateDataRate);
} else if (StringUtils.isNotBlank(stationCode) && stationCode.substring(2, 3).equals("P")) { } else if (StringUtils.isNotBlank(stationCode) && stationCode.charAt(2) == 'P') {
//切割台站编码 如果 第三个字符是 P //切割台站编码 如果 第三个字符是 P
mRate = particulatecalc(calculateDataRate); mRate = particulatecalc(calculateDataRate);
} }
@ -639,8 +639,7 @@ public class CalculateDataRateThread implements Runnable {
collectHigh = param.getPhdf().getCollectHigh(); collectHigh = param.getPhdf().getCollectHigh();
liveQc = param.getPhdf().getLiveQc(); liveQc = param.getPhdf().getLiveQc();
number = param.getPhdf().getNumber(); number = param.getPhdf().getNumber();
} } else {
else {
liveLow = calculateDataRate.getMParameter().getPhdfSpalaxPLC().getLiveLow(); liveLow = calculateDataRate.getMParameter().getPhdfSpalaxPLC().getLiveLow();
liveHigh = calculateDataRate.getMParameter().getPhdfSpalaxPLC().getLiveHigh(); liveHigh = calculateDataRate.getMParameter().getPhdfSpalaxPLC().getLiveHigh();
quantity = calculateDataRate.getMParameter().getPhdfSpalaxPLC().getQuantity(); quantity = calculateDataRate.getMParameter().getPhdfSpalaxPLC().getQuantity();
@ -676,8 +675,7 @@ public class CalculateDataRateThread implements Runnable {
collectHigh = param.getPhd().getCollectHigh(); collectHigh = param.getPhd().getCollectHigh();
liveQc = param.getPhd().getLiveQc(); liveQc = param.getPhd().getLiveQc();
number = param.getPhd().getNumber(); number = param.getPhd().getNumber();
} } else {
else {
liveLow = calculateDataRate.getMParameter().getPhdSpalaxPLC().getLiveLow(); liveLow = calculateDataRate.getMParameter().getPhdSpalaxPLC().getLiveLow();
liveHigh = calculateDataRate.getMParameter().getPhdSpalaxPLC().getLiveHigh(); liveHigh = calculateDataRate.getMParameter().getPhdSpalaxPLC().getLiveHigh();
quantity = calculateDataRate.getMParameter().getPhdSpalaxPLC().getQuantity(); quantity = calculateDataRate.getMParameter().getPhdSpalaxPLC().getQuantity();

1
jeecg-module-station-operation/src/main/java/org/jeecg/common/CalculateStationData.java
View File

@ -1319,6 +1319,7 @@ public class CalculateStationData {
/** /**
* 多线程获取台站数据的提供率和有效率 * 多线程获取台站数据的提供率和有效率
*
* @param stationInfos 台站信息列表 * @param stationInfos 台站信息列表
*/ */
public void mutiThreadGetStationInfo(List<StationInfo> stationInfos, RateParam mRateParam) { public void mutiThreadGetStationInfo(List<StationInfo> stationInfos, RateParam mRateParam) {