From 143e5be5d9aa5d395aac44aaf493ce1250490e6f Mon Sep 17 00:00:00 2001
From: baize <3533151373@qq.com>
Date: Mon, 6 May 2024 22:35:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=20=20=20=20=E5=BC=95=E6=93=8E=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dataSource/source.js                  |   8 +
 src/api/rule_engine/config.js                 |  62 -----
 src/api/rule_engine/maintenance.js            |  44 ----
 src/api/ruleengine/ruleengine.js              |  67 +++++
 .../assets/OverallAssetStructure.vue          |  55 +++--
 .../assets/OverallSpecificAssets.vue          |  12 +-
 src/views/dataSource/assets/index.vue         |   4 +-
 src/views/rule_engine/config/index.vue        |  68 ------
 src/views/rule_engine/version/index.vue       | 204 ----------------
 src/views/ruleengine/engineConfig/codeData.js |   0
 src/views/ruleengine/engineConfig/index.vue   | 129 ++++++++++
 src/views/ruleengine/engineVersion/index.vue  |  78 ++++++
 .../ruleengine}/index.vue                     | 229 +++++++++++++-----
 13 files changed, 490 insertions(+), 470 deletions(-)
 delete mode 100644 src/api/rule_engine/config.js
 delete mode 100644 src/api/rule_engine/maintenance.js
 create mode 100644 src/api/ruleengine/ruleengine.js
 delete mode 100644 src/views/rule_engine/config/index.vue
 delete mode 100644 src/views/rule_engine/version/index.vue
 create mode 100644 src/views/ruleengine/engineConfig/codeData.js
 create mode 100644 src/views/ruleengine/engineConfig/index.vue
 create mode 100644 src/views/ruleengine/engineVersion/index.vue
 rename src/views/{rule_engine/maintenance => ruleengine/ruleengine}/index.vue (66%)

diff --git a/src/api/dataSource/source.js b/src/api/dataSource/source.js
index 95d9f4d..22b3f74 100644
--- a/src/api/dataSource/source.js
+++ b/src/api/dataSource/source.js
@@ -116,3 +116,11 @@ export function dataBaseTableInformation(){
     method:'get',
   })
 }
+
+export function updateDatabaseTable(data){
+  return request({
+    url:'dataSource/source/updateDatabaseTable',
+    method:'post',
+    data:data,
+  })
+}
diff --git a/src/api/rule_engine/config.js b/src/api/rule_engine/config.js
deleted file mode 100644
index f43da02..0000000
--- a/src/api/rule_engine/config.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import request from '@/utils/request'
-
-//查询规则配置作用域列表
-export function listScope() {
-  return request({
-    url: '/ruleEngine/config/getScopeList',
-    method: 'get'
-  })
-}
-
-//查询规则配置作用域
-export function getScope(query) {
-  return request({
-    url: '/ruleEngine/config/getScopeInfo/'+query,
-    method: 'get'
-  })
-}
-
-// 查询引擎规则配置列表
-export function listConfig(query) {
-  return request({
-    url: '/ruleEngine/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 测试引擎规则配置
-export function ruleTest(data) {
-  return request({
-    url: '/ruleEngine/config/test',
-    method: 'post',
-    data: data
-  })
-}
-
-// 新增引擎规则配置
-export function addConfig(data) {
-  return request({
-    url: '/ruleEngine/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改引擎规则配置
-export function updateConfig(data) {
-  return request({
-    url: '/ruleEngine/config/'+data.id,
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除引擎规则配置
-export function delConfig(id) {
-  return request({
-    url: '/ruleEngine/config/' + id,
-    method: 'delete'
-  })
-}
-
diff --git a/src/api/rule_engine/maintenance.js b/src/api/rule_engine/maintenance.js
deleted file mode 100644
index f454aff..0000000
--- a/src/api/rule_engine/maintenance.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询引擎维护列表
-export function listMaintenance(query) {
-  return request({
-    url: '/ruleEngine/maintenance/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询引擎维护详细
-export function getMaintenance(id) {
-  return request({
-    url: '/ruleEngine/maintenance/' + id,
-    method: 'get'
-  })
-}
-
-// 新增引擎维护
-export function addMaintenance(data) {
-  return request({
-    url: '/ruleEngine/maintenance',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改引擎维护
-export function updateMaintenance(data) {
-  return request({
-    url: '/ruleEngine/maintenance/'+data.id,
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除引擎维护
-export function delMaintenance(id) {
-  return request({
-    url: '/ruleEngine/maintenance/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/ruleengine/ruleengine.js b/src/api/ruleengine/ruleengine.js
new file mode 100644
index 0000000..fd1ef96
--- /dev/null
+++ b/src/api/ruleengine/ruleengine.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 查询规则引擎列表
+export function listRuleengine(query) {
+  return request({
+    url: '/ruleengine/ruleengine/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询规则引擎详细
+export function getRuleengine(id) {
+  return request({
+    url: '/ruleengine/ruleengine/' + id,
+    method: 'get'
+  })
+}
+
+export function ruleengine(content) {
+  return request({
+    url: `/ruleengine/ruleengine/compiler`,
+    method: 'post',
+    data:content
+  })
+}
+
+export function getRuleContent(ruleId) {
+  return request({
+    url: `/ruleengine/ruleengine/getRuleContent?ruleId=`+ruleId,
+    method: 'get'
+  })
+}
+
+export function loader() {
+  return request({
+    url: `/ruleengine/ruleengine/loader`,
+    method: 'get'
+  })
+}
+
+
+// 新增规则引擎
+export function addRuleengine(data) {
+  return request({
+    url: '/ruleengine/ruleengine',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改规则引擎
+export function updateRuleengine(data) {
+  return request({
+    url: '/ruleengine/ruleengine/'+data.id,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除规则引擎
+export function delRuleengine(id) {
+  return request({
+    url: '/ruleengine/ruleengine/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/dataSource/assets/OverallAssetStructure.vue b/src/views/dataSource/assets/OverallAssetStructure.vue
index 76ccc08..f6034bc 100644
--- a/src/views/dataSource/assets/OverallAssetStructure.vue
+++ b/src/views/dataSource/assets/OverallAssetStructure.vue
@@ -17,10 +17,11 @@
       <div slot="header" class="clearfix">
         <span>资产模型详细信息</span>
       </div>
-<!--      {{structureId}}-->
+
       <el-table
         :data="databaseTable"
         style="width: 100%;">
+        {{databaseTable}}
         <el-table-column prop="name" label="名称" />
         <el-table-column prop="comment" label="注释" />
         <el-table-column prop="isPrimaryKey" label="是否主键" >
@@ -56,9 +57,9 @@
               placement="left"
               width="200"
               trigger="hover">
-              <el-table :data="thisDict[scope.row.dictKey]">
-                <el-table-column property="dictionaryName" label="字典标签"/>
-                <el-table-column dictionaryValue="value" label="字典值"/>
+              <el-table :data="dictMap[scope.row.dictKey]">
+                <el-table-column property="label" label="字典标签"/>
+                <el-table-column property="val" label="字典值"/>
               </el-table>
               <el-tag slot="reference">{{scope.row.dictKey}}</el-tag>
             </el-popover>
@@ -73,6 +74,7 @@
     </el-card>
     <el-dialog title="资产结构修改" width="80%" :visible.sync="formStatus">
       <el-form :model="form" label-width="120px">
+        {{form}}
         <el-row>
           <el-col :span="12">
             <el-form-item label="名称">
@@ -126,11 +128,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="映射字段">
-              <el-input v-model="form.mappingType" readonly autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="是否字典">
               <el-switch
@@ -147,15 +144,15 @@
           <el-col :span="24">
             <el-form-item label="字典">
               <el-select v-model="form.dictKey">
-                <el-option v-for="dictionary in dictionaryTypeList" :key="dictionary.id" :label="dictionary.dictionaryName" :value="dictionary.id"></el-option>
+                <el-option v-for="(value, key) in dictMap" :key="key" :label="key" :value="key"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item>
-              <el-table :data="thisDict" striped border>
-                <el-table-column property="dictionaryName" label="字典标签"/>
-                <el-table-column property="dictionaryValue" label="字典值"/>
+              <el-table :data="dictMap[form.dictKey]" striped border>
+                <el-table-column property="label" label="字典标签"/>
+                <el-table-column property="val" label="字典值"/>
               </el-table>
             </el-form-item>
           </el-col>
@@ -163,13 +160,13 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="formStatus = false">取 消</el-button>
-        <el-button type="primary" @click="formStatus = false">确 定</el-button>
+        <el-button type="primary" @click="updateDatabaseTable(form)">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import {findDataBaseByInformationId} from "@/api/dataSource/source";
+import {findDataBaseByInformationId, updateDatabaseTable} from "@/api/dataSource/source";
 
 export default {
   name: 'OverallAssetStructure',
@@ -191,7 +188,7 @@ export default {
       default:{}
     },
     structureId:{
-      value:Number,
+      value:Object,
       default:0
     },
     dictionaryTypeList:{
@@ -207,12 +204,12 @@ export default {
     return {
       form: {},
       formStatus: false,
+      dictMap:{}
     }
   },
   watch:{
     table:{
       handler(val){
-        console.log("res",val)
         if (val!=null){
           findDataBaseByInformationId(val.id).then(
             res=>{
@@ -225,15 +222,35 @@ export default {
 
       },
       immediate:true
+    },
+    "dictionaryTypeList": {
+      handler(val) {
+        val.forEach(item => {
+          const key = `${item.dictionaryName.toLowerCase().replace(/ /g, '_')}`; // 构造 key
+          this.$set(this.dictMap, key, item.dictionaryDataList.map(dataModel => ({
+            label: dataModel.dictionaryLabel,
+            val: dataModel.dictionaryValue,
+            status: dataModel.status
+          })));
+        });
+      },
+      immediate: true
     }
   },
   created() {
-    // this.findDataBaseByInformationId()
     this.init();
   },
   methods:{
+    updateDatabaseTable(form){
+      updateDatabaseTable(form).then(
+        res=>{
+          this.$message.success(res.msg);
+          this.formStatus=false
+          this.table();
+        }
+      )
+    },
     init(){
-      console.log("123",this.dictionaryTypeList)
     },
     update(row) {
       this.form = row;
diff --git a/src/views/dataSource/assets/OverallSpecificAssets.vue b/src/views/dataSource/assets/OverallSpecificAssets.vue
index 362555e..824a308 100644
--- a/src/views/dataSource/assets/OverallSpecificAssets.vue
+++ b/src/views/dataSource/assets/OverallSpecificAssets.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row :gutter="40" class="panel-group">
     <div class="title-header">
-      {{title}} - 资产结构概述
+      {{title}} - 资产结构概述{{structureId}}
     </div>
     <el-col :sm="12" :xs="12" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('messages')">
@@ -68,7 +68,7 @@
                 >新增</el-button>
               </div>
 
-              <el-table :data="item.dictionaryDataL0t" style="width: 100%" height="280px">
+              <el-table :data="item.dictionaryDataList" style="width: 100%" height="280px">
                 <el-table-column prop="dictionaryName" label="标签">
                   <template slot-scope="scope">
                     <span v-if="scope.row.status === 0">{{scope.row.dictionaryLabel}}</span>
@@ -115,7 +115,7 @@
     <el-col :span="24" style="margin-top: 20px">
       <el-tabs :value="activeName" type="border-card" >
         <el-tab-pane v-for="(table,index) in databaseTableInformationList" :label="table.name+'('+table.as+')'" :name="index+''" >
-          <OverallAssetStructure :table="table"/>
+          <OverallAssetStructure :table="table" :dictionaryTypeList="dictionaryTypeList" />
         </el-tab-pane>
       </el-tabs>
     </el-col>
@@ -185,7 +185,7 @@ export default {
 
     },
     deleteConfirm(row){
-      console.log(row)
+      // console.log(row)
       deleteDictionaryData(row.id).then(
         res=>{
           this.$message.success(res.msg);
@@ -193,8 +193,8 @@ export default {
       )
     },
     editConfirm(item,row){
-      console.log(item)
-      console.log(row)
+      // console.log(item)
+      // console.log(row)
 
       if (row.id!=null) {
         updateDictionaryData(row).then(
diff --git a/src/views/dataSource/assets/index.vue b/src/views/dataSource/assets/index.vue
index ab7609e..9430504 100644
--- a/src/views/dataSource/assets/index.vue
+++ b/src/views/dataSource/assets/index.vue
@@ -78,7 +78,9 @@ export default {
       findDictionaryByStructureId(data.id).then(
         res=>{
           this.structureId=data.id;
+          console.log("res",this.structureId)
           this.dictionaryTypeList=res.data;
+          console.log(this.dictionaryTypeList)
         }
       )
         findDataBaseTable(data.id).then(
@@ -96,7 +98,7 @@ export default {
           res=>{
 
             this.databaseTable=res.data;
-            console.log("res",this.databaseTable)
+            // console.log("res",this.databaseTable)
           }
         )
       }
diff --git a/src/views/rule_engine/config/index.vue b/src/views/rule_engine/config/index.vue
deleted file mode 100644
index b01ac4e..0000000
--- a/src/views/rule_engine/config/index.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <el-col :span="22" :offset="1">
-    <el-card>
-      <div slot="header" class="clearfix">
-        <span>公共配置</span>
-      </div>
-      <el-form ref="form" :model="ruleEngineCommonConfig" label-width="120px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="规则基础目录">
-              <el-input v-model="ruleEngineCommonConfig.packageName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
-    <el-col>
-      <el-card>
-        <div slot="header" class="clearfix">
-          <span>作用域</span>
-        </div>
-        <el-tabs type="border-card" v-model="activeName">
-          <el-tab-pane :key="index" v-for="(scope,index) in scopeList" :label="scope.type" :name="index+''">
-            <encoding v-if="activeName===index.toString()" style="height: 600px" v-model="scope.code" :read-only="true"></encoding>
-          </el-tab-pane>
-        </el-tabs>
-      </el-card>
-    </el-col>
-  </el-col>
-</template>
-
-<script>
-import Encoding from "@/components/Encoding/index.vue";
-import {listScope} from "@/api/rule_engine/config";
-
-export default {
-  name: "config",
-  components: {Encoding},
-  data() {
-    return {
-      activeName: '0',
-      ruleEngineCommonConfig: {
-        packageName: "com.ruoyi.ruleEngine",
-      },
-      scopeList: []
-    }
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    getList(){
-      listScope().then(response=>{
-        this.scopeList=response.data;
-      })
-    }
-  }
-}
-</script>
-
-<style>
-.el-col {
-  margin-top: 20px;
-}
-</style>
diff --git a/src/views/rule_engine/version/index.vue b/src/views/rule_engine/version/index.vue
deleted file mode 100644
index bb6df07..0000000
--- a/src/views/rule_engine/version/index.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-  <div>
-    <el-card style="width: 95%;margin-left: 35px;margin-top: 10px">
-      <div slot="header" class="clearfix">
-        <span>引擎规则基本信息</span>
-        <el-button style="float: right" @click="goBack" size="medium" type="text">返回</el-button>
-      </div>
-      <el-descriptions border :column="3">
-        <el-descriptions-item label="规则名称">{{ruleInfo.name}}</el-descriptions-item>
-        <el-descriptions-item label="规则编码">{{ruleInfo.engineCode}}</el-descriptions-item>
-        <el-descriptions-item label="作用域"><dict-tag :options="dict.type.rule_engine_level" :value="ruleInfo.scope"/></el-descriptions-item>
-        <el-descriptions-item label="状态"><dict-tag :options="dict.type.sys_normal_disable" :value="ruleInfo.status"/></el-descriptions-item>
-        <el-descriptions-item label="是否激活"><dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleInfo.isActivate"/></el-descriptions-item>
-      </el-descriptions>
-    </el-card>
-    <el-card :body-style="{ padding: '0.3px' }" class="versionContainer" style="width: 95%;margin-left: 35px;margin-top: 10px">
-      <div slot="header" class="clearfix">
-        <span>规则内容</span>
-        <el-button style="float: right;margin-left: 5px" @click="handleDel" size="medium" type="text">删除此版本</el-button>
-        <el-button style="float: right;margin-left: 5px" @click="handleAdd" size="medium" type="text">新增版本</el-button>
-        <el-button style="float: right;margin-left: 5px" @click="()=>{this.visible=true;}" size="medium" type="text">测试规则</el-button>
-        <el-button style="float: right;margin-left: 5px" @click="saveContent" size="medium" type="text">保存此版本</el-button>
-      </div>
-      <div style="padding: 0!important;overflow: hidden;position: relative;">
-        <el-empty v-if="versionList.length===0" description="暂无规则内容" style="height: 450px"></el-empty>
-        <el-tabs v-else type="border-card" v-model="activeName" >
-          <el-tab-pane :key="index" v-for="(scope,index) in versionList" :label="scope.versionCode" :name="index+''">
-            <encoding v-if="activeName===index.toString()" style="height: 600px" v-model="scope.ruleContent" ></encoding>
-          </el-tab-pane>
-        </el-tabs>
-        <el-drawer
-          title="规则测试"
-          :visible.sync="visible"
-          :before-close="handleClose"
-          :lockScroll="false"
-          :modal="false"
-          direction="rtl"
-          style="position: absolute;"
-        >
-          <el-form >
-            <el-form-item label="测试数据" style="margin-left: 5px">
-              <el-input type="textarea" v-model="testData" ></el-input>
-            </el-form-item>
-            <el-form-item label="测试结果" style="margin-left: 5px">
-              <el-input type="textarea" v-model="resData" ></el-input>
-            </el-form-item>
-            <el-form-item style="margin-left: 5px">
-              <el-button type="primary" size="small" @click="handleTest">测试</el-button>
-            </el-form-item>
-          </el-form>
-        </el-drawer>
-      </div>
-    </el-card>
-    <!-- 添加或修改引擎规则配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="版本编码" prop="versionCode">
-          <el-input v-model="form.versionCode" placeholder="请输入版本编码" />
-        </el-form-item>
-        <el-form-item label="新增依据" prop="newBasis">
-          <el-select v-model="form.newBasis" placeholder="请选择新增依据" style="width: 100%" @change="handlerChange">
-            <el-option :key="-1" label="克隆公共配置" value="-1"></el-option>
-            <el-option
-              v-for="(item,index) in versionList"
-              :key="index"
-              :label="'克隆'+item.versionCode+'版本'"
-              :value="index">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {getMaintenance} from "@/api/rule_engine/maintenance";
-import Encoding from "@/components/Encoding/index.vue";
-import {addConfig, delConfig, getScope, listConfig, ruleTest, updateConfig} from "@/api/rule_engine/config";
-
-export default {
-  name: "version",
-  components: {Encoding},
-  dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
-  data() {
-    return {
-      visible: false,
-      open:false,
-      configId: this.$route.params && this.$route.params.configId,
-      ruleInfo:{},
-      activeName:'0',
-      versionList:[],
-      title:'',
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        versionCode: [
-          { required: true, message: "版本编码不能为空", trigger: "blur" }
-        ],
-        newBasis: [
-          { required: true, message: "新增依据不能为空", trigger: "blur" }
-        ],
-      },
-      baseRuleContent:'',
-      testData:'1424587994@163com,2949451835@qq.com',
-      resData:''
-    }
-  },
-  created() {
-    this.getInfo();
-  },
-  methods: {
-    getInfo() {
-      getMaintenance(this.configId).then(response => {
-        this.ruleInfo = response.data;
-      })
-      listConfig({engineMaintenanceId: this.configId}).then(response => {
-        this.versionList = response.data;
-      })
-      getScope(0).then(response=>{
-        this.baseRuleContent=response.data.code;
-      })
-    },
-    goBack() {
-      this.$router.go(-1);
-    },
-    saveContent() {
-      updateConfig(this.versionList[Number(this.activeName)]).then(response => {
-        this.$message.success("保存成功");
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        versionCode: null,
-        engineMaintenanceId: null,
-        newBasis:null,
-        ruleContent:null
-      };
-      this.resetForm("form");
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.form.engineMaintenanceId=this.ruleInfo.id;
-      this.title = "添加引擎规则配置";
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          addConfig(this.form).then(response => {
-            this.$modal.msgSuccess("新增成功");
-            this.open = false;
-            this.getInfo();
-          });
-        }
-      });
-    },
-    handlerChange(val){
-      if(val!=='-1'){
-        this.form.ruleContent=this.versionList[Number(val)].ruleContent;
-      }else {
-        this.form.ruleContent=this.baseRuleContent;
-      }
-    },
-    handleDel() {
-      let data=this.versionList[Number(this.activeName)];
-      this.$modal.confirm('是否确认删除版本编号为"' + data.versionCode + '"的数据项？').then(function() {
-        return delConfig(data.id);
-      }).then(() => {
-        this.getInfo();
-        this.activeName='0';
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleTest() {
-      ruleTest({id:this.versionList[Number(this.activeName)].id,list:this.testData.split(',')}).then(response=>{
-        this.resData=response.data;
-        this.$message.success("测试成功");
-      })
-    },
-    handleClose() {
-      this.visible=false;
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/ruleengine/engineConfig/codeData.js b/src/views/ruleengine/engineConfig/codeData.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/ruleengine/engineConfig/index.vue b/src/views/ruleengine/engineConfig/index.vue
new file mode 100644
index 0000000..e6d2969
--- /dev/null
+++ b/src/views/ruleengine/engineConfig/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <el-col :span="22" :offset="1">
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span>公共配置</span>
+      </div>
+      <el-form ref="form" :model="ruleEngineCommonConfig" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="规则基础目录">
+              <el-input v-model="ruleEngineCommonConfig.packageName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-col>
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>作用域</span>
+        </div>
+        <el-tabs type="border-card" v-model="codeCardStatus">
+          <el-tab-pane v-for="scope in scopeList" :label="scope.type" :name="scope.value">
+            <encoding v-if="codeCardStatus === scope.value" style="height: 800px" v-model="scope.code" :read-only="true"></encoding>
+          </el-tab-pane>
+        </el-tabs>
+      </el-card>
+    </el-col>
+  </el-col>
+</template>
+
+<script>
+
+import Encoding from "@/components/Encoding/index.vue";
+
+export default {
+  name: "EngineConfig",
+  components: {Encoding},
+  data() {
+    return {
+      codeCardStatus: "taskContext",
+      ruleEngineCommonConfig: {
+        packageName: "com.muyu.rule.engine",
+      },
+      scopeList: [
+        { type: "任务", value: "taskContext", "code":
+            "package com.muyu.scope;\n" +
+            "\n" +
+            "/**\n" +
+            " * @Author: DongZeLiang\n" +
+            " * @date: 2024/4/29\n" +
+            " * @Description: 任务上下文\n" +
+            " * @Version: 1.0\n" +
+            " */\n" +
+            "public class TaskContext {\n" +
+            "\n" +
+            "    public static TaskContext build(){\n" +
+            "        return new TaskContext();\n" +
+            "    }\n" +
+            "}\n"
+        },
+        { type: "资产集", value: "recordContext", "code":
+            "package com.muyu.scope;\n" +
+            "\n" +
+            "/**\n" +
+            " * @Author: DongZeLiang\n" +
+            " * @date: 2024/4/29\n" +
+            " * @Description: 数据集\n" +
+            " * @Version: 1.0\n" +
+            " */\n" +
+            "public class DataSetContext {\n" +
+            "\n" +
+            "    private final RecordContext recordContext;\n" +
+            "\n" +
+            "    public DataSetContext (RecordContext recordContext) {\n" +
+            "        this.recordContext = recordContext;\n" +
+            "    }\n" +
+            "}\n" },
+        { type: "资产记录", value: "dataSetContext", "code":
+            "package com.muyu.scope;\n" +
+            "\n" +
+            "/**\n" +
+            " * @Author: DongZeLiang\n" +
+            " * @date: 2024/4/29\n" +
+            " * @Description: 记录/资产模型\n" +
+            " * @Version: 1.0\n" +
+            " */\n" +
+            "public class RecordContext {\n" +
+            "\n" +
+            "    private final TaskContext taskContext;\n" +
+            "\n" +
+            "    public RecordContext (TaskContext taskContext) {\n" +
+            "        this.taskContext = taskContext;\n" +
+            "    }\n" +
+            "}\n" },
+        { type: "资产模型", value: "dataModelContext", "code":
+            "package com.muyu.scope;\n" +
+            "\n" +
+            "/**\n" +
+            " * @Author: DongZeLiang\n" +
+            " * @date: 2024/4/29\n" +
+            " * @Description: 数据模型\n" +
+            " * @Version: 1.0\n" +
+            " */\n" +
+            "public class DataModelContext {\n" +
+            "\n" +
+            "    private final DataSetContext dataSetContext;\n" +
+            "\n" +
+            "    public DataModelContext (DataSetContext dataSetContext) {\n" +
+            "        this.dataSetContext = dataSetContext;\n" +
+            "    }\n" +
+            "}\n" }
+      ]
+    }
+  },
+  created() {
+  },
+  methods: {}
+}
+</script>
+
+<style>
+.el-col {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/ruleengine/engineVersion/index.vue b/src/views/ruleengine/engineVersion/index.vue
new file mode 100644
index 0000000..a4bd352
--- /dev/null
+++ b/src/views/ruleengine/engineVersion/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <div>
+    {{ruleEngineId}}
+    <div ref="editor" style="height: 300px; border: 1px solid #ccc; padding: 10px;"></div>
+  </div>
+</template>
+
+<script>
+import 'codemirror/lib/codemirror.css';
+import 'codemirror/mode/javascript/javascript.js';
+import CodeMirror from 'codemirror';
+import {getRuleContent, ruleengine} from "@/api/ruleengine/ruleengine";
+export default {
+  name: "EngineVersion",
+  data() {
+    return {
+      ruleEngineId:0,
+      editor: null,
+      ruleContentReq:{},
+      value:''
+    }
+  },
+  watch: {
+    '$route.query.id': function(toVal, oldVal) {
+      this.ruleEngineId = toVal;
+      if (this.ruleEngineId) {
+        this.getRuleContentAndUpdateEditor();
+      }
+    }
+  },
+  created() {
+    this.ruleEngineId=this.$route.query && this.$route.query.id
+    // 初始化 CodeMirror（如果尚未初始化）
+    if (!this.editor) {
+      this.$nextTick(() => {
+        this.editor = CodeMirror(this.$refs.editor, {
+          value: "",
+          mode: "javascript",
+          lineNumbers: true,
+        });
+        if (this.ruleEngineId) {
+          this.getRuleContentAndUpdateEditor();
+        }
+      });
+    }
+  },
+  methods: {
+    getRuleContentAndUpdateEditor() {
+      getRuleContent(this.ruleEngineId).then(
+        res => {
+          if (res && res.data && res.data.ruleContent) {
+            console.log('Received rule content:', res.data.ruleContent);
+            this.editor.setValue(res.data.ruleContent);
+          } else {
+            console.log('No rule content found for id', this.ruleEngineId);
+          }
+        }
+      ).catch(error => {
+        console.error('Error fetching rule content:', error);
+      });
+    },
+    tosend(){
+      const code = this.editor.getValue();
+      this.ruleContentReq.ruleContent=code
+      console.log(this.ruleContentReq)
+      ruleengine(this.ruleContentReq).then(
+        res=>{
+          this.$message.success(res.data)
+        }
+      )
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/rule_engine/maintenance/index.vue b/src/views/ruleengine/ruleengine/index.vue
similarity index 66%
rename from src/views/rule_engine/maintenance/index.vue
rename to src/views/ruleengine/ruleengine/index.vue
index 9abcd0d..c0a49e0 100644
--- a/src/views/rule_engine/maintenance/index.vue
+++ b/src/views/ruleengine/ruleengine/index.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="规则名称" prop="name" >
-        <el-input style="width:190px"
+      <el-form-item label="规则名称" prop="name">
+        <el-input
           v-model="queryParams.name"
           placeholder="请输入规则名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="规则类型" prop="type" >
-        <el-select v-model="queryParams.type" placeholder="请选择规则类型" style="width:190px" clearable>
+      <el-form-item label="规则类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择规则类型" clearable>
           <el-option
             v-for="dict in dict.type.rule_engine_type"
             :key="dict.value"
@@ -19,8 +19,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否激活" prop="isActivate" >
-        <el-select v-model="queryParams.isActivate" placeholder="请选择是否激活" style="width:190px" clearable>
+      <el-form-item label="是否激活" prop="isActivate">
+        <el-select v-model="queryParams.isActivate" placeholder="请选择是否激活" clearable>
           <el-option
             v-for="dict in dict.type.rule_engine_activate_status"
             :key="dict.value"
@@ -29,8 +29,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="规则状态" prop="status" >
-        <el-select v-model="queryParams.status" placeholder="请选择规则状态" style="width:190px" clearable>
+      <el-form-item label="规则状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择规则状态" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -54,7 +54,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:engine:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -65,25 +66,37 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:engine:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:engine:export']"
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="engineList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="规则名称" align="center" prop="name" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="规则名称" align="center" prop="name"/>
       <el-table-column label="规则类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.rule_engine_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="规则作用域" align="center" prop="scope">
+      <el-table-column label="规则作用域" align="center" prop="level">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.rule_engine_level" :value="scope.row.scope"/>
+          <dict-tag :options="dict.type.rule_engine_level" :value="scope.row.level"/>
         </template>
       </el-table-column>
-      <el-table-column label="引擎编码" align="center" prop="engineCode" />
+      <el-table-column label="引擎编码" align="center" prop="code"/>
       <el-table-column label="是否激活" align="center" prop="isActivate">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.rule_engine_activate_status" :value="scope.row.isActivate"/>
@@ -96,27 +109,42 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="loader(scope.row)"
+          >加载
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="addEngine(scope.row)"
+          >代码编辑
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-takeaway-box"
             @click="toEngineVersion(scope.row)"
             v-hasPermi="['system:engine:edit']"
-          >规则维护</el-button>
+          >规则维护
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:engine:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:engine:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -135,12 +163,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="规则名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入规则名称" />
+              <el-input v-model="form.name" placeholder="请输入规则名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="规则编码" prop="code">
-              <el-input v-model="form.engineCode" placeholder="请输入规则编码" />
+              <el-input v-model="form.code" placeholder="请输入规则编码"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -158,8 +186,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规则级别" prop="scope">
-              <el-select v-model="form.scope" placeholder="请选择规则级别" style="width: 100%">
+            <el-form-item label="规则级别" prop="level">
+              <el-select v-model="form.level" placeholder="请选择规则级别" style="width: 100%">
                 <el-option
                   v-for="dict in dict.type.rule_engine_level"
                   :key="dict.value"
@@ -178,7 +206,8 @@
                   v-for="dict in dict.type.rule_engine_activate_status"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                >{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -189,7 +218,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                >{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -202,7 +232,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -212,15 +242,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!--编写代码-->
+    <el-dialog
+      title="代码编辑器"
+      :visible.sync="dialogVisible"
+      width="50%"
+    >
+      <div ref="editor" style="height: 300px; border: 1px solid #ccc; padding: 10px;"></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="tosend">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-
-import {addMaintenance, delMaintenance, listMaintenance, updateMaintenance} from "@/api/rule_engine/maintenance";
+import 'codemirror/lib/codemirror.css';
+import 'codemirror/mode/javascript/javascript.js';
+import CodeMirror from 'codemirror';
+import {
+  addRuleengine,
+  getRuleengine,
+  listRuleengine,
+  loader,
+  ruleengine,
+  updateRuleengine
+} from "@/api/ruleengine/ruleengine";
 
 export default {
-  name: "maintenance",
+  name: "EngineMaintenance",
   dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
   data() {
     return {
@@ -257,52 +309,87 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "规则名称不能为空", trigger: "blur" }
+          {required: true, message: "规则名称不能为空", trigger: "blur"}
         ],
         type: [
-          { required: true, message: "规则类型不能为空", trigger: "change" }
+          {required: true, message: "规则类型不能为空", trigger: "change"}
         ],
-        engineCode: [
-          { required: true, message: "规则编码不能为空", trigger: "blur" }
+        code: [
+          {required: true, message: "规则编码不能为空", trigger: "blur"}
         ],
         level: [
-          { required: true, message: "规则级别不能为空", trigger: "change" }
+          {required: true, message: "规则级别不能为空", trigger: "change"}
         ],
         isActivate: [
-          { required: true, message: "是否激活不能为空", trigger: "change" }
+          {required: true, message: "是否激活不能为空", trigger: "change"}
         ],
         status: [
-          { required: true, message: "规则状态不能为空", trigger: "change" }
+          {required: true, message: "规则状态不能为空", trigger: "change"}
         ],
         createBy: [
-          { required: true, message: "创建者不能为空", trigger: "blur" }
+          {required: true, message: "创建者不能为空", trigger: "blur"}
         ],
         createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
+          {required: true, message: "创建时间不能为空", trigger: "blur"}
         ],
-      }
+      },
+      editor: null,
+      isEditorVisible:false,
+      dialogVisible:false,
+      ruleContentReq:{}
     };
   },
   created() {
     this.getList();
   },
-  beforeRouteUpdate(to, from, next) {
-    // 在组件重用时重新加载数据
-    this.getList();
-    next();
-  },
   methods: {
-    toEngineVersion(row){
-      this.$router.push({ path: `version/${row.id}`});
+    addEngine(row) {
+      this.ruleContentReq.ruleId=row.id
+      this.isEditorVisible = true
+      this.dialogVisible = true;
+      // 初始化 CodeMirror（如果尚未初始化）
+      if (!this.editor) {
+        this.$nextTick(() => {
+          this.editor = CodeMirror(this.$refs.editor, {
+            value: "public class Test {\n    public boolean execute(String name) {\n        if (name == null || name.length() == 0) {\n            System.out.println(\"哈哈哈哈\");\n            return true;\n        }\n        return false;\n    }\n}",
+            mode: "javascript",
+            lineNumbers: true,
+          });
+        });
+      }
+    },
+    loader(){
+      loader().then(
+        res=>{
+          this.$message.success(res.data)
+        }
+      )
+    },
+    tosend(){
+      const code = this.editor.getValue();
+      this.ruleContentReq.ruleContent=code
+      console.log(this.ruleContentReq)
+      ruleengine(this.ruleContentReq).then(
+        res=>{
+          this.$message.success(res.data)
+        }
+      )
+    },
+    toEngineVersion(row) {
+      console.log(row)
+      this.$router.push({path: '/ruleengine/engineVersion', query: {id: row.id}});
     },
     /** 查询规则引擎列表 */
     getList() {
       this.loading = true;
-      listMaintenance(this.queryParams).then(response=>{
-        this.engineList = response.data.rows;
-        this.total = response.data.total;
-        this.loading = false;
-      })
+      listRuleengine(this.queryParams).then(
+        response => {
+          this.engineList = response.data.rows;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      )
+
     },
     // 取消按钮
     cancel() {
@@ -315,10 +402,9 @@ export default {
         id: null,
         name: null,
         type: null,
-        scope:null,
-        engineCode:null,
-        isActivate: "N",
+        isActivate: "no-activate",
         status: "0",
+        description: null,
         remark: null
       };
       this.resetForm("form");
@@ -348,26 +434,29 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.form = row;
-      this.open = true;
-      this.title = "修改规则引擎";
+      const id = row.id || this.ids
+      getRuleengine(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改规则引擎";
+      });
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateMaintenance(this.form).then(response=>{
+            updateRuleengine(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.getList();
               this.open = false;
-            })
+              this.getList();
+            });
           } else {
-            addMaintenance(this.form).then(response=>{
+            addRuleengine(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.getList();
               this.open = false;
-            })
+              this.getList();
+            });
           }
         }
       });
@@ -375,11 +464,19 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除规则引擎编号为"' + ids + '"的数据项？').then(() => {
-        delMaintenance(ids).then(response=>{
-          this.$modal.msgSuccess("删除成功");
-        })
+      this.$modal.confirm('是否确认删除规则引擎编号为"' + ids + '"的数据项？').then(function () {
+        return delRuleengine(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
       });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ruleengine/ruleengine/export', {
+        ...this.queryParams
+      }, `ruleengine_${new Date().getTime()}.xlsx`)
     }
   }
 };