physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

review

Browse Source
This commit is contained in:
ls
2025-07-23 23:00:15 +08:00
parent 66567781d5
commit b6378d9724
5 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java
View File

@@ -63,12 +63,14 @@ public class ESCC225001Executor extends BaseExecutor implements IExperimentRevie
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) { for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
String deviationCondition = experimentAnnealProcess.getDeviationCondition(); String deviationCondition = experimentAnnealProcess.getDeviationCondition();
JSONObject jsonObject = JSON.parseObject(deviationCondition); List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
if (jsonObject.containsKey("offsetCondition")) { for (JSONObject s : jsonArray) {
String offsetCondition = jsonObject.getString("offsetCondition"); if (s.containsKey("offsetCondition")) {
if (StringUtils.contains(offsetCondition, "dtpz") || StringUtils.contains(offsetCondition, "jtpz")) { String offsetCondition = s.getString("offsetCondition");
condition2 = true; if (StringUtils.contains(offsetCondition, "dtpz") || StringUtils.contains(offsetCondition, "jtpz")) {
break; condition2 = true;
break;
}
} }
} }
} }

18
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java
View File

@@ -4,8 +4,7 @@
*/ */
package org.jeecg.modules.database.service.executor; package org.jeecg.modules.database.service.executor;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.*;
import com.alibaba.fastjson2.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.database.constant.ExperimentReviewProcessType; import org.jeecg.modules.database.constant.ExperimentReviewProcessType;
import org.jeecg.modules.database.constant.ExperimentReviewResultEnum; import org.jeecg.modules.database.constant.ExperimentReviewResultEnum;
@@ -57,14 +56,17 @@ public class ESCC2290006Executor extends BaseExecutor implements IExperimentRevi
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) { for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
String deviationCondition = experimentAnnealProcess.getDeviationCondition(); String deviationCondition = experimentAnnealProcess.getDeviationCondition();
JSONObject jsonObject = JSON.parseObject(deviationCondition); List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
if (jsonObject.containsKey("offsetCondition")) { for (JSONObject s : jsonArray) {
String offsetCondition = jsonObject.getString("offsetCondition"); if (s.containsKey("offsetCondition")) {
if (StringUtils.contains(offsetCondition, "dtpz")) { String offsetCondition = s.getString("offsetCondition");
condition1 = true; if (StringUtils.contains(offsetCondition, "dtpz")) {
break; condition1 = true;
break;
}
} }
} }
} }
if (condition1) { if (condition1) {
return ExperimentReviewResultEnum.HIGH; return ExperimentReviewResultEnum.HIGH;

14
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java
View File

@@ -57,12 +57,14 @@ public class GJB548C10Executor extends BaseExecutor implements IExperimentReview
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) { for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
String deviationCondition = experimentAnnealProcess.getDeviationCondition(); String deviationCondition = experimentAnnealProcess.getDeviationCondition();
JSONObject jsonObject = JSON.parseObject(deviationCondition); List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
if (jsonObject.containsKey("offsetCondition")) { for (JSONObject s : jsonArray) {
String offsetCondition = jsonObject.getString("offsetCondition"); if (s.containsKey("offsetCondition")) {
if (StringUtils.contains(offsetCondition, "dtpz")) { String offsetCondition = s.getString("offsetCondition");
condition1 = true; if (StringUtils.contains(offsetCondition, "dtpz")) {
break; condition1 = true;
break;
}
} }
} }
} }

14
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java
View File

@@ -57,12 +57,14 @@ public class QJ1000410Executor extends BaseExecutor implements IExperimentReview
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) { for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
String deviationCondition = experimentAnnealProcess.getDeviationCondition(); String deviationCondition = experimentAnnealProcess.getDeviationCondition();
JSONObject jsonObject = JSON.parseObject(deviationCondition); List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
if (jsonObject.containsKey("offsetCondition")) { for (JSONObject s : jsonArray) {
String offsetCondition = jsonObject.getString("offsetCondition"); if (s.containsKey("offsetCondition")) {
if (StringUtils.contains(offsetCondition, "dtpz")) { String offsetCondition = s.getString("offsetCondition");
condition1 = true; if (StringUtils.contains(offsetCondition, "dtpz")) {
break; condition1 = true;
break;
}
} }
} }
} }

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
View File

@@ -48,6 +48,9 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
result.setProcessType(processType); result.setProcessType(processType);
result.setSampleId(sampleInfo.getId()); result.setSampleId(sampleInfo.getId());
result.setSampleName(sampleInfo.getSampleName()); result.setSampleName(sampleInfo.getSampleName());
result.setNeedAnneal(experimentReview.getNeedAnneal());
result.setNeedBurnin(experimentReview.getNeedBurnin());
result.setNeedRadiation(experimentReview.getNeedRadiation());
for (int i = 0; i < ruleList.size(); i++) { for (int i = 0; i < ruleList.size(); i++) {
ExperimentReviewRule rule = ruleList.get(i); ExperimentReviewRule rule = ruleList.get(i);
String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo, String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,