feat() 规则维护页面,列表,添加功能

src/api/data/engine.js

@@ -35,7 +35,7 @@ export function updateEngine(data) {
   })
 }
 
-// 修改引擎维护
+// 修改引擎维护是否激活
 export function updateEngineActivatedOrNot(data) {
   return request({
     url: '/data/engine/editActivatedOrNot',
@@ -44,7 +44,7 @@ export function updateEngineActivatedOrNot(data) {
   })
 }
 
-// 修改引擎维护
+// 修改引擎维护是否开启
 export function updateEngineStatus(data) {
   return request({
     url: '/data/engine/editStatus',
@@ -53,6 +53,14 @@ export function updateEngineStatus(data) {
   })
 }
 
+// 查询引擎维护和版本详细
+export function getEngineAndEngineVersion(id) {
+  return request({
+    url: '/data/engine/queryEngineAndEngineVersion/' + id,
+    method: 'get'
+  })
+}
+
 // 删除引擎维护
 export function delEngine(id) {
   return request({

src/api/data/engineVersion.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 新增引擎维护
+export function addEngineVersion(data) {
+  return request({
+    url: '/data/engineVersion',
+    method: 'post',
+    data: data
+  })
+}

src/views/data/rule/engineVersion/index.vue

@@ -38,10 +38,10 @@
         <span>规则引擎版本</span>
       </div>
       <el-row :gutter="20">
-        <el-col :span="12" v-for="ruleEngineVersion in ruleEngineInfo.ruleEngineVersionList">
+        <el-col :span="12" v-for="ruleEngineVersion in ruleEngineInfo.engineRuleVersionList">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span>{{ ruleEngineVersion.name + "-" + ruleEngineVersion.code }}</span>
+              <span>{{ ruleEngineVersion.versionName + "-" + ruleEngineVersion.versionCode }}</span>
               <el-dropdown style="float: right; padding: 3px 0" @command="checkRuleEngineVersion">
                 <span class="el-dropdown-link">
                   更多操作<i class="el-icon-arrow-down el-icon--right"></i>
@@ -49,7 +49,9 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="{event: 'info', ruleEngineVersion: ruleEngineVersion}">规则详情
                   </el-dropdown-item>
-                  <el-dropdown-item :command="{event: 'test', ruleEngineVersion: ruleEngineVersion}">测试规则
+                  <el-dropdown-item :command="{event: 'test', ruleEngineVersion: ruleEngineVersion}"
+                                    :disabled="ruleEngineVersion.status === '0'"
+                  >测试规则
                   </el-dropdown-item>
                   <el-dropdown-item :command="{event: 'status', ruleEngineVersion: ruleEngineVersion}"
                                     :disabled="ruleEngineVersion.status !== '2'">
@@ -64,17 +66,17 @@
               </el-dropdown>
             </div>
             <el-descriptions class="margin-top" :column="2" border>
-              <el-descriptions-item label="版本类" :span="2"> {{ ruleEngineVersion.versionCode }}</el-descriptions-item>
+              <el-descriptions-item label="版本类" :span="2"> {{ ruleEngineVersion.versionClass }}</el-descriptions-item>
-              <el-descriptions-item label="版本名称"> {{ ruleEngineVersion.name }}</el-descriptions-item>
+              <el-descriptions-item label="版本名称"> {{ ruleEngineVersion.versionName }}</el-descriptions-item>
-              <el-descriptions-item label="版本CODE"> {{ ruleEngineVersion.code }}</el-descriptions-item>
+              <el-descriptions-item label="版本CODE"> {{ ruleEngineVersion.versionCode }}</el-descriptions-item>
               <el-descriptions-item label="是否激活">
-                <dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineVersion.isActivate"/>
+                <dict-tag :options="dict.type.activated_or_not" :value="ruleEngineVersion.activatedOrNot"/>
               </el-descriptions-item>
               <el-descriptions-item label="版本状态">
-                <dict-tag :options="dict.type.rule_engine_version_status" :value="ruleEngineVersion.status"/>
+                <dict-tag :options="dict.type.version_type" :value="ruleEngineVersion.versionType"/>
               </el-descriptions-item>
               <el-descriptions-item label="是否测试">
-                <dict-tag :options="dict.type.rule_engine_activate_is_test" :value="ruleEngineVersion.isTest"/>
+                <dict-tag :options="dict.type.yes_no_test" :value="ruleEngineVersion.yesNoTest"/>
               </el-descriptions-item>
             </el-descriptions>
             <editor style="margin-top: 10px" :read-only="true" v-model="ruleEngineVersion.description"></editor>
@@ -83,19 +85,17 @@
       </el-row>
     </el-card>
     <el-dialog
-      title="新增版本" :visible.sync="addVersionStatus"
+      title="新增版本" :visible.sync="addVersionStatus" width="75%">
-      width="75%">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>基本信息</span>
-          <el-button style="float: right; padding: 3px 0" type="text" @click="genEngineVersion">生成引擎版本类
+          <el-button style="float: right; padding: 3px 0" type="text" @click="genEngineVersion">生成引擎版本类</el-button>
-          </el-button>
         </div>
         <el-form :label-position="engineVersionForm" label-width="80px" :model="engineVersionForm">
           <el-row>
             <el-col :span="24">
               <el-form-item label="版本类">
-                <el-input v-model="engineVersionForm.versionCode" disabled
+                <el-input v-model="engineVersionForm.versionClass" disabled
                           placeholder="点击类生成自动生成类名称"></el-input>
               </el-form-item>
             </el-col>
@@ -103,35 +103,35 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="名称">
-                <el-input v-model="engineVersionForm.name"></el-input>
+                <el-input v-model="engineVersionForm.versionName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="编码">
-                <el-input v-model="engineVersionForm.code"></el-input>
+                <el-input v-model="engineVersionForm.versionCode"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="状态">
-                <dict-tag :options="dict.type.rule_engine_version_status" :value="engineVersionForm.status"/>
+                <dict-tag :options="dict.type.version_type" :value="engineVersionForm.versionType"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否激活">
-                <dict-tag :options="dict.type.rule_engine_activate_status" :value="engineVersionForm.isActivate"/>
+                <dict-tag :options="dict.type.activated_or_not" :value="engineVersionForm.activatedOrNot"/>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <editor v-model="engineVersionForm.description" :min-height="150"/>
       </el-card>
-      <el-card class="box-card" v-if="engineVersionForm.codeIng != null">
+      <el-card class="box-card" v-if="engineVersionForm.codeText != null">
         <div slot="header" class="clearfix">
           <span>引擎编码</span>
         </div>
-        <encoding style="height: 800px" v-model="engineVersionForm.codeIng"></encoding>
+        <encoding style="height: 800px" v-model="engineVersionForm.codeText"></encoding>
       </el-card>
 
       <span slot="footer" class="dialog-footer">
@@ -140,28 +140,131 @@
       </span>
     </el-dialog>
     <el-drawer
-      title="规则版本详情" size="80%"
+      title="规则版本详情" size="80%" :before-close="ruleEngineVersionInfoStatusClose"
       :visible.sync="ruleEngineVersionInfoStatus"
       :direction="'rtl'">
+      <div class="app-container">
+        <el-descriptions v-if="ruleEngineVersionInfoAndTest != null" class="margin-top" :column="2" border>
+          <el-descriptions-item label="版本类" :span="2"> {{ ruleEngineVersionInfoAndTest.versionCode }}
+          </el-descriptions-item>
+          <el-descriptions-item label="版本名称"> {{ ruleEngineVersionInfoAndTest.name }}</el-descriptions-item>
+          <el-descriptions-item label="版本CODE"> {{ ruleEngineVersionInfoAndTest.code }}</el-descriptions-item>
+          <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>
+          <el-descriptions-item label="是否测试">
+            <dict-tag :options="dict.type.rule_engine_activate_is_test" :value="ruleEngineVersionInfoAndTest.isTest"/>
+          </el-descriptions-item>
+        </el-descriptions>
+        <editor style="margin-top: 10px" :read-only="true" :min-height="100"
+                v-model="ruleEngineVersionInfoAndTest.description"></editor>
+        <el-row style="margin-top: 10px">
+          <el-button @click="saveCoding">保存代码</el-button>
+        </el-row>
+        <encoding style="height: 800px; margin-top: 20px" v-model="ruleEngineVersionInfoAndTest.codeIng"></encoding>
+      </div>
 
     </el-drawer>
     <el-drawer
-      title="规则版本测试" size="80%"
+      title="规则版本测试" size="80%" :before-close="ruleEngineVersionTestStatusClose"
       :visible.sync="ruleEngineVersionTestStatus"
       :direction="'rtl'">
-
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-descriptions v-if="ruleEngineVersionInfoAndTest != null" class="margin-top" :column="2" border>
+            <el-descriptions-item label="版本类" :span="2"> {{ ruleEngineVersionInfoAndTest.versionCode }}
+            </el-descriptions-item>
+            <el-descriptions-item label="版本名称"> {{ ruleEngineVersionInfoAndTest.name }}</el-descriptions-item>
+            <el-descriptions-item label="版本CODE"> {{ ruleEngineVersionInfoAndTest.code }}</el-descriptions-item>
+            <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>
+            <el-descriptions-item label="是否测试">
+              <dict-tag :options="dict.type.rule_engine_activate_is_test" :value="ruleEngineVersionInfoAndTest.isTest"/>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+        <el-col :span="12">
+          <editor style="margin-top: 10px" :read-only="true" :min-height="105"
+                  v-model="ruleEngineVersionInfoAndTest.description"></editor>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <encoding style="margin-top: 20px" v-model="ruleEngineVersionInfoAndTest.codeIng"
+                    :read-only="true"></encoding>
+        </el-col>
+        <el-col :span="12">
+          <el-col :span="assetStructure == null ? 24 : 12">
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>选择数据接入</span>
+              </div>
+              <el-select v-model="assetStructure" style="width: 100%;">
+                <el-option v-for="_assetStructure in assetStructureList"
+                           :key="_assetStructure.name"
+                           :value="_assetStructure.name"
+                           :label="_assetStructure.name+'('+_assetStructure.systemName+')'"
+                ></el-option>
+              </el-select>
+            </el-card>
+          </el-col>
+          <el-col :span="12" v-if="assetStructure != null">
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>选择资产结构</span>
+              </div>
+              <el-select v-model="assets" style="width: 100%;">
+                <el-option v-for="_assets in assetsList"
+                           :key="_assets.name"
+                           :value="_assets.name"
+                           :label="_assets.name+'('+_assets.as+')'"
+                ></el-option>
+              </el-select>
+            </el-card>
+          </el-col>
+          <el-col :span="24">
+            <el-card class="box-card" v-if="assets != null">
+              <div slot="header" class="clearfix">
+                <span>选择资产模型</span>
+              </div>
+              <el-descriptions direction="vertical" :column="3" border>
+                <el-descriptions-item v-for="_dataModel in dataModelList"
+                                      :label='_dataModel.name + "("+_dataModel.comment+")"'>
+                  <el-radio v-model="dataMode" :label="_dataModel.name" :value="_dataModel.id">
+                    {{ dataModeMap[_dataModel.name] }}
+                  </el-radio>
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-card>
+          </el-col>
+          <el-col :span="24" style="margin-top: 10px" v-if="dataMode != null">
+            <el-button>测试</el-button>
+            <el-input style="margin-top: 10px" v-model="testResult" type="textarea" placeholder="请点击测试"/>
+          </el-col>
+        </el-col>
+      </el-row>
     </el-drawer>
   </div>
 </template>
 
 <script>
 import Encoding from "@/components/Encoding/index.vue";
-import {getEngine, updateEngineActivatedOrNot, updateEngineStatus} from "@/api/data/engine";
+import {getEngine, getEngineAndEngineVersion, updateEngineActivatedOrNot, updateEngineStatus} from "@/api/data/engine";
+import {addEngineVersion} from "@/api/data/engineVersion";
 
 export default {
   name: "EngineVersion",
   components: {Encoding},
-  dicts: ['activated_or_not', 'status', 'scope', 'type'],
+  dicts: ['activated_or_not', 'status', 'scope', 'type', 'version_type'],
   // dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable',
   //   'rule_engine_level', 'rule_engine_version_status', 'rule_engine_activate_is_test'],
   data() {
@@ -171,31 +274,187 @@ export default {
       // 新增版本
       addVersionStatus: false,
       engineVersionForm: {
-        "name": "", "code": "", "status": "0",
+        versionType: 1,
-        "versionCode": "",
+        activatedOrNot: 'N',
-        "isActivate": "no-activate",
-        "description": "",
-        "codeIng": null
       },
       // 详情抽屉状态
       ruleEngineVersionInfoStatus: false,
       // 测试抽屉状态
       ruleEngineVersionTestStatus: false,
-
+      // 弹框抽屉
+      ruleEngineVersionInfoAndTest: {},
+      // 数据接入集合
+      assetStructureList: [
+        {
+          name: "测试1",
+          systemName: "云计算系统",
+          databaseName: "yunjisuan",
+          type: "dataSource"
+        },
+        {
+          name: "测试2",
+          systemName: "网站系统",
+          databaseName: "wangzhan",
+          type: "dataSource"
+        },
+        {
+          name: "测试3",
+          systemName: "物联网系统",
+          databaseName: "wulianwang",
+          type: "dataSource"
+        },
+        {
+          name: "测试4",
+          systemName: "传媒系统",
+          databaseName: "chuanmei",
+          type: "dataSource"
+        },
+      ],
+      // 数据接入集合选择
+      assetStructure: null,
+      // 数据资产
+      assetsList: [
+        {
+          name: "sys_user",
+          as: "用户表",
+          dataTotal: 635847,
+          type: "dataTable",
+          childrenList: []
+        },
+        {
+          name: "sys_dept",
+          as: "部门表",
+          dataTotal: 362548,
+          type: "dataTable",
+          childrenList: []
+        },
+        {
+          name: "sys_notice",
+          as: "通知公告",
+          dataTotal: 6347,
+          type: "dataTable",
+          childrenList: []
+        }
+      ],
+      // 数据资产选择
+      assets: null,
+      // 数据模型
+      dataModelList: [
+        {
+          id: 1,
+          name: "id",
+          comment: "主键",
+          isPrimaryKey: "Y",
+          type: "bigint",
+          mappingType: "Long",
+          length: "-",
+          decimalPlaces: "-",
+          isNull: "N",
+          defaultValue: "-",
+          isDict: "N",
+          dictKey: "-",
+        }, {
+          id: 2,
+          name: "name",
+          comment: "姓名",
+          isPrimaryKey: "N",
+          type: "varchar",
+          mappingType: "String",
+          length: "64",
+          decimalPlaces: "-",
+          isNull: "N",
+          defaultValue: "-",
+          isDict: "N",
+          dictKey: "-",
+        }, {
+          id: 3,
+          name: "sex",
+          comment: "性别",
+          isPrimaryKey: "N",
+          type: "char",
+          mappingType: "String",
+          length: "1",
+          decimalPlaces: "-",
+          isNull: "N",
+          defaultValue: "-",
+          isDict: "Y",
+          dictKey: "system_sex",
+        }, {
+          id: 4,
+          name: "price",
+          comment: "金额",
+          isPrimaryKey: "N",
+          type: "double",
+          mappingType: "BigDecimal",
+          length: "10",
+          decimalPlaces: "2",
+          isNull: "N",
+          defaultValue: "0.00",
+          isDict: "N",
+          dictKey: "-",
+        }, {
+          id: 5,
+          name: "create_time",
+          comment: "创建时间",
+          isPrimaryKey: "N",
+          type: "datetime",
+          mappingType: "Date",
+          length: "-",
+          decimalPlaces: "-",
+          isNull: "Y",
+          defaultValue: "-",
+          isDict: "N",
+          dictKey: "-",
+        },],
+      // 数据模型选择
+      dataMode: null,
+      // 数据示例
+      dataModeMap: {
+        id: 1,
+        name: "张三",
+        sex: 1,
+        price: "653.69",
+        create_time: "2024-5-7 16:37:16",
+      },
+      testResult: ""
     }
   },
   created() {
     this.initRuleEngine();
   },
   methods: {
+
+    saveCoding() {
+      this.$message.success('编码保存成功');
+    },
+    ruleEngineVersionInfoStatusClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.ruleEngineVersionInfoAndTest = {};
+          done();
+        })
+        .catch(_ => {
+        });
+    },
+    ruleEngineVersionTestStatusClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.ruleEngineVersionInfoAndTest = {};
+          done();
+        })
+        .catch(_ => {
+        });
+    },
     // 点击规则事件
     checkRuleEngineVersion(command) {
       switch (command.event) {
         case "info"://详情
-          this.ruleEngineVersionInfoStatus = true
+          this.ruleEngineVersionInfoStatus = true;
+          this.ruleEngineVersionInfoAndTest = command.ruleEngineVersion;
           break;
         case "test"://测试
-          this.ruleEngineVersionTestStatus = true
+          this.ruleEngineVersionTestStatus = true;
+          this.ruleEngineVersionInfoAndTest = command.ruleEngineVersion;
           break;
         case "status"://激活状态
           command.ruleEngineVersion.isActivate = 'no-activate' === command.ruleEngineVersion.isActivate ? 'activated' : 'no-activate'
@@ -209,11 +468,11 @@ export default {
     },
     // 生成规则版本
     genEngineVersion() {
-      if (this.engineVersionForm.name == null || this.engineVersionForm.name === "") {
+      if (this.engineVersionForm.versionName == null || this.engineVersionForm.versionName === "") {
         this.$message.error('规则名称不可为空');
         return false;
       }
-      if (this.engineVersionForm.code == null || this.engineVersionForm.code === "") {
+      if (this.engineVersionForm.versionCode == null || this.engineVersionForm.versionCode === "") {
         this.$message.error('规则CODE不可为空');
         return false;
       }
@@ -221,27 +480,42 @@ export default {
         this.$message.error('规则版本使用描述不可为空');
         return false;
       }
-      this.engineVersionForm.versionCode = this.ruleEngineInfo.engineCode + "_" + this.engineVersionForm.code
+      this.engineVersionForm.versionClass = this.ruleEngineInfo.encoding + "_" + this.engineVersionForm.versionCode
-      this.engineVersionForm.codeIng = this.getCodeIng()
+      var codeIng = this.getCodeIng();
+      this.$set( this.engineVersionForm, 'codeText', codeIng)
     },
     // 确定新增
     addVersionSubmission() {
-      this.ruleEngineInfo.ruleEngineVersionList.push({...this.engineVersionForm})
+      if (this.engineVersionForm.codeText == null || this.engineVersionForm.codeText === "") {
-      this.addVersionStatus = false;
+        this.$message.error('规则类不可为空');
+        return;
+      }
+      let version = 0;
+      this.engineVersionForm.engineRuleId = this.ruleEngineInfo.id;
+      this.ruleEngineInfo.engineRuleVersionList.forEach(item => {
+        if (item.versionCode === this.engineVersionForm.versionCode) {
+          version ++;
+        }
+      })
+      if (version != 0){
+        this.$message.error('版本CODE已存在');
+        return;
+      }
+      addEngineVersion(this.engineVersionForm).then(response => {
+        this.initRuleEngine();
+        this.$modal.msgSuccess("新增规则版本成功");
+        this.addVersionStatus = false;
+        this.engineVersionForm = {}
+      })
     },
     // 取消新增
     addVersionCancel() {
-      this.engineVersionForm = {
+      this.engineVersionForm = {};
-        "name": "", "code": "", "status": "0", "isTest": "0",
-        "versionCode": "",
-        "isActivate": "no-activate",
-        "description": "",
-        "codeIng": null, "ruleEngineVersionList": []
-      };
       this.addVersionStatus = false;
     },
     handleClick(clickType) {
       if (clickType === "add") {
+        this.addVersionStatus = true;
       } else if (clickType === "activatedOrNot") {
         updateEngineActivatedOrNot(this.ruleEngineInfo).then(response => {
           if (response.data) {
@@ -259,7 +533,7 @@ export default {
       }
     },
     initRuleEngine() {
-      getEngine(this.ruleEngineId).then(response => {
+      getEngineAndEngineVersion(this.ruleEngineId).then(response => {
         this.ruleEngineInfo = response.data;
       })
     },
@@ -278,10 +552,10 @@ import com.muyu.engine.scope.${parentClass};
 /**
  * @Author: DongZeLiang
  * @date: 2024/5/6
- * @Description: ${this.engineVersionForm.name}-${this.engineVersionForm.code}
+ * @Description: ${this.engineVersionForm.versionName}-${this.engineVersionForm.versionCode}
  * @Version: 1.0
  */
-public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
+public class ${this.engineVersionForm.versionClass} extends ${parentClass} {
     @Override
     public void execution () {
         Object value = getValue();
@@ -311,4 +585,8 @@ public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
 .el-icon-arrow-down {
   font-size: 12px;
 }
+
+.CodeMirror {
+  height: 600px;
+}
 </style>