Эх сурвалжийг харах

项目集成es, 故障案例功能,使用es实现

wanggaokun 1 жил өмнө
parent
commit
6fb8c509a1

+ 23 - 0
PHM-admin/pom.xml

@@ -33,11 +33,34 @@
         <netty-all.version>4.1.86.Final</netty-all.version>
         <hutool.version>4.6.0</hutool.version>
         <dameng.version>8.1.1.49</dameng.version>
+        <es.version>7.12.1</es.version>
+        <easy-es.version>2.0.0-beta4</easy-es.version>
     </properties>
 	
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                <version>${es.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-client</artifactId>
+                <version>${es.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.elasticsearch</groupId>
+                <artifactId>elasticsearch</artifactId>
+                <version>${es.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara.easy-es</groupId>
+                <artifactId>easy-es-boot-starter</artifactId>
+                <version>${easy-es.version}</version>
+            </dependency>
 
             <!--达梦数据库驱动-->
             <!-- https://mvnrepository.com/artifact/com.dameng/Dm8JdbcDriver18 -->

+ 17 - 13
PHM-web/src/views/manage/faultCase/index.vue

@@ -17,9 +17,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="故障描述" prop="isDelete">
+      <el-form-item label="故障描述" prop="description">
         <el-input
-          v-model="queryParams.isDelete"
+          v-model="queryParams.description"
           placeholder="请输入故障描述"
           clearable
           @keyup.enter.native="handleQuery"
@@ -103,15 +103,20 @@
 
     <el-table v-loading="loading" :data="faultCaseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
-      <el-table-column label="案例文件" align="center">
+
+      <!-- <el-table-column label="案例文件" align="center">
         <template slot-scope="scope">
           {{ getFileName(scope.row.caseFileName) }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="案例名称" align="center" prop="caseName" />
       <el-table-column label="案例编号" align="center" prop="caseNumber" />
-      <el-table-column label="故障描述" align="center" prop="description" />
+      <el-table-column label="故障描述" align="center" prop="description" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.highlightContent" v-html="scope.row.highlightContent"></span>
+          <span v-else>{{ scope.row.description }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="案例特征参数" align="center" prop="parameter" />
       <el-table-column label="故障定位" align="center" prop="location" />
       <el-table-column label="解决措施" align="center" prop="solution" />
@@ -145,9 +150,9 @@
     <!-- 添加或修改故障案例信息对话框 -->
     <el-dialog :title="title" :visible.sync="open"  :close-on-click-modal="false" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="案例文件" prop="caseFileName">
+        <!-- <el-form-item label="案例文件" prop="caseFileName">
           <file-upload ref="fileUpload" v-model="form.caseFileName" :limit="1"></file-upload>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="案例名称" prop="caseName">
           <el-input v-model="form.caseName" placeholder="请输入案例案例名称" />
         </el-form-item>
@@ -219,7 +224,6 @@ export default {
       // 表单校验
       rules: {
         caseFileName: [
-          { required: true, message: "案例文件不能为空", trigger: "blur" }
         ],
       }
     };
@@ -259,7 +263,7 @@ export default {
         description: null,
         caseNumber: null,
         caseFileName: null,
-       
+
         parameter: null,
         location: null,
         solution: null
@@ -278,7 +282,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map(item => item.esId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -291,7 +295,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.esId || this.ids
       getFaultCase(id).then(response => {
         this.form = response.data;
         this.open = true;
@@ -320,7 +324,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.esId || this.ids;
       this.$modal.confirm('是否确认删除故障案例信息编号为"' + ids + '"的数据项?').then(function() {
         return delFaultCase(ids);
       }).then(() => {