From 481b82866b1714f79dc35ecf2bc26436b027954e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 30 七月 2024 16:08:51 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/SimulatHistory.vue | 23 +-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessTaskPhaseModelService.java | 40 +++
web/src/views/modules/taskReliability/TimeDiagram.vue | 18 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskBinoParam.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessTaskPhaseModelController.java | 96 ++++++++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java | 6
modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml | 8
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ProductStatusDto.java | 19 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 21 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessTaskPhaseModelDao.java | 23 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java | 4
/dev/null | 122 -----------
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java | 63 +++++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 7
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/StatusDto.java | 9
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 103 +++++++--
modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml | 1
web/src/views/modules/taskReliability/TaskBinoParam.vue | 4
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml | 34 ++
web/src/views/modules/taskReliability/SimulatAssess.vue | 13
modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessTaskPhaseModelDao.xml | 20 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java | 3
23 files changed, 450 insertions(+), 190 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
index 6aa2421..9450d86 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java
@@ -76,6 +76,12 @@
} else if (ztShow == 3) {
productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
+ }else if (ztShow == 4) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
+ }else if (ztShow == 5) {
+ productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
+ Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
}
}
@@ -169,7 +175,6 @@
for (int j = 1; j <= num; j++) {
CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
CacheUtils.put(progressId, "msg", "鍏�" + num + "琛岋紝宸插畬鎴愮" + j + "琛�");
- DictTypeDto lifeManagement = new DictTypeDto();
boolean isToggleXt = false;
boolean isToggleFxt = false;
row1 = j + 1;
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 29625c9..0932a48 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
@@ -4,26 +4,23 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.XML;
+import com.fasterxml.jackson.databind.ObjectMapper;
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.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.async.PythonLib;
import com.zt.life.modules.mainPart.taskReliability.dto.SimulaDataDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
+import com.zt.life.modules.mainPart.taskReliability.dto.StatusDto;
import com.zt.life.modules.mainPart.taskReliability.model.CurveParam;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import com.zt.life.modules.mainPart.taskReliability.model.Task;
import com.zt.life.modules.mainPart.taskReliability.service.SimulatAssessService;
import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import io.swagger.annotations.Api;
-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;
@@ -32,13 +29,15 @@
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.File;
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;
/**
@@ -53,6 +52,7 @@
public class SimulatAssessController {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
private static final String taskTypeProgress = "calcprog";
+ private List<Map<String, Double>> dialgram = new ArrayList<>();
@Autowired
private RedisTemplate redisTemplate;
@@ -70,6 +70,8 @@
private SimulatAssessService simulatAssessService;
private JSONObject xmlJSONObj;
+
+ private JSONObject dialgramJson;
/* @GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -94,16 +96,16 @@
@GetMapping("getSimulatList")
@ApiOperation("淇℃伅")
- public Result<List<SimulatAssess>> getSimulatList(Long productId,Long taskModelId) {
- List<SimulatAssess> data = simulatAssessService.getList(productId,taskModelId);
+ public Result<List<SimulatAssess>> getSimulatList(Long productId, Long taskModelId) {
+ List<SimulatAssess> data = simulatAssessService.getList(productId, taskModelId);
return Result.ok(data);
}
@GetMapping("getSimulatParams")
@ApiOperation("淇℃伅")
- public Result<List<SimulatAssess>> getSimulatParams(Long id,Long taskModelId) {
- List<SimulatAssess> data = simulatAssessService.getParams(id,taskModelId);
+ public Result<SimulatAssess> getSimulatParams(Long id, Long taskModelId) {
+ SimulatAssess data = simulatAssessService.getParams(id, taskModelId);
return Result.ok(data);
}
@@ -111,18 +113,6 @@
@PostMapping("analyze")
public Result<Long> analyze(@RequestBody SimulatAssess simulatAssess) {
//鏁堥獙鏁版嵁
-/*
- ValidatorUtils.validateEntity(simulatAssess, AddGroup.class, DefaultGroup.class);
- Long taskId = UUIDUtil.generateId();
- Integer time = simulatAssess.getSamplPeriod();
- Integer Frequency = simulatAssess.getSimulatFrequency();
- HashMap<String, Object> paramMap = new HashMap<>();
- paramMap.put("taskId", taskId);
- paramMap.put("time", time);
- paramMap.put("Frequency", Frequency);
- paramMap.put("url", "http://localhost:8050/test-project//taskReliability/SimulatAssess/calculate");
- String result1 = HttpUtil.get("http://localhost:8080/system/user/get", paramMap);
-*/
Result result = pythonLib.callPython(simulatAssess);
return result;
@@ -130,9 +120,9 @@
@PostMapping("getResultXML")
public Result<SimulaDataDto> getResultXML(@RequestBody SimulatAssess simulatAssess) {
- if (simulatAssess.getDataType().equals("fz")){
- Integer num = simulatAssessService.getNumById(simulatAssess.getProductId(),simulatAssess.getTaskModelId());
- simulatAssess.setName("浠跨湡璁板綍" + (num+1));
+ if (simulatAssess.getDataType().equals("fz")) {
+ Integer num = simulatAssessService.getNumById(simulatAssess.getProductId(), simulatAssess.getTaskModelId());
+ simulatAssess.setName("浠跨湡璁板綍" + (num + 1));
simulatAssessService.insert(simulatAssess);
}
String filePath = path + "/" + simulatAssess.getId() + "/" + "result.xml";
@@ -199,6 +189,65 @@
return data;
}
+ @GetMapping("getStatus")
+ public Result<List<ProductStatusDto>> getStatus(Long productId, Long taskId, Long fzId) {
+ String filePath = path + "/" + fzId + "/" + "status.json";
+ ObjectMapper mapper = new ObjectMapper();
+ String jsonStr = null;
+ try {
+ // 浣跨敤 ObjectMapper 鐨� readValue 鏂规硶锛屽皢鏂囦欢涓殑 JSON 鏁版嵁杞崲涓轰竴涓� Java 瀵硅薄
+ // 杩欓噷浣跨敤 Object 绫讳綔涓烘硾鍨嬪弬鏁帮紝琛ㄧず浠绘剰绫诲瀷鐨勫璞�
+ Object obj = mapper.readValue(new File(filePath), Object.class);
+ // 浣跨敤 ObjectMapper 鐨� writeValueAsString 鏂规硶锛屽皢 Java 瀵硅薄杞崲涓� JSON 瀛楃涓�
+ jsonStr = mapper.writeValueAsString(obj);
+
+ } catch (IOException e) {
+ // 澶勭悊寮傚父
+ e.printStackTrace();
+ }
+ dialgramJson = new JSONObject(jsonStr);
+ List<ProductStatusDto> childList = this.getStatusData(productId, taskId);
+ return Result.ok(childList);
+
+ }
+
+ public List<ProductStatusDto> getStatusData(Long productId, Long taskId) {
+ List<ProductStatusDto> childList = simulatAssessService.getChildren(productId, taskId);
+ for (ProductStatusDto item : childList) {
+ if (dialgram.size() > 0) {
+ dialgram.clear();
+ }
+ JSONArray jsonArray = dialgramJson.getJSONArray(String.valueOf(item.getId()));
+ if (jsonArray != null) {
+ this.processJSONArray(jsonArray, item);
+ }
+ }
+ return childList;
+ }
+
+ public void processJSONArray(JSONArray jsonArray, ProductStatusDto productStatusDto) {
+ String status = null;
+ Double times = null;
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object item = jsonArray.get(i);
+ if (item instanceof JSONArray) {
+ processJSONArray((JSONArray) item, productStatusDto); // 閫掑綊璋冪敤
+ } else {
+ if (item instanceof Double) {
+ times = (Double) item;
+ } else {
+ status = String.valueOf(item);
+ }
+ }
+ }
+ if (status != null || times != null) {
+ StatusDto statusDto =new StatusDto();
+ statusDto.setTimes(times);
+ statusDto.setStatus(status);
+ productStatusDto.getStatusList().add(statusDto);
+ }
+ }
+
@GetMapping("getCalcProgress")
public Result getCalcProgress(Long taskId) {
String key = taskId.toString() + taskTypeProgress;
@@ -229,4 +278,6 @@
return Result.ok();
}
+
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessTaskPhaseModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessTaskPhaseModelController.java
new file mode 100644
index 0000000..fa7b544
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessTaskPhaseModelController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.mainPart.taskReliability.controller;
+
+
+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.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+import com.zt.common.validator.group.AddGroup;
+import com.zt.common.validator.group.DefaultGroup;
+import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
+import com.zt.life.modules.mainPart.taskReliability.service.SimulatAssessTaskPhaseModelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * simulat_assess_task_phase_model
+ *
+ * @author zt generator
+ * @since 1.0.0 2024-07-30
+ */
+@RestController
+@RequestMapping("/taskReliability/SimulatAssessTaskPhaseModel/")
+@Api(tags="simulat_assess_task_phase_model")
+public class SimulatAssessTaskPhaseModelController {
+ @Autowired
+ private SimulatAssessTaskPhaseModelService simulatAssessTaskPhaseModelService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ })
+ public PageResult<SimulatAssessTaskPhaseModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(simulatAssessTaskPhaseModelService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<SimulatAssessTaskPhaseModel> get(@PathVariable("id") Long id){
+ SimulatAssessTaskPhaseModel data = simulatAssessTaskPhaseModelService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody SimulatAssessTaskPhaseModel simulatAssessTaskPhaseModel){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(simulatAssessTaskPhaseModel, AddGroup.class, DefaultGroup.class);
+ simulatAssessTaskPhaseModelService.insert(simulatAssessTaskPhaseModel);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody SimulatAssessTaskPhaseModel simulatAssessTaskPhaseModel){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(simulatAssessTaskPhaseModel, UpdateGroup.class, DefaultGroup.class);
+ simulatAssessTaskPhaseModelService.update(simulatAssessTaskPhaseModel);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ simulatAssessTaskPhaseModelService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
index 69b88ab..8907236 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessDao.java
@@ -1,12 +1,12 @@
package com.zt.life.modules.mainPart.taskReliability.dao;
import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
-import java.util.Map;
/**
@@ -23,5 +23,7 @@
Integer getNumById(Long productId, Long taskModelId);
- List<SimulatAssess> getParams(Long id, Long taskModelId);
+ SimulatAssess getParams(Long id, Long taskModelId);
+
+ List<ProductStatusDto> getChildren(Long productId, Long taskId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessTaskPhaseModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessTaskPhaseModelDao.java
new file mode 100644
index 0000000..c770dbe
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/SimulatAssessTaskPhaseModelDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.mainPart.taskReliability.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * simulat_assess_task_phase_model
+ *
+ * @author zt generator
+ * @since 1.0.0 2024-07-30
+ */
+@Mapper
+public interface SimulatAssessTaskPhaseModelDao extends BaseDao<SimulatAssessTaskPhaseModel> {
+
+ List<SimulatAssessTaskPhaseModel> getList(Map<String, Object> params);
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
index 7872049..1ae594b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
@@ -21,4 +21,6 @@
List<TaskPhase> getList(Map<String, Object> params);
Integer getMaxSort(Long taskId);
+
+ List<Long> getPhaseByTask(Long taskId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ProductStatusDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ProductStatusDto.java
new file mode 100644
index 0000000..5794f5b
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/ProductStatusDto.java
@@ -0,0 +1,19 @@
+package com.zt.life.modules.mainPart.taskReliability.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zt.life.modules.mainPart.taskReliability.model.CurveParam;
+import com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ProductStatusDto {
+ private Long id ;
+ private String name ;
+ private Integer sort ;
+ private List<StatusDto> statusList = new ArrayList<>();
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/StatusDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/StatusDto.java
new file mode 100644
index 0000000..6f43c4c
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/StatusDto.java
@@ -0,0 +1,9 @@
+package com.zt.life.modules.mainPart.taskReliability.dto;
+
+import lombok.Data;
+
+@Data
+public class StatusDto {
+ private String status;
+ private Double times;
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
index 780f12d..477c0ad 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
@@ -43,6 +43,9 @@
@TableField(exist = false)
private String dataType;
+ @TableField(exist = false)
+ private Integer taskDuration;
+
@ApiModelProperty(value = "浼犵粰绠楁硶搴撶殑xml")
private String xml;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java
new file mode 100644
index 0000000..055353a
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssessTaskPhaseModel.java
@@ -0,0 +1,63 @@
+package com.zt.life.modules.mainPart.taskReliability.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * simulat_assess_task_phase_model
+ *
+ * @author zt generator
+ * @since 1.0.0 2024-07-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("simulat_assess_task_phase_model")
+public class SimulatAssessTaskPhaseModel extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "浠跨湡ID")
+ private Long fzId;
+
+ @ApiModelProperty(value = "浠诲姟ID")
+ private Long taskId;
+
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
+ @ApiModelProperty(value = "浠诲姟鏃堕暱")
+ private Double taskDuration;
+
+ @ApiModelProperty(value = "闃舵ID")
+ private Long phaseId;
+
+ @ApiModelProperty(value = "闃舵鍚嶇О")
+ private String phaseName;
+
+ @ApiModelProperty(value = "闃舵鏃堕暱姣�")
+ private Double phaseDurationRate;
+
+ @ApiModelProperty(value = "闃舵鏃堕暱")
+ private Double phaseDuration;
+
+ @ApiModelProperty(value = "宸ュ喌妯″瀷ID")
+ private Long gkId;
+
+ @ApiModelProperty(value = "宸ュ喌妯″瀷鍚嶇О")
+ private String gkName;
+
+ @ApiModelProperty(value = "宸ュ喌妯″瀷鏃堕暱姣�")
+ private Double gkDurationRate;
+
+ @ApiModelProperty(value = "宸ュ喌妯″瀷鏃堕暱")
+ private Double gkDuration;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskBinoParam.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskBinoParam.java
index cb65bb9..4727313 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskBinoParam.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskBinoParam.java
@@ -26,7 +26,6 @@
@ApiModelProperty(value = "浠诲姟ID")
private Long taskId;
-
@ApiModelProperty(value = "闃舵id")
private Long phaseId;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index d6d578b..a5c5b9d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -2,9 +2,10 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessDao;
+import com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto;
import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.zt.common.db.query.QueryFilter;
import java.util.List;
@@ -12,11 +13,13 @@
/**
* simulat_assess
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-03-20
*/
@Service
-public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
+public class SimulatAssessService extends BaseService<SimulatAssessDao, SimulatAssess> {
+ @Autowired
+ private TaskPhaseService taskPhaseService;
/**
* 鍒嗛〉鏌ヨ
@@ -38,14 +41,18 @@
}
public Integer getNumById(Long productId, Long taskModelId) {
- return baseDao.getNumById(productId,taskModelId);
+ return baseDao.getNumById(productId, taskModelId);
}
public List<SimulatAssess> getList(Long productId, Long taskModelId) {
- return baseDao.getList(productId,taskModelId);
+ return baseDao.getList(productId, taskModelId);
}
- public List<SimulatAssess> getParams(Long id, Long taskModelId) {
- return baseDao.getParams(id,taskModelId);
+ public SimulatAssess getParams(Long id, Long taskModelId) {
+ return baseDao.getParams(id, taskModelId);
+ }
+
+ public List<ProductStatusDto> getChildren(Long productId, Long taskId) {
+ return baseDao.getChildren(productId, taskId);
}
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessTaskPhaseModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessTaskPhaseModelService.java
new file mode 100644
index 0000000..c848af9
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessTaskPhaseModelService.java
@@ -0,0 +1,40 @@
+package com.zt.life.modules.mainPart.taskReliability.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessTaskPhaseModelDao;
+import com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel;
+import org.springframework.stereotype.Service;
+import com.zt.common.db.query.QueryFilter;
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * simulat_assess_task_phase_model
+ *
+ * @author zt generator
+ * @since 1.0.0 2024-07-30
+ */
+@Service
+public class SimulatAssessTaskPhaseModelService extends BaseService<SimulatAssessTaskPhaseModelDao, SimulatAssessTaskPhaseModel> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<SimulatAssessTaskPhaseModel> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
index 07403bd..cb1f526 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
@@ -40,4 +40,8 @@
public Integer getMaxSort(Long taskId) {
return baseDao.getMaxSort(taskId);
}
+
+ public List<Long> getPhaseByTask(Long taskId) {
+ return baseDao.getPhaseByTask(taskId);
+ }
}
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
index cd8fa4b..81f5f6a 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml
@@ -19,12 +19,40 @@
and IS_DELETE = 0
</select>
<select id="getParams" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssess">
- select a.sampl_period,b.task_duration
+ select a.sampl_period, a.simulat_frequency
from simulat_assess a
- left join task b on a.task_model_id = b.id and b.IS_DELETE= 0
where a.id = ${id}
and a.task_model_id = ${taskModelId}
and a.IS_DELETE = 0
</select>
-
+ <select id="getChildren" resultType="com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto">
+ select * from (
+ SELECT f.id,f.name, 0 as sort
+ FROM product_model f
+ WHERE f.id = 1813102074724945921
+ AND f.is_delete = 0
+ union
+ SELECT f.id,f.name,f.sort
+ FROM `task_phase` a,
+ task_phase_model b,
+ operat_condit c,
+ operat_condit_model d,
+ model_rbd_node e,
+ product_model f
+ WHERE a.task_id = ${taskId}
+ and d.product_id = ${productId}
+ AND a.is_delete = 0
+ AND b.is_delete = 0
+ AND c.id = b.operat_condit_id
+ AND c.is_delete = 0
+ AND d.operat_condit_id = c.id
+ AND d.is_delete = 0
+ AND e.model_id = d.model_id
+ AND e.is_delete = 0
+ AND f.id = e.node_id
+ AND f.is_delete = 0
+ GROUP BY f.id,f.name,f.sort
+ ) as f
+ ORDER BY f.sort
+ </select>
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessTaskPhaseModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessTaskPhaseModelDao.xml
new file mode 100644
index 0000000..d7f069c
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessTaskPhaseModelDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.mainPart.taskReliability.dao.SimulatAssessTaskPhaseModelDao">
+
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.SimulatAssessTaskPhaseModel">
+ select a.*
+ from simulat_assess_task_phase_model a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
index a4e8995..84856c9 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
@@ -22,5 +22,13 @@
is_delete = 0
and task_id =${taskId}
</select>
+ <select id="getPhaseByTask" resultType="java.lang.Long">
+ SELECT id
+ FROM task_phase
+ where
+ is_delete = 0
+ and task_id =${taskId}
+ order by phase_sort
+ </select>
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
index d38b55a..88819da 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
@@ -16,6 +16,7 @@
on a.id = b.operat_condit_id and b.is_delete = 0 and b.phase_id = ${phaseId}
WHERE a.IS_DELETE = 0
and a.product_id = ${productId}
+ order by a.CREATE_DATE
</select>
</mapper>
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index 5eb45bd..de4b44c 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -28,11 +28,10 @@
<el-col :span="4">
<div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
<product-model-tree @on-selected="onTreeSelected" showXdy="false"
- ref="ProductModelTree" :isShow="false"/>
+ ref="ProductModelTree" :isShow="false" basic="4"/>
</div>
</el-col>
<el-col :span="20">
-
<div style="margin-top: 20px">
<div>
<SimulatCurve ref="SimulatCurve"></SimulatCurve>
@@ -47,7 +46,6 @@
<script>
import SimulatCurve from "./SimulatCurve";
- import SimulatData from "./SimulatData";
import ProductModelTree from "../basicInfo/ProductModelTree";
@@ -88,14 +86,15 @@
components: {
ProductModelTree,
SimulatCurve,
- SimulatData
},
methods: {
onTreeSelected(data) {
- console.log(data, 'onProductSelected')
- this.dataForm.showProductId = data.id
- this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ if (this.dataForm.id){
+ console.log(data, 'onProductSelected')
+ this.dataForm.showProductId = data.id
+ this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ }
},
// 鑾峰彇淇℃伅
onProductSelected(data) {
diff --git a/web/src/views/modules/taskReliability/SimulatData.vue b/web/src/views/modules/taskReliability/SimulatData.vue
deleted file mode 100644
index f7bb6f3..0000000
--- a/web/src/views/modules/taskReliability/SimulatData.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
- <zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url=""
- :paging='false'
- delete-url="" v-slot="{ table }">
- <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
- </el-form>
- <el-table v-loading="table.dataLoading" :data="dataList"
- @selection-change="table.selectionChangeHandle"
- height="100px" v-adaptive="{bottomOffset:30}">
- <el-table-column prop="name" label="鍚嶇О"/>
- <el-table-column prop="totalTime" label="鎬绘椂闂�(灏忔椂)" align="center"/>
- <el-table-column prop="faultNum" label="鏁呴殰娆℃暟" align="center"/>
- <el-table-column prop="repairTime" label="淇悊鏃堕棿(鍒嗛挓)" align="center"/>
- <el-table-column prop="availability" label="鍙敤搴�(鐧惧垎姣�)" align="center"/>
- <el-table-column prop="mtbcf" label="MTBCF" align="center"/>
- <el-table-column prop="mttcr" label="MTTCR" align="center"/>
- </el-table>
- </zt-table-wraper>
-</template>
-
-<script>
-
-
- export default {
- name: 'SimulatData',
- data() {
- return {
- productList: [],
- dataForm: {
- productId: ''
- },
- dataList:[],
- fzdataList: [
- {
- name: '鎬讳綋',
- totalTime:'15000',
- faultNum:'2',
- repairTime:'20',
- availability:'99.96',
- mtbcf:'5000',
- mttcr:'20'
- },{
- name: '銆�绯荤粺1',
- totalTime:'15000',
- faultNum:'0',
- repairTime:'0',
- availability:'100',
- mtbcf:'15000',
- mttcr:'0'
- },{
- name: '銆�銆�璁惧1-1',
- totalTime:'9000',
- faultNum:'2',
- repairTime:'30',
- availability:'99.98',
- mtbcf:'3000',
- mttcr:'15'
- },{
- name: '銆�銆�璁惧1-2',
- totalTime:'15000',
- faultNum:'4',
- repairTime:'120',
- availability:'98.79',
- mtbcf:'5000',
- mttcr:'30'
- },{
- name: '銆�銆�璁惧1-3',
- totalTime:'12000',
- faultNum:'3',
- repairTime:'100',
- availability:'98.88',
- mtbcf:'3000',
- mttcr:'33'
- },
- {
- name: '銆�绯荤粺2',
- totalTime:'10000',
- faultNum:'2',
- repairTime:'30',
- availability:'99.75',
- mtbcf:'5000',
- mttcr:'15'
- },{
- name: '銆�銆�璁惧2-1',
- totalTime:'7000',
- faultNum:'5',
- repairTime:'200',
- availability:'88.84',
- mtbcf:'1167',
- mttcr:'40'
- },{
- name: '銆�銆�璁惧2-2',
- totalTime:'5000',
- faultNum:'3',
- repairTime:'60',
- availability:'98.78',
- mtbcf:'1250',
- mttcr:'30'
- },{
- name: '銆�銆�璁惧2-3',
- totalTime:'10000',
- faultNum:'1',
- repairTime:'20',
- availability:'99.97',
- mtbcf:'5000',
- mttcr:'20'
- },]
- }
- },
- components: {},
- mounted() {
- },
- methods: {
- init() {
- this.dataList =this.fzdataList
- },
- }
- }
-</script>
-<style>
-
-</style>
diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index 5112b8e..c6bc234 100644
--- a/web/src/views/modules/taskReliability/SimulatHistory.vue
+++ b/web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -13,11 +13,11 @@
<zt-select v-model="dataForm.id" :datas="simulatList" @change="onSimulatSelected"/>
</zt-form-item>
<zt-form-item label="閲囨牱鍛ㄦ湡" prop="samplPeriod">
- <el-input v-model="dataForm.samplPeriod" >
+ <el-input v-model="dataForm.samplPeriod" readonly="false">
</el-input>
</zt-form-item>
- <zt-form-item label="浠跨湡鎬绘椂闀�" prop="taskDuration">
- <el-input v-model="dataForm.taskDuration" >
+ <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
+ <el-input v-model="dataForm.simulatFrequency" readonly="false" >
</el-input>
</zt-form-item>
</el-form>
@@ -25,7 +25,7 @@
<el-col :span="4">
<div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
<product-model-tree @on-selected="onTreeSelected" showXdy="false"
- ref="ProductModelTree" :isShow="false"/>
+ ref="ProductModelTree" :isShow="false" basic="4"/>
</div>
</el-col>
<el-col :span="20">
@@ -43,7 +43,6 @@
<script>
import SimulatCurve from "./SimulatCurve";
- import SimulatData from "./SimulatData";
import ProductModelTree from "../basicInfo/ProductModelTree";
@@ -56,8 +55,6 @@
productList: [],
simulatList: [],
taskList: [],
- MTBF: '',
- MTTR: '',
dataForm: {
id: '',
taskDuration:'',
@@ -78,7 +75,6 @@
components: {
ProductModelTree,
SimulatCurve,
- SimulatData
},
methods: {
@@ -104,9 +100,11 @@
this.simulatList = res.data
},
onTreeSelected(data) {
- console.log(data, 'onProductSelected')
- this.dataForm.showProductId = data.id
- this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ if (this.dataForm.id){
+ console.log(data, 'onProductSelected')
+ this.dataForm.showProductId = data.id
+ this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ }
},
// 鑾峰彇淇℃伅
onProductSelected(data) {
@@ -134,8 +132,9 @@
taskModelId: this.dataForm.taskModelId
}
let res = await this.$http.get('/taskReliability/SimulatAssess/getSimulatParams', {params: params})
+ console.log(res.data.samplPeriod)
this.dataForm.taskDuration = res.data.taskDuration
- this.dataForm.samplPeriod = res.data.samplPeriod
+ this.dataForm.simulatFrequency = res.data.simulatFrequency
}
}
}
diff --git a/web/src/views/modules/taskReliability/TaskBinoParam.vue b/web/src/views/modules/taskReliability/TaskBinoParam.vue
index 4081cc3..4362523 100644
--- a/web/src/views/modules/taskReliability/TaskBinoParam.vue
+++ b/web/src/views/modules/taskReliability/TaskBinoParam.vue
@@ -23,13 +23,13 @@
<span v-else>{{scope.row.successRate}}</span>
</template>
</el-table-column>
- <el-table-column prop="simulatTimes" label="浠跨湡娆℃暟" align="center" width="100">
+ <el-table-column prop="simulatTimes" label="鎬绘鏁�" align="center" width="100">
<template slot-scope="scope">
<span
v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
<el-input ref="editInput"
autosize v-model="scope.row.simulatTimes"
- placeholder="浠跨湡娆℃暟"></el-input>
+ placeholder="鎬绘鏁�"></el-input>
</span>
<span v-else>{{scope.row.simulatTimes}}</span>
</template>
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index 1c1456e..a5fc186 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -17,7 +17,7 @@
<el-col :span="4">
<div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
<product-model-tree @on-selected="onTreeSelected" showXdy="false"
- ref="ProductModelTree" :isShow="false"/>
+ ref="ProductModelTree" :isShow="false" basic="5"/>
</div>
</el-col>
<el-col :span="20">
@@ -35,7 +35,6 @@
<script>
import SimulatCurve from "./SimulatCurve";
- import SimulatData from "./SimulatData";
import ProductModelTree from "../basicInfo/ProductModelTree";
@@ -69,7 +68,6 @@
components: {
ProductModelTree,
SimulatCurve,
- SimulatData
},
methods: {
@@ -94,10 +92,16 @@
console.log(res.data)
this.simulatList = res.data
},
- onTreeSelected(data) {
- console.log(data, 'onProductSelected')
- this.dataForm.showProductId = data.id
- this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ async onTreeSelected(data) {
+ this.dataForm.productId = data.id
+ console.log(this.dataForm.productId)
+ let params = {
+ productId: this.dataForm.productId,
+ taskId: this.dataForm.taskModelId,
+ fzId: '1722218139013042135'
+ }
+ let res = await this.$http.get('/taskReliability/SimulatAssess/getStatus', {params: params})
+ console.log(res.data)
},
// 鑾峰彇淇℃伅
onProductSelected(data) {
--
Gitblit v1.9.1