From 66c793f06ceee81d51f4654a33d31f7fa7a2190e Mon Sep 17 00:00:00 2001
From: zhang xu <2125563902@qq.com>
Date: Thu, 9 May 2024 21:55:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:(=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ruleEngine/maintenance.js            |   9 ++
 src/views/ruleEngine/engineVersion/index.vue | 146 +++++++------------
 2 files changed, 64 insertions(+), 91 deletions(-)

diff --git a/src/api/ruleEngine/maintenance.js b/src/api/ruleEngine/maintenance.js
index 287e910..14ba8e8 100644
--- a/src/api/ruleEngine/maintenance.js
+++ b/src/api/ruleEngine/maintenance.js
@@ -58,3 +58,12 @@ export function delMaintenance(id) {
     method: 'delete'
   })
 }
+
+
+
+export function selectEngineVersionListByEngineId(id) {
+  return request({
+    url: '/ruleEngine/maintenance/selectEngineVersionListByEngineId/' + id,
+    method: 'get'
+  })
+}
diff --git a/src/views/ruleEngine/engineVersion/index.vue b/src/views/ruleEngine/engineVersion/index.vue
index 40ad6cf..f66fa64 100644
--- a/src/views/ruleEngine/engineVersion/index.vue
+++ b/src/views/ruleEngine/engineVersion/index.vue
@@ -171,6 +171,7 @@
             <el-descriptions-item label="是否激活">
               <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineVersionInfoAndTest.isActivate"/>
             </el-descriptions-item>
+
             <el-descriptions-item label="版本状态">
               <dict-tag :options="dict.type.rule_engine_version_status" :value="ruleEngineVersionInfoAndTest.status"/>
             </el-descriptions-item>
@@ -241,8 +242,8 @@
 
 <script>
 import Encoding from "@/components/Encoding/index.vue";
-import {getVersion, listVersion} from "@/api/ruleEngine/version";
-import {getMaintenance} from "@/api/ruleEngine/maintenance";
+import {selectEngineVersionListByEngineId} from "@/api/ruleEngine/maintenance";
+import {addVersion, getVersion, listVersion} from "@/api/ruleEngine/version";
 
 export default {
   name: "EngineVersion",
@@ -307,6 +308,12 @@ export default {
           databaseName: "chuanmei",
           type: "dataSource"
         },
+        {
+          name:"测试无",
+          systemName:"云计算系统",
+          databaseName:"dewfwf",
+          type:"dataSource"
+        },
       ],
       // 数据接入集合选择
       assetStructure: null,
@@ -332,7 +339,14 @@ export default {
           dataTotal: 6347,
           type: "dataTable",
           childrenList: []
-        }
+        },
+        {
+          name: "sys_version",
+          as:"公告通知",
+          dataTotal: 4654,
+          type:"dataTable",
+          childrenList: []
+        },
       ],
       // 数据资产选择
       assets: null,
@@ -404,6 +418,20 @@ export default {
           isDict: "N",
           dictKey: "-",
         },
+        {
+          id:"6",
+          name:"create_time",
+          comment:"创建时间",
+          isPrimaryKey: "N",
+          type:"datetime",
+          mappingType: "Date",
+          length:"-",
+          decimalPlaces: "-",
+          isNull: "Y",
+          defaultValue: "-",
+          isDict: "N",
+          dictKey: "-",
+        },
         ],
       // 数据模型选择
       dataMode: null,
@@ -421,7 +449,7 @@ export default {
   created() {
     // this.initRuleEngine();
     this.getListEngineMaintenance();
-    this.getListVersion()
+
   },
   methods: {
 
@@ -450,6 +478,10 @@ export default {
         case "info"://详情
           this.ruleEngineVersionInfoStatus = true;
           this.ruleEngineVersionInfoAndTest = command.ruleEngineVersion;
+          listVersion(this.ruleEngineInfo.ruleEngineVersionList).then(res=>{
+            console.log(res,'1230')
+              this.ruleEngineInfo.ruleEngineVersionList = res.data;
+          })
           break;
         case "test"://测试
           this.ruleEngineVersionTestStatus = true;
@@ -484,6 +516,13 @@ export default {
     },
     // 确定新增
     addVersionSubmission(){
+      addVersion(this.engineVersionForm).then(res=>{
+        if (res.code === 200){
+          this.$message.success('新增成功');
+        }else {
+          this.$message.error('新增失败');
+        }
+      })
       this.ruleEngineInfo.ruleEngineVersionList.push({... this.engineVersionForm})
       this.addVersionStatus = false;
     },
@@ -507,102 +546,27 @@ export default {
       }else if(clickType === "status"){
         this.ruleEngineInfo.status = '0' === this.ruleEngineInfo.status ? '1' : '0'
         this.$modal.msgSuccess("引擎状态操作成功");
-      }
+      }o
     },
     getListEngineMaintenance(){
-      getMaintenance(this.ruleEngineId).then(res=>{
+      selectEngineVersionListByEngineId(this.ruleEngineId).then(res=>{
         console.log(res,'1')
         this.ruleEngineInfo = res.data
       })
         //获取版本的列表
       },
-    getListVersion(){
-      getVersion(this.ruleEngineId).then(res=>{
-        console.log(res,'2')
-        this.ruleEngineInfo.ruleEngineVersionList = res.data
-      })
-    },
+    // getListVersion(){
+    //   getVersion(this.ruleEngineId).then(res=>{
+    //     console.log(res,'2')
+    //     this.ruleEngineInfo.ruleEngineVersionList = res.data
+    //   })
+    // },
 
     //  initRuleEngine(){
-    //   let response = {
-    //     "code": 200,
-    //     "msg": "查询成功",
-    //     "data": {
-    //       "id": 1,
-    //       "name": "邮箱规则",
-    //       "type": "rule-custom",
-    //       "isActivate": "no-activate",
-    //       "status": "0",
-    //       "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>",
-    //       "remark": "-",
-    //       "code": "email",
-    //       "engineCode": "engine_custom_email",
-    //       "level": "data-field",
-    //       "ruleEngineVersionList": [
-    //         {
-    //           "name": "163剔除", "code": "IAW3S02", "status": "0", "isTest": "0",
-    //           "versionCode": "engine_custom_email_IAW3S02", "isActivate": "no-activate",
-    //           "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>","codeIng": "package com.muyu.rule.engine.custom;\n" +
-    //             "\n" +
-    //             "import com.muyu.engine.action.ActionDiscard;\n" +
-    //             "import com.muyu.engine.scope.DataModelEngine;\n" +
-    //             "\n" +
-    //             "/**\n" +
-    //             " * @Author: DongZeLiang\n" +
-    //             " * @date: 2024/5/6\n" +
-    //             " * @Description: ce-IAW3S02\n" +
-    //             " * @Version: 1.0\n" +
-    //             " */\n" +
-    //             "public class engine_custom_email_IAW3S02 extends DataModelEngine {\n" +
-    //             "    @Override\n" +
-    //             "    public void execution () {\n" +
-    //             "        Object value = getValue();\n" +
-    //             "\n" +
-    //             "        if (value == null || \"\".equals(value) || \"null\".equals(value)) {\n" +
-    //             "            throw new ActionDiscard();\n" +
-    //             "        }\n" +
-    //             "    }\n" +
-    //             "}"
-    //         },
-    //         {
-    //           "name": "筛选不合规邮箱", "code": "JISID8S", "status": "2", "isTest": "1",
-    //           "versionCode": "engine_custom_email_JISID8S", "isActivate": "activated",
-    //           "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>","codeIng": "package com.muyu.rule.engine.custom;\n" +
-    //             "\n" +
-    //             "import com.muyu.engine.action.ActionDiscard;\n" +
-    //             "import com.muyu.engine.scope.DataModelEngine;\n" +
-    //             "\n" +
-    //             "/**\n" +
-    //             " * @Author: DongZeLiang\n" +
-    //             " * @date: 2024/5/6\n" +
-    //             " * @Description: ce-JISID8S\n" +
-    //             " * @Version: 1.0\n" +
-    //             " */\n" +
-    //             "public class engine_custom_email_JISID8S extends DataModelEngine {\n" +
-    //             "    @Override\n" +
-    //             "    public void execution () {\n" +
-    //             "        Object value = getValue();\n" +
-    //             "\n" +
-    //             "        if (value == null || \"\".equals(value) || \"null\".equals(value)) {\n" +
-    //             "            throw new ActionDiscard();\n" +
-    //             "        }\n" +
-    //             "    }\n" +
-    //             "}"
-    //         },
-    //         {
-    //           "name": "剔除自定义邮箱", "code": "DJ8S9EA", "status": "2", "isTest": "2",
-    //           "versionCode": "engine_custom_email_DJ8S9EA", "isActivate": "no-activate",
-    //           "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>"
-    //         },
-    //         {
-    //           "name": "邮箱默认值操作", "code": "XJS9E0S", "status": "1", "isTest": "0",
-    //           "versionCode": "engine_custom_email_XJS9E0S", "isActivate": "no-activate",
-    //           "description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>"
-    //         }
-    //       ]
-    //     }
-    //   }
-    //   this.ruleEngineInfo = response.data
+    //    listVersion({id: this.ruleEngineVersionInfoAndTest.id,codeText: this.ruleEngineVersionInfoAndTest.code}).then(res=>{
+    //      console.log(res,'1230')
+    //      this.ruleEngineVersionInfoAndTest.code = res.data.codeText;
+    //    })
     // },
     // 获取代码模板
     getCodeIng(){