From c3a5d85d389276fc2cc846b640dcdbf448f15508 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 21 三月 2024 11:33:42 +0800
Subject: [PATCH] 修改
---
starter/src/main/resources/application.yml | 4 +
modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml | 0
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java | 3 +
web/src/views/modules/taskReliability/TaskPhase.vue | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java | 5 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java | 13 ++++
modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml | 7 ++
modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml | 0
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java | 6 +
/dev/null | 21 -------
web/src/views/modules/taskReliability/SelectModelRbd.vue | 5 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java | 4 +
modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml | 0
web/src/views/modules/taskReliability/TaskPhaseModel.vue | 13 +++
modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml | 0
modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml | 36 ++++++++++++
modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml | 0
modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml | 0
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue | 6 ++
modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml | 0
21 files changed, 96 insertions(+), 32 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
index 9bdcaf5..1bd2725 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskController.java
@@ -56,6 +56,11 @@
return Result.ok(data);
}
+ @GetMapping("getTaskList")
+ public Result<List<Task>> getTaskList(Long productId){
+
+ return Result.ok(taskService.getTaskList(productId));
+ }
@PostMapping
@ApiOperation("鏂板")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java
index cc354b7..87c7740 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskDao.java
@@ -20,4 +20,5 @@
List<Task> getList(Map<String, Object> params);
+ List<Task> getTaskList(Long productId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
index 4074cc3..de9e858 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/Task.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.mainPart.taskReliability.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModelProperty;
@@ -33,7 +34,8 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "")
- private Integer status;
+ @TableField(exist = false)
+ private String name;
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
index dc5ccd4..05ca44e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
@@ -3,9 +3,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
+import com.zt.common.entity.TreeNode;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* task_phase_model
@@ -16,7 +20,7 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("task_phase_model")
-public class TaskPhaseModel extends BusiEntity {
+public class TaskPhaseModel extends BusiEntity implements TreeNode<TaskPhaseModel> {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "闃舵ID")
@@ -39,4 +43,11 @@
@TableField(exist = false)
private String modelName;
+
+ @ApiModelProperty(value = "瀛愯妭鐐�")
+ @TableField(exist = false)
+ private List<TaskPhaseModel> children = new ArrayList<>();
+
+ @TableField(exist = false)
+ private Long pid;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java
index b87bd88..2fa730d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseModelService.java
@@ -1,6 +1,7 @@
package com.zt.life.modules.mainPart.taskReliability.service;
import com.zt.common.service.BaseService;
+import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.taskReliability.dao.TaskPhaseModelDao;
import com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel;
import org.springframework.stereotype.Service;
@@ -25,7 +26,8 @@
* @return
*/
public List<TaskPhaseModel> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<TaskPhaseModel> list = baseDao.getList(queryFilter.getQueryParams());
+ return TreeUtils.build(list);
}
/**
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
index 3a796df..b4e4d06 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
@@ -37,4 +37,7 @@
super.deleteLogic(ids);
}
+ public List<Task> getTaskList(Long productId) {
+ return baseDao.getTaskList(productId);
+ }
}
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml
deleted file mode 100644
index 3078628..0000000
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseModelDao.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.TaskPhaseModelDao">
-
- <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel">
- SELECT a.id as productId,
- a.`NAME` as `system`,
- c.model_name,
- b.model_id,
- b.id
- FROM product_model a
- LEFT JOIN task_phase_model b
- ON b.product_id = a.id
- AND b.phase_id = ${phaseId}
- LEFT JOIN model_rbd c ON c.id = b.model_id
- WHERE a.pid = ${productId}
- AND a.is_delete = 0
- </select>
-
-</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/sysPictureBase/SysPictureBaseDao.xml
rename to modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/AlgorithmDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/AlgorithmDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelLineDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/ModelLineDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeAlgorithmDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeAlgorithmDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelNodeDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/ModelNodeDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/ModelRbdDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
similarity index 72%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
index 9dec2de..6ed4005 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
@@ -17,5 +17,12 @@
ORDER BY ${orderBySql}
</if>
</select>
+ <select id="getTaskList" resultType="com.zt.life.modules.mainPart.taskReliability.model.Task">
+ select a.id,a.task_name as name
+ from task a
+ where
+ a.is_delete = 0
+ and a.product_id=${productId}
+ </select>
</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
similarity index 100%
rename from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskPhaseDao.xml
rename to modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
new file mode 100644
index 0000000..942607c
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseModelDao.xml
@@ -0,0 +1,36 @@
+<?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.TaskPhaseModelDao">
+
+ <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.TaskPhaseModel">
+ SELECT a.id AS id,
+ a.pid ,
+ a.`NAME` as `system`,
+ c.model_name,
+ b.model_id,
+ b.id as productId
+ FROM product_model a
+ LEFT JOIN task_phase_model b
+ ON b.product_id = a.id
+ AND b.phase_id = ${phaseId}
+ LEFT JOIN model_rbd c ON c.id = b.model_id
+ WHERE a.id in (
+ SELECT DATA.id
+ FROM (
+ SELECT @ids as ids,
+ (SELECT @ids := GROUP_CONCAT(id)
+ FROM product_model
+ WHERE FIND_IN_SET(pid, @ids)
+ ) as cids
+ FROM product_model
+ WHERE @ids IS NOT NULL AND @ids := ${productId}
+ ) id,
+ product_model DATA
+ WHERE FIND_IN_SET(DATA.id, ID.ids)
+ )
+ and a.product_type in (4, 3, 2, 10)
+ AND a.is_delete = 0
+ </select>
+
+</mapper>
diff --git a/starter/src/main/resources/application.yml b/starter/src/main/resources/application.yml
index 0740a38..98d86e8 100644
--- a/starter/src/main/resources/application.yml
+++ b/starter/src/main/resources/application.yml
@@ -17,8 +17,10 @@
datasource:
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
+ #url: jdbc:mysql://127.0.0.1:3306/csiczb?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
+ #url: jdbc:mysql://127.0.0.1:3306/test_project?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
url: jdbc:mysql://192.168.31.26:3366/reliability_simulat?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
-# url: jdbc:mysql://127.0.0.1:3366/reliability_simulat?allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
+ #url: jdbc:mysql://127.0.0.1:3306/zhpt_djxl?serverTimezone=GMT&allowMultiQueries=true&hive.exec.orc.split.strategy=ETL&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8
username: root
password: root
#password: 123456
diff --git a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
index 571d45b..aaf1886 100644
--- a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -59,6 +59,12 @@
this.dataForm.productType = params.type
}
},
+ // 鑾峰彇绯荤粺鍒楄〃
+ async getProductList() {
+ let res = await this.$http.get('/basicInfo/XhProductModel/getProductList')
+ this.productList = res.data
+ console.log(this.productList, 'getProductList')
+ },
selectPicture() {
this.$refs.pictureSelect.$refs.dialog.init()
},
diff --git a/web/src/views/modules/taskReliability/SelectModelRbd.vue b/web/src/views/modules/taskReliability/SelectModelRbd.vue
index 4dae686..8392647 100644
--- a/web/src/views/modules/taskReliability/SelectModelRbd.vue
+++ b/web/src/views/modules/taskReliability/SelectModelRbd.vue
@@ -36,9 +36,10 @@
components: {},
methods: {
init(param) {
- this.dataForm.productId = param.row.productId
+ console.log(param)
+ this.dataForm.productId = param.row.id
this.dataForm.phaseId = param.phaseId
- this.dataForm.id = param.row.id
+ this.dataForm.id = param.row.productId
},
async selectModel(row) {
console.log(this.dataForm)
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index f1f2dd8..fb6f829 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -6,7 +6,7 @@
<task @onTaskSelected="onTaskSelected"/>
</div>
</el-col>
- <el-col :span="12">
+ <el-col :span="11">
<div class="mod-taskReliability-taskPhase}">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/TaskPhase/page"
delete-url="/taskReliability/TaskPhase/"
@@ -32,7 +32,7 @@
</zt-table-wraper>
</div>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<div class="fa-card-a">
<task-phase-model ref="model"/>
</div>
diff --git a/web/src/views/modules/taskReliability/TaskPhaseModel.vue b/web/src/views/modules/taskReliability/TaskPhaseModel.vue
index 8240e77..ece30e0 100644
--- a/web/src/views/modules/taskReliability/TaskPhaseModel.vue
+++ b/web/src/views/modules/taskReliability/TaskPhaseModel.vue
@@ -8,8 +8,12 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
- v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
- <el-table-column prop="system" label="绯荤粺"/>
+ v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle"
+ row-key="id"
+ :cell-style="cellStyle"
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+ :default-expand-all="true">
+ <el-table-column prop="system" label="绯荤粺" width="160"/>
<el-table-column prop="modelName" label="绯荤粺妯″瀷"/>
<zt-table-column-handle :table="table" edit-perm="taskReliability:update"
delete-perm="taskReliability::delete" :has-view="false">
@@ -48,6 +52,11 @@
this.dataForm.productId = param.productId
this.$refs.tableObj.query()
},
+ cellStyle({column}) {
+ if (column.label === '绯荤粺') {
+ return 'text-align: left !important;'
+ }
+ },
selectModel(row) {
console.log(row, 'selectModel');
let param = {
--
Gitblit v1.9.1