From 658f06778c80893e8618d62357cebf49aea9346e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 12 八月 2024 10:01:24 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index 956940a..a022a2b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -36,10 +36,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
@@ -53,7 +50,6 @@
@Api(tags = "simulat_assess")
public class SimulatAssessController {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
- private static final String taskTypeProgress = "calcprog";
@Autowired
private RedisTemplate redisTemplate;
@@ -128,12 +124,18 @@
}
String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
String xml = null;
+ InputStream in =null;
try {
- InputStream in = new FileInputStream(filePath);
+ in = new FileInputStream(filePath);
xml = IOUtils.toString(in);
- in.close();
} catch (IOException e) {
e.printStackTrace();
+ }finally {
+ try {
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
xmlJSONObj = XML.toJSONObject(xml);
simulatAssess.setShowProductId(simulatAssess.getProductId());
@@ -234,9 +236,12 @@
@GetMapping("getCalcProgress")
public Result getCalcProgress(Long taskId) {
- String key = taskId.toString() + taskTypeProgress;
+ String key = taskId.toString() + simulatAssessService.RELIA_SIM_TASK_TYPE_PROGRESS;
String progress = (String) redisTemplate.opsForValue().get(key);
if (progress == null) progress = "0";
+ if(Objects.equals(progress, "100")){
+ simulatAssessService.deleteSimInfoInRedis(taskId);
+ }
return Result.ok(progress);
}
--
Gitblit v1.9.1