sunshine7058
/
ETL-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:规则引擎版本修复id为null的bug

ruoyi_test
sunshine7058 2024-05-09 21:52:33 +08:00
parent ff550d4ab2
commit 252289d0af
5 changed files with 434 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/api/rule_engine/maintenance.js
View File

@ -29,7 +29,7 @@ export function addMaintenance(data) {
// 修改引擎维护
export function updateMaintenance(data) {
return request({
url: '/ruleEngine/maintenance/'+data.id,
url: '/ruleEngine/maintenance/' + data.id,
method: 'put',
data: data
})
@ -42,3 +42,43 @@ export function delMaintenance(id) {
method: 'delete'
})
}
// 查询规则引擎版本列表
export function getRuleEngineInfo(id) {
return request({
url: '/ruleEngine/maintenance/getRuleEngineInfo/' + id,
method: 'put'
})
}
// 通过引擎维护编号激活引擎
export function activateEngine(id) {
return request({
url: '/ruleEngine/maintenance/activateEngine/' + id,
method: 'put'
})
}
// 通过引擎维护编号禁用引擎
export function forbiddenEngine(id) {
return request({
url: '/ruleEngine/maintenance/forbiddenEngine/' + id,
method: 'put'
})
}
// 通过引擎维护编号开启引擎
export function onEngine(id) {
return request({
url: '/ruleEngine/maintenance/onEngine/' + id,
method: 'put'
})
}
// 通过引擎维护编号关闭引擎
export function closeEngine(id) {
return request({
url: '/ruleEngine/maintenance/closeEngine/' + id,
method: 'put'
})
}

31
src/api/rule_engine/config.js → src/api/rule_engine/version.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
//查询规则配置作用域列表
export function listScope() {
return request({
url: '/ruleEngine/config/getScopeList',
url: '/ruleEngine/version/getScopeList',
method: 'get'
})
}
@ -11,15 +11,15 @@ export function listScope() {
//查询规则配置作用域
export function getScope(query) {
return request({
url: '/ruleEngine/config/getScopeInfo/'+query,
url: '/ruleEngine/version/getScopeInfo/' + query,
method: 'get'
})
}
// 查询引擎规则配置列表
export function listConfig(query) {
export function listVersion(query) {
return request({
url: '/ruleEngine/config/list',
url: '/ruleEngine/version/list',
method: 'get',
params: query
})
@ -28,35 +28,44 @@ export function listConfig(query) {
// 测试引擎规则配置
export function ruleTest(data) {
return request({
url: '/ruleEngine/config/test',
url: '/ruleEngine/version/test',
method: 'post',
data: data
})
}
// 新增引擎规则配置
export function addConfig(data) {
export function addVersion(data) {
return request({
url: '/ruleEngine/config',
url: '/ruleEngine/version',
method: 'post',
data: data
})
}
// 修改引擎规则配置
export function updateConfig(data) {
export function updateVersion(data) {
return request({
url: '/ruleEngine/config/'+data.id,
url: '/ruleEngine/version/' + data.id,
method: 'put',
data: data
})
}
// 删除引擎规则配置
export function delConfig(id) {
export function delVersion(id) {
return request({
url: '/ruleEngine/config/' + id,
url: '/ruleEngine/version/' + id,
method: 'delete'
})
}
// 修改引擎规则配置
export function createVersionClass(data) {
return request({
url: '/ruleEngine/version/createVersionClass',
method: 'post',
data: data
})
}

137
src/views/rule_engine/config/index.vue
View File

@ -6,46 +6,13 @@
</div>
<el-form ref="form" :model="ruleEngineCommonConfig" label-width="120px">
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="规则基础目录">
<el-input v-model="ruleEngineCommonConfig.packageName" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="自定义基础目录">
<el-input v-model="ruleEngineCommonConfig.customName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="模板基础目录">
<el-input v-model="ruleEngineCommonConfig.templateName" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="win源码目录">
<el-input v-model="ruleEngineCommonConfig.sourceWin" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="win编译目录">
<el-input v-model="ruleEngineCommonConfig.targetWin" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="liunx源码目录">
<el-input v-model="ruleEngineCommonConfig.sourceLiunx" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="liunx编译目录">
<el-input v-model="ruleEngineCommonConfig.targetLiunx" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -55,9 +22,10 @@
<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: 600px" v-model="scope.code" :read-only="true"></encoding>
<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>
@ -66,98 +34,31 @@
</template>
<script>
import Encoding from "@/components/Encoding/index.vue";
import {listScope} from "@/api/rule_engine/version";
export default {
name: "EngineConfig",
name: "config",
components: {Encoding},
data() {
return {
codeCardStatus: "taskContext",
activeName: '0',
ruleEngineCommonConfig: {
packageName: "com.muyu.rule.engine",
customName: "custom",
templateName: "template",
sourceWin: "D:\\config\\engine\\source",
targetWin: "D:\\config\\engine\\target",
sourceLiunx: "/home/config/source",
targetLiunx: "/home/config/target",
packageName: "com.ruoyi.ruleEngine",
},
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" }
]
scopeList: []
}
},
created() {
this.getList();
},
methods: {}
methods: {
getList() {
listScope().then(response => {
this.scopeList = response.data;
})
}
}
}
</script>

184
src/views/rule_engine/maintenance/index.vue
View File

@ -2,15 +2,15 @@
<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
v-model="queryParams.name"
placeholder="请输入规则名称"
clearable
@keyup.enter.native="handleQuery"
<el-input style="width:190px"
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="请选择规则类型" clearable>
<el-select v-model="queryParams.type" placeholder="请选择规则类型" style="width:190px" clearable>
<el-option
v-for="dict in dict.type.rule_engine_type"
:key="dict.value"
@ -20,7 +20,7 @@
</el-select>
</el-form-item>
<el-form-item label="是否激活" prop="isActivate">
<el-select v-model="queryParams.isActivate" placeholder="请选择是否激活" clearable>
<el-select v-model="queryParams.isActivate" placeholder="请选择是否激活" style="width:190px" clearable>
<el-option
v-for="dict in dict.type.rule_engine_activate_status"
:key="dict.value"
@ -30,7 +30,7 @@
</el-select>
</el-form-item>
<el-form-item label="规则状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择规则状态" clearable>
<el-select v-model="queryParams.status" placeholder="请选择规则状态" style="width:190px" 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,35 +66,26 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:engine:remove']"
>删除</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-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="level">
<el-table-column label="规则作用域" align="center" prop="scope">
<template slot-scope="scope">
<dict-tag :options="dict.type.rule_engine_level" :value="scope.row.level"/>
<dict-tag :options="dict.type.rule_engine_level" :value="scope.row.scope"/>
</template>
</el-table-column>
<el-table-column label="引擎编码" align="center" prop="code" />
<el-table-column label="引擎编码" align="center" prop="engineCode"/>
<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"/>
@ -112,21 +104,24 @@
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>
@ -145,12 +140,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.code" placeholder="请输入规则编码" />
<el-form-item label="规则编码" prop="engineCode">
<el-input v-model="form.engineCode" placeholder="请输入规则编码"/>
</el-form-item>
</el-col>
</el-row>
@ -162,19 +157,19 @@
v-for="dict in dict.type.rule_engine_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
:value="Number(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规则级别" prop="level">
<el-select v-model="form.level" placeholder="请选择规则级别" style="width: 100%">
<el-form-item label="规则级别" prop="scope">
<el-select v-model="form.scope" placeholder="请选择规则级别" style="width: 100%">
<el-option
v-for="dict in dict.type.rule_engine_level"
:key="dict.value"
:label="dict.label"
:value="dict.value"
:value="Number(dict.value)"
></el-option>
</el-select>
</el-form-item>
@ -188,7 +183,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>
@ -199,7 +195,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>
@ -212,7 +209,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>
@ -227,8 +224,10 @@
<script>
import {addMaintenance, delMaintenance, listMaintenance, updateMaintenance} from "@/api/rule_engine/maintenance";
export default {
name: "EngineMaintenance",
name: "maintenance",
dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
data() {
return {
@ -265,28 +264,28 @@ 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"}
],
code: [
{ required: true, message: "规则编码不能为空", trigger: "blur" }
engineCode: [
{required: true, message: "规则编码不能为空", trigger: "blur"}
],
level: [
{ required: true, message: "规则级别不能为空", trigger: "change" }
scope: [
{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"}
],
}
};
@ -294,58 +293,23 @@ export default {
created() {
this.getList();
},
beforeRouteUpdate(to, from, next) {
// 在组件重用时重新加载数据
this.getList();
next();
},
methods: {
toEngineVersion(row){
this.$router.push({ path: `/rule-engine/engine-version/${row.id}`});
toEngineVersion(row) {
this.$router.push({path: `/version/${row.id}`});
},
/** 查询规则引擎列表 */
getList() {
this.loading = true;
let response = {
"code": 200,
"msg": "查询成功",
"data": {
"total": 1,
"rows": [
{
"id": 1,
"name": "邮箱规则",
"type": "rule-custom",
"isActivate": "no-activate",
"status": "0",
"description": "<p>根据邮箱规则进行数据校验，内包含所有邮箱校验规则</p>",
"remark": "-",
"code": "email",
"level": "data-field"
},
{
"id": 2,
"name": "唯一性校验",
"type": "rule-custom",
"isActivate": "no-activate",
"status": "0",
"description": "<p>根据字段组合匹配等，进行不同数据集合的校验</p>",
"remark": "-",
"code": "only",
"level": "data-field"
},
{
"id": 3,
"name": "远程接口校验",
"type": "rule-custom",
"isActivate": "no-activate",
"status": "0",
"description": "<p>根据接口不同进行，远程API调用匹配是否数据完整</p>",
"remark": "-",
"code": "remote",
"level": "data-field"
},
]
}
};
this.engineList = response.data.rows;
this.total = response.data.total;
this.loading = false;
listMaintenance(this.queryParams).then(response => {
this.engineList = response.data.rows;
this.total = response.data.total;
this.loading = false;
})
},
// 取消按钮
cancel() {
@ -358,9 +322,10 @@ export default {
id: null,
name: null,
type: null,
isActivate: "no-activate",
scope: null,
engineCode: null,
isActivate: "N",
status: "0",
description: null,
remark: null
};
this.resetForm("form");
@ -397,14 +362,19 @@ export default {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
console.log(JSON.stringify(this.form))
if (valid) {
if (this.form.id != null) {
this.$modal.msgSuccess("修改成功");
this.open = false;
updateMaintenance(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.getList();
this.open = false;
})
} else {
this.$modal.msgSuccess("新增成功");
this.open = false;
addMaintenance(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.getList();
this.open = false;
})
}
}
});
@ -413,12 +383,10 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除规则引擎编号为"' + ids + '"的数据项？').then(() => {
this.$modal.msgSuccess("删除成功");
delMaintenance(ids).then(response => {
this.$modal.msgSuccess("删除成功");
})
});
},
/** 导出按钮操作 */
handleExport() {
this.$modal.msgSuccess("导出成功");
}
}
};

469
src/views/rule_engine/version/index.vue
View File

@ -6,20 +6,22 @@
更多操作
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="add">版本添加</el-dropdown-item>
<el-dropdown-item command="activate">{{(ruleEngineInfo.isActivate === 'no-activate' ? "激活": "禁用")+'引擎'}}</el-dropdown-item>
<el-dropdown-item command="status">{{(ruleEngineInfo.status === '0' ? "关闭": "开启")+'引擎'}}</el-dropdown-item>
<el-dropdown-item command="activate">{{ (ruleEngineInfo.isActivate === 'N' ? "激活" : "禁用") + '引擎' }}
</el-dropdown-item>
<el-dropdown-item command="status">{{ (ruleEngineInfo.status === 'Y' ? "关闭" : "开启") + '引擎' }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
<el-descriptions-item label="规则名称"> {{ruleEngineInfo.name}} </el-descriptions-item>
<el-descriptions-item label="规则名称"> {{ ruleEngineInfo.name }}</el-descriptions-item>
<el-descriptions-item label="规则类型">
<dict-tag :options="dict.type.rule_engine_type" :value="ruleEngineInfo.type"/>
</el-descriptions-item>
<el-descriptions-item label="规则作用域">
<dict-tag :options="dict.type.rule_engine_level" :value="ruleEngineInfo.level"/>
<dict-tag :options="dict.type.rule_engine_level" :value="ruleEngineInfo.scope"/>
</el-descriptions-item>
<el-descriptions-item label="引擎编码"> {{ruleEngineInfo.code + " ("+ruleEngineInfo.engineCode+")"}} </el-descriptions-item>
<el-descriptions-item label="引擎编码"> {{ ruleEngineInfo.engineCode }}</el-descriptions-item>
<el-descriptions-item label="是否激活">
<dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineInfo.isActivate"/>
</el-descriptions-item>
@ -33,34 +35,40 @@
<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.engineVersionList">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>{{ruleEngineVersion.name + "-" + ruleEngineVersion.code}}</span>
<span>{{ ruleEngineVersion.name + "-" + 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>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{event: 'info', ruleEngineVersion: ruleEngineVersion}">规则详情</el-dropdown-item>
<el-dropdown-item :command="{event: 'info', ruleEngineVersion: ruleEngineVersion}">规则详情
</el-dropdown-item>
<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'">
{{ruleEngineVersion.isActivate !== 'no-activate' ? "禁用" : "激活"}}规则
>测试规则
</el-dropdown-item>
<el-dropdown-item :command="{event: 'status', ruleEngineVersion: ruleEngineVersion}"
:disabled="ruleEngineVersion.status !== '2'">
{{ ruleEngineVersion.isActivate !== 'N' ? "禁用" : "激活" }}规则
</el-dropdown-item>
<el-dropdown-item
:command="{event: 'publish', ruleEngineVersion: ruleEngineVersion}"
v-if="ruleEngineVersion.status === '1' && ruleEngineVersion.isTest === '1'">
v-if="ruleEngineVersion.status === '1' && ruleEngineVersion.testStatus === '1'">
发布规则
</el-dropdown-item>
<el-dropdown-item :command="{event: 'del', ruleEngineVersion: ruleEngineVersion}">删除规则
</el-dropdown-item>
</el-dropdown-menu>
</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="版本名称"> {{ruleEngineVersion.name}} </el-descriptions-item>
<el-descriptions-item label="版本CODE"> {{ruleEngineVersion.code}} </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="版本CODE"> {{ ruleEngineVersion.versionCode }}</el-descriptions-item>
<el-descriptions-item label="是否激活">
<dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineVersion.isActivate"/>
</el-descriptions-item>
@ -68,7 +76,7 @@
<dict-tag :options="dict.type.rule_engine_version_status" :value="ruleEngineVersion.status"/>
</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.rule_engine_activate_is_test" :value="ruleEngineVersion.testStatus"/>
</el-descriptions-item>
</el-descriptions>
<editor style="margin-top: 10px" :read-only="true" v-model="ruleEngineVersion.description"></editor>
@ -82,13 +90,15 @@
<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>
<el-button style="float: right; padding: 3px 0" type="text" @click="genEngineVersion">生成引擎版本类
</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 placeholder="点击类生成自动生成类名称"></el-input>
<el-input v-model="engineVersionForm.versionClass" disabled
placeholder="点击类生成自动生成类名称"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -100,7 +110,7 @@
</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>
@ -119,11 +129,11 @@
</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.ruleContent != 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.ruleContent"></encoding>
</el-card>
<span slot="footer" class="dialog-footer">
@ -137,9 +147,12 @@
: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="版本类" :span="2"> {{ ruleEngineVersionInfoAndTest.versionClass }}
</el-descriptions-item>
<el-descriptions-item label="版本名称">
<el-input v-model="ruleEngineVersionInfoAndTest.name"></el-input>
</el-descriptions-item>
<el-descriptions-item label="版本CODE"> {{ ruleEngineVersionInfoAndTest.versionCode }}</el-descriptions-item>
<el-descriptions-item label="是否激活">
<dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineVersionInfoAndTest.isActivate"/>
</el-descriptions-item>
@ -147,14 +160,15 @@
<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"/>
<dict-tag :options="dict.type.rule_engine_activate_is_test" :value="ruleEngineVersionInfoAndTest.testStatus"/>
</el-descriptions-item>
</el-descriptions>
<editor style="margin-top: 10px" :read-only="true" :min-height="100" v-model="ruleEngineVersionInfoAndTest.description"></editor>
<editor style="margin-top: 10px" :min-height="100" :read-only="false"
v-model="ruleEngineVersionInfoAndTest.description"></editor>
<el-row style="margin-top: 10px">
<el-button @click="saveCoding">保存代码</el-button>
<el-button @click="saveCoding">保存</el-button>
</el-row>
<encoding style="height: 800px; margin-top: 20px" v-model="ruleEngineVersionInfoAndTest.codeIng"></encoding>
<encoding style="height: 800px; margin-top: 20px" v-model="ruleEngineVersionInfoAndTest.ruleContent"></encoding>
</div>
</el-drawer>
@ -165,9 +179,11 @@
<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="版本类" :span="2"> {{ ruleEngineVersionInfoAndTest.versionClass }}
</el-descriptions-item>
<el-descriptions-item label="版本名称"> {{ ruleEngineVersionInfoAndTest.name }}</el-descriptions-item>
<el-descriptions-item label="版本CODE"> {{ ruleEngineVersionInfoAndTest.versionCode }}
</el-descriptions-item>
<el-descriptions-item label="是否激活">
<dict-tag :options="dict.type.rule_engine_activate_status" :value="ruleEngineVersionInfoAndTest.isActivate"/>
</el-descriptions-item>
@ -175,17 +191,19 @@
<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"/>
<dict-tag :options="dict.type.rule_engine_activate_is_test" :value="ruleEngineVersionInfoAndTest.testStatus"/>
</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>
<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>
<encoding style="margin-top: 20px" v-model="ruleEngineVersionInfoAndTest.ruleContent"
:read-only="true"></encoding>
</el-col>
<el-col :span="12">
<el-col :span="assetStructure == null ? 24 : 12">
@ -203,7 +221,7 @@
</el-card>
</el-col>
<el-col :span="12" v-if="assetStructure != null">
<el-card class="box-card" >
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>选择资产结构</span>
</div>
@ -224,14 +242,16 @@
<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-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-input style="margin-top: 10px" v-model="testResult" type="textarea" placeholder="请点击测试"/>
</el-col>
</el-col>
</el-row>
@ -241,6 +261,8 @@
<script>
import Encoding from "@/components/Encoding/index.vue";
import {activateEngine, closeEngine, forbiddenEngine, getRuleEngineInfo, onEngine} from "@/api/rule_engine/maintenance";
import {addVersion, createVersionClass, delVersion, updateVersion} from "@/api/rule_engine/version";
export default {
name: "EngineVersion",
@ -250,27 +272,17 @@ export default {
data() {
return {
ruleEngineId: this.$route.params && this.$route.params.ruleEngineId,
ruleEngineInfo: {
"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": []
},
ruleEngineInfo: {},
// 新增版本
addVersionStatus: false,
engineVersionForm: {
"name": "", "code": "", "status": "0",
"name": "",
"versionCode": "",
"isActivate": "no-activate",
"isActivate": "N",
"status": "0",
"testStatus": "0",
"description": "",
"codeIng": null
"ruleContent": null
},
// 详情抽屉状态
ruleEngineVersionInfoStatus: false,
@ -279,15 +291,128 @@ export default {
// 弹框抽屉
ruleEngineVersionInfoAndTest: {},
// 数据接入集合
assetStructureList: [],
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: [],
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: [],
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,
// 数据示例
@ -298,32 +423,46 @@ export default {
price: "653.69",
create_time: "2024-5-7 16:37:16",
},
testResult: ""
testResult: "",
versionClassCreateReq: {}
}
},
created() {
this.initRuleEngine();
},
methods: {
saveCoding() {
this.ruleEngineVersionInfoAndTest.engineMaintenanceId = this.ruleEngineInfo.id
this.ruleEngineVersionInfoAndTest.status = 1
updateVersion(this.ruleEngineVersionInfoAndTest).then(res=>{
if (res.code === 200){
this.$message.success('编码保存成功')
this.initRuleEngine()
}else {
this.$message.error('编码保存失败')
}
})
saveCoding(){
this.$message.success('编码保存成功');
},
ruleEngineVersionInfoStatusClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
this.ruleEngineVersionInfoAndTest = {};
done();
this.initRuleEngine()
})
.catch(_ => {});
.catch(_ => {
});
},
ruleEngineVersionTestStatusClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
this.ruleEngineVersionInfoAndTest = {};
done();
this.initRuleEngine()
})
.catch(_ => {});
.catch(_ => {
});
},
// 点击规则事件
checkRuleEngineVersion(command) {
@ -342,17 +481,25 @@ export default {
case "publish"://发布
command.ruleEngineVersion.status = '2'
break;
case "del"://发布
delVersion(command.ruleEngineVersion.id).then(res=>{
if(res.code === 200){
this.$message.success("规则删除成功")
this.initRuleEngine()
}
})
break;
}
console.log(command.event);
console.log(command.ruleEngineVersion);
},
// 生成规则版本
genEngineVersion(){
genEngineVersion() {
if (this.engineVersionForm.name == null || this.engineVersionForm.name === "") {
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;
}
@ -360,163 +507,103 @@ export default {
this.$message.error('规则版本使用描述不可为空');
return false;
}
this.engineVersionForm.versionCode = this.ruleEngineInfo.engineCode + "_" + this.engineVersionForm.code
this.engineVersionForm.codeIng = this.getCodeIng()
// this.engineVersionForm.versionCode = this.ruleEngineInfo.engineCode + "_" + this.engineVersionForm.code
// this.engineVersionForm.ruleContent = this.getCodeIng()
this.versionClassCreateReq.engineCode = this.ruleEngineInfo.engineCode
this.versionClassCreateReq.scope = this.ruleEngineInfo.scope
this.versionClassCreateReq.versionCode = this.engineVersionForm.versionCode
createVersionClass(this.versionClassCreateReq).then(res => {
this.engineVersionForm.versionClass = res.data.versionClass
this.engineVersionForm.ruleContent = res.data.ruleContent
})
},
// 确定新增
addVersionSubmission(){
this.ruleEngineInfo.ruleEngineVersionList.push({... this.engineVersionForm})
addVersionSubmission() {
this.addVersionStatus = false;
this.engineVersionForm.engineMaintenanceId = this.ruleEngineInfo.id
addVersion(this.engineVersionForm).then(res => {
console.log(res)
if (res.code === 200) {
this.$message.success("版本添加成功")
this.initRuleEngine()
} else {
this.$message.error("版本添加失败")
}
})
},
// 取消新增
addVersionCancel(){
addVersionCancel() {
this.engineVersionForm = {
"name": "", "code": "", "status": "0", "isTest": "0",
"name": "",
"versionCode": "",
"isActivate": "no-activate",
"isActivate": "N",
"status": "0",
"testStatus": "0",
"description": "",
"codeIng": null, "ruleEngineVersionList": []
"ruleContent": null
};
this.addVersionStatus = false;
},
handleClick(clickType){
if (clickType === "add"){
handleClick(clickType) {
if (clickType === "add") {
this.addVersionStatus = true;
}else if(clickType === "activate"){
this.ruleEngineInfo.isActivate = 'no-activate' === this.ruleEngineInfo.isActivate ? 'activated' : 'no-activate'
this.$modal.msgSuccess("引擎激活状态修改成功");
}else if(clickType === "status"){
this.ruleEngineInfo.status = '0' === this.ruleEngineInfo.status ? '1' : '0'
this.$modal.msgSuccess("引擎状态操作成功");
} else if (clickType === "activate") {
if (this.ruleEngineInfo.isActivate === 'N') {
activateEngine(this.ruleEngineInfo.id).then(res => {
if (res.code === 200) {
this.$modal.msgSuccess("引擎激活状态修改成功");
this.initRuleEngine()
}
})
} else if (this.ruleEngineInfo.isActivate === 'Y') {
forbiddenEngine(this.ruleEngineInfo.id).then(res => {
if (res.code === 200) {
this.$modal.msgSuccess("引擎激活状态修改成功")
this.initRuleEngine()
}
})
}
} else if (clickType === "status") {
if (this.ruleEngineInfo.status === 'N') {
onEngine(this.ruleEngineInfo.id).then(res => {
if (res.code === 200) {
this.$modal.msgSuccess("引擎状态修改成功")
this.initRuleEngine()
}
})
} else if (this.ruleEngineInfo.status === 'Y') {
closeEngine(this.ruleEngineInfo.id).then(res => {
if (res.code === 200) {
this.$modal.msgSuccess("引擎状态修改成功")
this.initRuleEngine()
}
})
}
}
},
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
},
// 获取代码模板
getCodeIng(){
let packageName = "com.muyu.rule.engine";
let customName = "custom";
let templateName = "template";
let parentClass = "DataModelEngine";
let codeIng = `package ${packageName}.${customName};
import com.muyu.engine.action.ActionDiscard;
import com.muyu.engine.scope.${parentClass};
/**
* @Author: DongZeLiang
* @date: 2024/5/6
* @Description: ${this.engineVersionForm.name}-${this.engineVersionForm.code}
* @Version: 1.0
*/
public class ${this.engineVersionForm.versionCode} extends ${parentClass} {
@Override
public void execution () {
Object value = getValue();
if (value == null || "".equals(value) || "null".equals(value)) {
throw new ActionDiscard();
}
initRuleEngine() {
getRuleEngineInfo(this.ruleEngineId).then(res => {
this.ruleEngineInfo = res.data
})
}
}`;
return codeIng;
}
}
}
</script>
<style scoped>
.box-card{
.box-card {
margin-top: 20px;
}
.el-dropdown-link {
cursor: pointer;
color: #409EFF;
}
.el-icon-arrow-down {
font-size: 12px;
}
.CodeMirror {
height: 600px;
}