|
@@ -6,6 +6,7 @@ import api.common.pojo.param.scene.SceneEvaluationComputeSubParam;
|
|
import api.common.pojo.po.scene.SceneComplexityPO;
|
|
import api.common.pojo.po.scene.SceneComplexityPO;
|
|
import api.common.pojo.po.scene.SceneEvaluationRulePO;
|
|
import api.common.pojo.po.scene.SceneEvaluationRulePO;
|
|
import api.common.pojo.po.scene.SceneRiskPO;
|
|
import api.common.pojo.po.scene.SceneRiskPO;
|
|
|
|
+import api.common.util.CollectionUtil;
|
|
import api.common.util.FileUtil;
|
|
import api.common.util.FileUtil;
|
|
import api.common.util.StringUtil;
|
|
import api.common.util.StringUtil;
|
|
import api.common.util.TimeUtil;
|
|
import api.common.util.TimeUtil;
|
|
@@ -19,6 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode;
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import io.minio.MinioClient;
|
|
import io.minio.MinioClient;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
|
|
|
import java.io.*;
|
|
import java.io.*;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Files;
|
|
@@ -26,7 +28,9 @@ import java.nio.file.Path;
|
|
import java.nio.file.Paths;
|
|
import java.nio.file.Paths;
|
|
import java.nio.file.attribute.PosixFilePermission;
|
|
import java.nio.file.attribute.PosixFilePermission;
|
|
import java.text.DecimalFormat;
|
|
import java.text.DecimalFormat;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.HashSet;
|
|
import java.util.HashSet;
|
|
|
|
+import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
|
|
|
|
import static api.common.pojo.enums.SceneEvaluationEnum.matchLevelEnumByLevel;
|
|
import static api.common.pojo.enums.SceneEvaluationEnum.matchLevelEnumByLevel;
|
|
@@ -225,6 +229,9 @@ public class SceneEvaluationComputeRunnable implements Runnable {
|
|
sceneComplexityPO.setCreateUserId(sceneEvaluationComputeParam.getCreateUserId());
|
|
sceneComplexityPO.setCreateUserId(sceneEvaluationComputeParam.getCreateUserId());
|
|
sceneComplexityPO.setCreateTime(TimeUtil.getNowForMysql());
|
|
sceneComplexityPO.setCreateTime(TimeUtil.getNowForMysql());
|
|
sceneComplexityMapper.saveSceneComplexity(sceneComplexityPO);
|
|
sceneComplexityMapper.saveSceneComplexity(sceneComplexityPO);
|
|
|
|
+ if (CollectionUtil.isNotEmpty(sceneEvaluationComputeSubParam.getCopySceneId())) {
|
|
|
|
+ copySceneComplexityResult(sceneComplexityPO.getTaskId(), sceneEvaluationComputeSubParam.getSceneId(), sceneEvaluationComputeSubParam.getCopySceneId());
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
String risk = rootNode.path("危险度").asText();
|
|
String risk = rootNode.path("危险度").asText();
|
|
String riskLevel = rootNode.path("危险度等级").asText();
|
|
String riskLevel = rootNode.path("危险度等级").asText();
|
|
@@ -251,5 +258,26 @@ public class SceneEvaluationComputeRunnable implements Runnable {
|
|
}
|
|
}
|
|
// 删除临时文件
|
|
// 删除临时文件
|
|
// FileUtil.deleteFolder(sceneEvaluationComputeParam.getLinuxTempPath() + "scene/evaluation/" + sceneEvaluationComputeParam.getTaskId()); // 删除临时文件
|
|
// FileUtil.deleteFolder(sceneEvaluationComputeParam.getLinuxTempPath() + "scene/evaluation/" + sceneEvaluationComputeParam.getTaskId()); // 删除临时文件
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void copySceneComplexityResult(String taskId, String tempSceneId, List<String> copySceneIds) {
|
|
|
|
+ SceneComplexityMapper sceneComplexityMapper = ApplicationContextAwareImpl.getApplicationContext().getBean(SceneComplexityMapper.class);
|
|
|
|
+ List<SceneComplexityPO> sceneComplexityPOS = sceneComplexityMapper.selectSceneComplexityEvaluation(taskId, tempSceneId);
|
|
|
|
+ List<SceneComplexityPO> saveList = new ArrayList<>();
|
|
|
|
+ if (CollectionUtil.isNotEmpty(sceneComplexityPOS)) {
|
|
|
|
+ for (SceneComplexityPO sceneComplexityPO : sceneComplexityPOS) {
|
|
|
|
+ for (String copySceneId : copySceneIds) {
|
|
|
|
+ SceneComplexityPO tempComplexityPO = new SceneComplexityPO();
|
|
|
|
+ BeanUtils.copyProperties(sceneComplexityPO, tempComplexityPO);
|
|
|
|
+ tempComplexityPO.setSceneId(copySceneId);
|
|
|
|
+ tempComplexityPO.setComplexityId(StringUtil.getRandomUUID());
|
|
|
|
+ saveList.add(tempComplexityPO);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (CollectionUtil.isNotEmpty(saveList)) {
|
|
|
|
+ sceneComplexityMapper.saveSceneComplexityS(saveList);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|