modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
@@ -6,6 +6,7 @@ import com.zt.common.annotation.QueryParam; import com.zt.common.db.query.QueryFilter; import com.zt.common.servlet.Result; import com.zt.common.utils.UUIDUtil; import com.zt.common.validator.AssertUtils; import com.zt.common.validator.ValidatorUtils; import com.zt.common.validator.group.AddGroup; @@ -119,4 +120,11 @@ return Result.ok(); } @GetMapping("getUuid") @ApiOperation("信息") public Result<Long> getUuid() { Long uuid = UUIDUtil.generateId(); return Result.ok(uuid); } } modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -1,12 +1,15 @@ package com.zt.life.modules.mainPart.taskReliability.controller; import cn.hutool.json.JSONObject; import cn.hutool.json.XML; import com.zt.common.annotation.LogOperation; import com.zt.common.constant.Constant; import com.zt.common.annotation.QueryParam; import com.zt.common.db.query.QueryFilter; import com.zt.common.servlet.Result; import com.zt.common.servlet.PageResult; import com.zt.common.utils.JsonUtils; import com.zt.common.validator.AssertUtils; import com.zt.common.validator.ValidatorUtils; import com.zt.common.validator.group.DefaultGroup; @@ -18,12 +21,17 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.io.IOException; import java.io.InputStream; /** @@ -44,6 +52,9 @@ @Autowired private PythonLib pythonLib; @Value("${data.reliaSimLib.resultHome}") private String path; @Autowired private SimulatAssessService simulatAssessService; @@ -89,14 +100,18 @@ return result; } @GetMapping("calculate") public Result calculate(Long taskId, String List, String code, String errorMsg) { SimulatAssess simulatAssess = new SimulatAssess(); simulatAssess.setId(taskId); simulatAssess.setCurveData(List); simulatAssess.setCode(code); simulatAssess.setErrorMsg(errorMsg); simulatAssessService.insert(simulatAssess); @GetMapping("getResultXML") public Result getResultXML(Long taskId) { String filePath = path + "/"+taskId+"/"+"result.xml"; InputStream in = JsonUtils.class.getResourceAsStream(filePath); String xml = null; try { xml = IOUtils.toString(in); } catch (IOException e) { e.printStackTrace(); } JSONObject xmlJSONObj = XML.toJSONObject(xml); return Result.ok(); } web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -68,7 +68,6 @@ id: '', pid: '', productId: '', taskId: '', taskModelId: '', dataType: '', isRepair: '', @@ -84,7 +83,7 @@ watch: { percentage() { if (this.percentage === 100) { this.$refs.SimulatCurve.initEcharts(this.dataForm.taskId,this.dataForm.samplPeriod); this.$refs.SimulatCurve.initEcharts(this.dataForm.id,this.dataForm.taskModelId, this.dataForm.samplPeriod); } } }, @@ -107,7 +106,7 @@ this.dataForm.taskModelId = data.id }, async getProductList() { let res = await this.$http.get('/taskReliability/Task/getTaskProductList') let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList') this.productList = res.data }, async getTaskList() { @@ -122,45 +121,25 @@ //console.log('getStroke:',this.progress.start,"，",this.progress.speed) if (this.percentage < 100) { //console.log('getStroke2') /* this.$http.get(`sys/common/stroke?progressId=${this.progress.id}`).then( this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress?taskId=${this.dataForm.id}`).then( res => { if (res.success) { this.percentage = parseFloat(res.data.percentage) this.percentage = parseFloat(res.data) } } )*/ ) } else { clearInterval(this.timers) } }, async analyze() { this.isShow = true this.timers = window.setInterval(this.getStroke, 1000) /* let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm) let result = await this.$http.get(`/basicInfo/TyProductModel/getUuid`) this.dataForm.id = result.data let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm) if (res.success) { let stopPolling = false if (!stopPolling) { let timer = setInterval(async () => { let res2 = await this.$http.get(`/taskReliability/SimulatAssess/${res.data}`) if (res2.data) { if (res2.data.code === '0' || res2.data.errorMsg === '0') { stopPolling = true // 中止轮询 clearInterval(timer) alert('已获取')*/ //this.$refs.SimulatCurve.initEcharts(); // 清除定时器 /* } else { stopPolling = true // 中止轮询 clearInterval(timer) alert('数据有误，重新输入') this.timers = window.setInterval(this.getStroke, 1000) } } }, 400) } }*/ } } } web/src/views/modules/taskReliability/SimulatCurve.vue
@@ -20,7 +20,7 @@ }, components: {}, methods: { initEcharts(taskId, samplPeriod) { initEcharts(id,taskId, samplPeriod) { this.option = { title: { text: '', @@ -44,10 +44,9 @@ } ] }; this.getEchart(taskId, samplPeriod) this.getEchart(id,taskId, samplPeriod) }, async getEchart(taskId, samplPeriod) { async getEchart(id,taskId, samplPeriod) { let task = await this.$http.get(`/taskReliability/Task/${taskId}`) samplPeriod = samplPeriod / 60 let i = 0 @@ -58,6 +57,8 @@ this.series[0].data.push(task.taskDuration); } let res = await this.$http.get(`/taskReliability/SimulatAssess/${id}`) this.myChart = echarts.init(document.getElementById("mychart"));
