From 840cdb0b50519fdba998402ca731b0bcedc377bf Mon Sep 17 00:00:00 2001
From: icanci <qiang1.zhu@ly.com>
Date: Sun, 20 Nov 2022 12:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/biz/service/DataSourceService.java  |  12 +-
 .../admin/biz/service/StrategyService.java    |   2 +-
 .../biz/service/impl/BaseDataServiceImpl.java |   2 +-
 .../service/impl/DataSourceServiceImpl.java   |  31 +-
 .../mongodb/daointerface/DataSourceDAO.java   |   6 +-
 .../dal/mongodb/mongo/MongoDataSourceDAO.java |  11 +-
 .../vueboot/src/api/dataSourceApi.js          |  13 +
 .../resources/vueboot/src/api/strategyApi.js  |  83 ++++-
 .../src/main/resources/vueboot/src/main.js    |   2 +-
 .../vueboot/src/views/common/vue-log.vue      |   2 +-
 .../vueboot/src/views/ruleConfig/baseData.vue |   2 +-
 .../ruleConfig/components/ruleTreeList.vue    |   1 +
 .../ruleConfig/components/ruleTreeNode.vue    | 327 ++++++++++++++----
 .../src/views/ruleConfig/dataSource.vue       |   2 +-
 .../views/ruleConfig/dialog/strategyForm.vue  | 114 +++++-
 .../vueboot/src/views/ruleConfig/domain.vue   |   2 +-
 .../vueboot/src/views/ruleConfig/metadata.vue |   2 +-
 .../vueboot/src/views/ruleConfig/strategy.vue |   2 +-
 .../config/DataSourceController.java          |   6 +
 .../icanci/rec/common/enums/OperatorEnum.java |   2 +-
 .../repository/EngineRepositoryHolder.java    |   6 +-
 21 files changed, 515 insertions(+), 115 deletions(-)

diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DataSourceService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DataSourceService.java
index d648828..72c2e76 100644
--- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DataSourceService.java
+++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DataSourceService.java
@@ -1,12 +1,12 @@
 package cn.icanci.rec.admin.biz.service;
 
-import java.util.List;
-
 import cn.icanci.rec.admin.biz.model.DataSourceDebugResult;
 import cn.icanci.rec.admin.dal.mongodb.common.PageList;
 import cn.icanci.rec.common.model.TextValue;
 import cn.icanci.rec.common.model.config.DataSourceVO;
 
+import java.util.List;
+
 /**
  * @author icanci
  * @since 1.0 Created in 2022/11/12 09:03
@@ -48,4 +48,12 @@ public interface DataSourceService extends BaseService<DataSourceVO> {
      * @return 返回执行结果
      */
     DataSourceDebugResult debug(DataSourceVO dataSource);
+
+    /**
+     * 根据uuid查询
+     *
+     * @param dataSourceUuid dataSourceUuid
+     * @return 返回查询结果
+     */
+    DataSourceVO queryByUuid(String dataSourceUuid);
 }
diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java
index 3dc96c3..6493423 100644
--- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java
+++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java
@@ -36,7 +36,7 @@ public interface StrategyService extends BaseService<StrategyVO> {
      * 对策略进行测试
      *
      * @param strategy strategy
-     * @param scriptContentTest 测试参数，当数据源存在且为脚本的时候，此项有值
+     * @param scriptContentTest 测试参数
      * @return 返回测试结果
      */
     StrategyDebugResult debug(StrategyVO strategy, String scriptContentTest);
diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/BaseDataServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/BaseDataServiceImpl.java
index 1b66255..623000a 100644
--- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/BaseDataServiceImpl.java
+++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/BaseDataServiceImpl.java
@@ -94,7 +94,7 @@ public class BaseDataServiceImpl implements BaseDataService {
                 label = String.format(NOT_DELETED_FORMAT, baseData.getFieldName());
             }
             String value = baseData.getUuid();
-            textValues.add(new TextValue(label, value));
+            textValues.add(new TextValue(label, value, baseData.getDataType().getCode()));
         }
         return textValues;
     }
diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java
index ebc8679..a612dab 100644
--- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java
+++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java
@@ -1,17 +1,5 @@
 package cn.icanci.rec.admin.biz.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSONException;
-import com.google.common.collect.Lists;
-
 import cn.icanci.rec.admin.biz.event.log.LogEvent;
 import cn.icanci.rec.admin.biz.mapper.config.DataSourceMapper;
 import cn.icanci.rec.admin.biz.model.DataSourceDebugResult;
@@ -30,6 +18,18 @@ import cn.icanci.rec.engine.script.context.RecScriptEngineContext;
 import cn.icanci.rec.engine.script.wrapper.HttpResponseWrapper;
 import cn.icanci.rec.spi.event.EventDispatcher;
 
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONException;
+import com.google.common.collect.Lists;
+
 /**
  * @author icanci
  * @since 1.0 Created in 2022/11/12 09:04
@@ -100,7 +100,7 @@ public class DataSourceServiceImpl implements DataSourceService {
                 label = String.format(NOT_DELETED_TYPE_FORMAT, dataSourceType.getDesc(), dataSource.getDataSourceName());
             }
             String value = dataSource.getUuid();
-            textValues.add(new TextValue(label, value));
+            textValues.add(new TextValue(label, value, dataSource.getDataSourceType().getCode()));
         }
         return textValues;
     }
@@ -166,6 +166,11 @@ public class DataSourceServiceImpl implements DataSourceService {
         }
     }
 
+    @Override
+    public DataSourceVO queryByUuid(String dataSourceUuid) {
+        return dataSourceMapper.do2vo(dataSourceDAO.queryByUuid(dataSourceUuid));
+    }
+
     /**
      * 脚本执行处理
      *
diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/DataSourceDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/DataSourceDAO.java
index e0b87ec..dc2440d 100644
--- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/DataSourceDAO.java
+++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/DataSourceDAO.java
@@ -22,6 +22,8 @@ public interface DataSourceDAO extends BaseDAO<DataSourceDO> {
 
     List<DataSourceDO> queryByDomainCode(String domainCode);
 
+    DataSourceDO queryByUuid(String dataSourceUuid);
+
     interface DataSourceColumn extends BaseColumn {
         /**
          * 数据源名称
@@ -32,8 +34,8 @@ public interface DataSourceDAO extends BaseDAO<DataSourceDO> {
          */
         String dataSourceType = "dataSourceType";
         /**
-         * 数据源类型
+         * 数据源DomainCode
          */
-        String domainCode = "domainCode";
+        String domainCode     = "domainCode";
     }
 }
diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoDataSourceDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoDataSourceDAO.java
index 84d823c..a44d5c0 100644
--- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoDataSourceDAO.java
+++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoDataSourceDAO.java
@@ -73,10 +73,19 @@ public class MongoDataSourceDAO extends AbstractBaseDAO<DataSourceDO> implements
         return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME);
     }
 
-    @Override public List<DataSourceDO> queryByDomainCode(String domainCode) {
+    @Override
+    public List<DataSourceDO> queryByDomainCode(String domainCode) {
         Criteria criteria = Criteria.where(DataSourceColumn.domainCode).is(domainCode);
         criteria.and(DataSourceColumn.env).is(DEFAULT_ENV);
         Query query = new Query(criteria);
         return mongoTemplate.find(query, COLLECTION_CLASS, COLLECTION_NAME);
     }
+
+    @Override
+    public DataSourceDO queryByUuid(String dataSourceUuid) {
+        Criteria criteria = Criteria.where(DataSourceColumn.uuid).is(dataSourceUuid);
+        criteria.and(DataSourceColumn.env).is(DEFAULT_ENV);
+        Query query = new Query(criteria);
+        return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME);
+    }
 }
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/dataSourceApi.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/dataSourceApi.js
index c021566..ecc8c1d 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/dataSourceApi.js
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/dataSourceApi.js
@@ -58,3 +58,16 @@ export async function dataSourceDebug(dataSource) {
     data: dataSource
   })
 }
+
+/**
+ * 测试
+ *
+ * @param dataSourceUuid dataSourceUuid
+ * @returns {*}
+ */
+export async function dataSourceDebugForUuid(dataSourceUuid) {
+  return await request({
+    url: '/rec/dataSource/debugUuid/' + dataSourceUuid,
+    method: 'get',
+  })
+}
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/strategyApi.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/strategyApi.js
index 3d9c7c6..5acfe20 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/strategyApi.js
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/strategyApi.js
@@ -13,6 +13,7 @@ export async function remoteValidateStrategyName(domainCode, dataSourceName) {
     method: 'get',
   })
 }
+
 /**
  * 验证 remoteValidateSceneCode
  *
@@ -66,13 +67,89 @@ export async function strategyPageQuery(strategy, paginator) {
  * @param scriptContentTest scriptContentTest
  * @returns {*}
  */
-export async function strategyDebug(strategy, scriptContentTest) {
+export async function strategyDebug(strategy,scriptContentTest) {
   return await request({
     url: '/rec/strategy/debug',
     method: 'post',
     data: {
-      'strategy': strategy,
-      'scriptContentTest': scriptContentTest
+      'strategy':strategy,
+      'scriptContentTest':scriptContentTest
     }
   })
 }
+
+
+/**
+ * 获取Boolean操作类型的选择框
+ */
+export function getBooleanOperator() {
+  return [
+    {label: '等于(=)', value: 'EQ'},
+    {label: '不等于(!=)', value: 'NE'},
+  ]
+}
+
+/**
+ * 获取number操作类型的选择框
+ */
+export function getNumberOperator() {
+  return [
+    {label: '等于(=)', value: 'EQ'},
+    {label: '大于(>)', value: 'GT'},
+    {label: '大于等于(>=)', value: 'GTE'},
+    {label: '小于(<)', value: 'LT'},
+    {label: '小于等于(<=)', value: 'LTE'},
+    {label: '不等于(!=)', value: 'NE'},
+  ]
+}
+
+/**
+ * 获取String操作类型的选择框
+ */
+export function getStringOperator() {
+  return [
+    {label: '等于(=)', value: 'EQ'},
+    {label: '不等于(!=)', value: 'NE'},
+    {label: '包含(⊇)', value: 'CONTAIN'},
+    {label: '不包含', value: 'UN_CONTAIN'},
+    // {label: '包含于(⊆或⊂)', value: 'INCLUDED'},
+  ]
+}
+
+/**
+ * 获取Date操作类型的选择框
+ */
+export function getDateOperator() {
+  return [
+    {label: '等于(=)', value: 'EQ'},
+    {label: '大于(>)', value: 'GT'},
+    {label: '大于等于(>=)', value: 'GTE'},
+    {label: '小于(<)', value: 'LT'},
+    {label: '小于等于(<=)', value: 'LTE'},
+    {label: '不等于(!=)', value: 'NE'},
+  ]
+}
+
+/**
+ * 获取Metadata操作类型的选择框
+ */
+export function getMetadataOperator() {
+  return [
+    {label: '等于(=)', value: 'EQ'},
+    {label: '不等于(!=)', value: 'NE'},
+    {label: '包含(⊇)', value: 'CONTAIN'},
+    {label: '不包含', value: 'UN_CONTAIN'},
+    {label: '包含于(⊆或⊂)', value: 'INCLUDED'},
+  ]
+}
+
+/**
+ * 获取布尔操作下拉框
+ * @returns {[{label: string, value: string}, {label: string, value: string}]}
+ */
+export function getBooleanValueOptions() {
+  return [
+    {label: 'TRUE', value: 'TRUE'},
+    {label: 'FALSE', value: 'FALSE'},
+  ]
+}
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/main.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/main.js
index e154a53..bb4d330 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/main.js
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/main.js
@@ -21,7 +21,7 @@ Vue.config.productionTip = false
 Vue.prototype.$cloneObj = function (data) {
   return JSON.parse(JSON.stringify(data))
 }
-Vue.prototype.dateFormat = function (date) {
+Vue.prototype.recDateFormat = function (date) {
   return moment(date).format('YYYY-MM-DD HH:mm:ss');
 }
 
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/common/vue-log.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/common/vue-log.vue
index 5a04c6b..93d257b 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/common/vue-log.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/common/vue-log.vue
@@ -45,7 +45,7 @@
           width="150"
           label="操作时间">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.createTime) }}
+            {{ recDateFormat(scope.row.createTime) }}
           </template>
         </el-table-column>
       </el-table>
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/baseData.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/baseData.vue
index c6e80bc..dca9a5e 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/baseData.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/baseData.vue
@@ -91,7 +91,7 @@
             width="300"
             label="创建/修改时间">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.createTime) }}/ {{ dateFormat(scope.row.updateTime) }}
+            {{ recDateFormat(scope.row.createTime) }}/ {{ recDateFormat(scope.row.updateTime) }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeList.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeList.vue
index eef1c37..ebcf21a 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeList.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeList.vue
@@ -13,6 +13,7 @@
                         :group="condition.group"
                         :rule-mode="ruleMode"
                         :to-disabled="toDisabled"
+                        :conditions="ruleListInfo.conditions"
                         :selectors="selectors">
         </rule-tree-node>
         <el-divider></el-divider>
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeNode.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeNode.vue
index c81f7fd..75941f6 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeNode.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/components/ruleTreeNode.vue
@@ -102,8 +102,9 @@
               </el-form-item>
               <el-form-item>
                 <el-select
-                  style="width: 110px"
+                  style="width: 140px"
                   filterable
+                  @change="leftValueChange(condition)"
                   :disabled="toDisabled"
                   v-model="condition.leftValue"
                   placeholder="基础数据">
@@ -116,60 +117,185 @@
                 </el-select>
               </el-form-item>
               <el-form-item>
+
+                <el-select
+                  v-if="getDataType(condition.leftValue) === 'BOOLEAN'"
+                  style="width: 130px"
+                  filterable
+                  :disabled="toDisabled"
+                  v-model="condition.operator"
+                  @change="operatorChange(condition)"
+                  placeholder="操作符">
+                  <el-option
+                    v-for="item in booleanOperators"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
+                <el-select
+                  v-if="getDataType(condition.leftValue) === 'NUMBER'"
+                  style="width: 130px"
+                  filterable
+                  :disabled="toDisabled"
+                  v-model="condition.operator"
+                  @change="operatorChange(condition)"
+                  placeholder="操作符">
+                  <el-option
+                    v-for="item in numberOperators"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
                 <el-select
-                  style="width: 100px"
+                  v-if="getDataType(condition.leftValue) === 'STRING'"
+                  style="width: 130px"
                   filterable
                   :disabled="toDisabled"
                   v-model="condition.operator"
+                  @change="operatorChange(condition)"
                   placeholder="操作符">
                   <el-option
-                    v-for="item in selectors.operatorOptions"
+                    v-for="item in stringOperators"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
                   </el-option>
                 </el-select>
+
+                <el-select
+                  v-if="getDataType(condition.leftValue) === 'DATE'"
+                  style="width: 130px"
+                  filterable
+                  :disabled="toDisabled"
+                  v-model="condition.operator"
+                  @change="operatorChange(condition)"
+                  placeholder="操作符">
+                  <el-option
+                    v-for="item in dateOperators"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
+                <el-select
+                  v-if="getDataType(condition.leftValue) === 'METADATA'"
+                  style="width: 130px"
+                  filterable
+                  :disabled="toDisabled"
+                  v-model="condition.operator"
+                  @change="operatorChange(condition)"
+                  placeholder="操作符">
+                  <el-option
+                    v-for="item in metadataOperators"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
               </el-form-item>
               <el-form-item>
-                <el-input :disabled="toDisabled" style="width: 80px" v-model="condition.rightValue" placeholder="右值"></el-input>
-              </el-form-item>
-              <template v-if="ruleMode === 'COMPLEX'">
-                <el-form-item>
-                  <el-select
-                    :disabled="toDisabled"
-                    style="width: 110px"
-                    filterable
-                    v-model="condition.interrupt"
-                    placeholder="是否中断">
-                    <el-option
-                      v-for="item in selectors.interruptOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item>
-                  <el-select
-                    :disabled="toDisabled"
-                    style="width: 140px"
-                    filterable
-                    v-model="condition.resultType"
-                    placeholder="中断返回类型">
-                    <el-option
-                      v-for="item in selectors.resultTypeOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item>
-                  <el-input :disabled="toDisabled" style="width: 110px" v-model="condition.returnVal" placeholder="中断返回值"></el-input>
-                </el-form-item>
-              </template>
+                <!-- BOOLEAN -->
+                <el-select :disabled="toDisabled"
+                           style="width: 220px"
+                           v-if="getDataType(condition.leftValue) === 'BOOLEAN'"
+                           v-model="condition.rightValue"
+                           filterable
+                           placeholder="右值">
+                  <el-option
+                    v-for="item in booleanValueOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- NUMBER -->
+                <el-input
+                  :disabled="toDisabled"
+                  style="width: 220px"
+                  v-if="getDataType(condition.leftValue) === 'NUMBER'"
+                  type="number"
+                  placeholder="右值"
+                  v-model="condition.rightValue"
+                  autocomplete="off"></el-input>
+                <!-- STRING + 多选 TODO 此方式前端会样式溢出，暂不处理 -->
+                <!--                <el-select-->
+                <!--                  :disabled="toDisabled"-->
+                <!--                  style="width: 220px"-->
+                <!--                  v-if="getDataType(condition.leftValue) === 'STRING' && condition.operator === 'INCLUDED' "-->
+                <!--                  v-model="condition.rightValue"-->
+                <!--                  filterable-->
+                <!--                  multiple-->
+                <!--                  allow-create-->
+                <!--                  default-first-option-->
+                <!--                  collapse-tags-->
+                <!--                  placeholder="请创建">-->
+                <!--                  <el-option-->
+                <!--                    v-for="item in emptyOptions"-->
+                <!--                    :key="item.value"-->
+                <!--                    :label="item.key"-->
+                <!--                    :value="item.value">-->
+                <!--                  </el-option>-->
+                <!--                </el-select>-->
 
-              <!--     第一个操作：删除     -->
+                <!-- STRING + 单选  TODO if 条件去除 && condition.operator !== 'INCLUDED' -->
+                <el-input
+                  :disabled="toDisabled"
+                  style="width: 220px"
+                  v-if="getDataType(condition.leftValue) === 'STRING'"
+                  v-model="condition.rightValue"
+                  placeholder="右值"
+                  autocomplete="off">
+                </el-input>
+                <!-- DATE -->
+                <!-- value-format="yyyy-MM-dd HH:mm:ss" -->
+                <el-date-picker
+                  :disabled="toDisabled"
+                  @change="formatTime($event,condition)"
+                  style="width: 220px"
+                  v-if="getDataType(condition.leftValue) === 'DATE'"
+                  v-model="condition.rightValue"
+                  type="datetime"
+                  placeholder="选择日期时间">
+                </el-date-picker>
+
+                <!-- METADATA + 多选 -->
+                <el-select :disabled="toDisabled"
+                           style="width: 220px"
+                           v-if="getDataType(condition.leftValue) === 'METADATA' && condition.operator === 'INCLUDED' "
+                           v-model="condition.rightValue"
+                           filterable
+                           multiple
+                           collapse-tags
+                           placeholder="请选择">
+                  <el-option
+                    v-for="item in selectors.metadataOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- METADATA + 单选 -->
+                <el-select :disabled="toDisabled"
+                           style="width: 220px"
+                           v-if="getDataType(condition.leftValue) === 'METADATA' && condition.operator !== 'INCLUDED' "
+                           v-model="condition.rightValue"
+                           filterable
+                           placeholder="请选择">
+                  <el-option
+                    v-for="item in selectors.metadataOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
+              </el-form-item>
               <el-form-item>
                 <el-tooltip content="删除规则配置" placement="top">
                   <el-button :disabled="!canDeleteSelf() || toDisabled" type="danger" icon="el-icon-delete" circle size="mini"
@@ -177,23 +303,6 @@
                   </el-button>
                 </el-tooltip>
               </el-form-item>
-              <!--     第二个操作：增加自己     -->
-              <!--              <el-form-item v-if="canAddSelf(condition,index)">-->
-              <!--                <el-tooltip content="增加平级规则配置" placement="top">-->
-              <!--                  <el-button type="primary" icon="el-icon-plus" circle size="mini"-->
-              <!--                             @click="addSelf(condition, index)">-->
-              <!--                  </el-button>-->
-              <!--                </el-tooltip>-->
-              <!--              </el-form-item>-->
-              <!--     第三个操作：增加孩子节点     -->
-              <!--              <el-form-item v-if="canAddChild(condition,index)">-->
-              <!--                <el-tooltip content="增加下级规则配置" placement="top">-->
-              <!--                  <el-button type="primary" icon="el-icon-bottom" circle size="mini"-->
-              <!--                             @click="addChild(condition,index)">-->
-              <!--                  </el-button>-->
-              <!--                </el-tooltip>-->
-              <!--              </el-form-item>-->
-              <!--     第四个操作：增加或    -->
               <el-form-item>
                 <el-tooltip content="增加且配置规则" placement="top">
                   <el-button :disabled="toDisabled" type="primary" icon="el-icon-circle-plus" circle size="mini"
@@ -201,13 +310,20 @@
                   </el-button>
                 </el-tooltip>
               </el-form-item>
-
+              <el-form-item v-if="ruleMode === 'COMPLEX'">
+                <el-tooltip content="侧边编辑当前节点" placement="top">
+                  <el-button :disabled="toDisabled" type="primary" icon="el-icon-right" circle size="mini"
+                             @click="editCondition(condition)">
+                  </el-button>
+                </el-tooltip>
+              </el-form-item>
             </el-form>
             <!-- 当其有孩子节点的时候在进行递归 -->
             <rule-tree-node v-if="condition.children && condition.children.length>0"
                             :group="condition.children"
                             :rule-mode="ruleMode"
                             :to-disabled="toDisabled"
+                            :conditions="conditions"
                             :root="false">
             </rule-tree-node>
           </el-row>
@@ -215,17 +331,73 @@
       </el-col>
     </el-row>
 
+    <el-drawer
+      append-to-body
+      :visible.sync="drawerOpen"
+      :with-header="false">
+      <el-form style="margin-top: 20px;" ref="drawerData" :disabled="toDisabled" label-width="120px">
+        <el-form-item class="drawer_from_item" label="规则名称">
+          <el-input :disabled="toDisabled" style="width: 100px" v-model="drawerData.name" placeholder="规则名称"></el-input>
+        </el-form-item>
+        <el-form-item class="drawer_from_item" label="是否中断">
+          <el-select
+            class="drawer_from_item_inner"
+            :disabled="toDisabled"
+            filterable
+            v-model="drawerData.interrupt"
+            placeholder="是否中断">
+            <el-option
+              v-for="item in selectors.interruptOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item class="drawer_from_item" label="中断返回类型">
+          <el-select
+            class="drawer_from_item_inner"
+            :disabled="toDisabled"
+            filterable
+            v-model="drawerData.resultType"
+            placeholder="中断返回类型">
+            <el-option
+              v-for="item in selectors.resultTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item class="drawer_from_item" label="中断返回值">
+          <el-input class="drawer_from_item_inner" :disabled="toDisabled" v-model="drawerData.returnVal" placeholder="中断返回值"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-drawer>
   </div>
 </template>
 <script>
 
+import {getBooleanOperator, getBooleanValueOptions, getDateOperator, getMetadataOperator, getNumberOperator, getStringOperator} from "../../../api/strategyApi";
+import moment from "moment/moment";
+
 export default {
   name: "ruleTreeNode",
   filters: {},
-  props: ['group', 'root', "selectors", 'ruleMode', 'toDisabled'],
+  props: ['conditions', 'group', 'root', "selectors", 'ruleMode', 'toDisabled'],
   components: {},
   data() {
-    return {}
+    return {
+      booleanOperators: getBooleanOperator(),
+      numberOperators: getNumberOperator(),
+      booleanValueOptions: getBooleanValueOptions(),
+      dateOperators: getDateOperator(),
+      stringOperators: getStringOperator(),
+      metadataOperators: getMetadataOperator(),
+      emptyOptions: [],
+      drawerOpen: false,
+      drawerData: {}
+    }
   },
   created() {
   },
@@ -241,13 +413,20 @@ export default {
       }
     },
     canDeleteSelf() {
+      if (this.conditions.length > 1) {
+        return true;
+      }
       return this.group.length > 1
     },
     deleteSelf(index) {
       this.group.splice(index, 1)
+      for (let i = 0; i < this.conditions.length; i++) {
+        if (this.conditions[i].group.length === 0) {
+          this.conditions.splice(i, 1)
+        }
+      }
     },
     addAnd(index) {
-      console.log(this.group)
       this.group.splice(index + 1, 0, {
         name: '',
         leftValue: '',
@@ -258,7 +437,29 @@ export default {
         returnVal: '',
         children: []
       })
-    }
+    },
+    getDataType(uuid) {
+      let leftOptions = this.selectors.leftOptions;
+      for (let i = 0; i < leftOptions.length; i++) {
+        if (leftOptions[i].value === uuid) {
+          return leftOptions[i].data
+        }
+      }
+    },
+    leftValueChange(condition) {
+      condition.operator = ''
+      condition.rightValue = ''
+    },
+    operatorChange(condition) {
+      condition.rightValue = ''
+    },
+    editCondition(condition) {
+      this.drawerOpen = true
+      this.drawerData = condition
+    },
+    formatTime(date, condition) {
+      condition.rightValue = moment(date).format('YYYY-MM-DD hh:mm:ss');
+    },
   }
 }
 </script>
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dataSource.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dataSource.vue
index de95f7d..99c8c0b 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dataSource.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dataSource.vue
@@ -88,7 +88,7 @@
           width="300"
           label="创建/修改时间">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.createTime) }}/ {{ dateFormat(scope.row.updateTime) }}
+            {{ recDateFormat(scope.row.createTime) }}/ {{ recDateFormat(scope.row.updateTime) }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/strategyForm.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/strategyForm.vue
index 5dd7461..1520475 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/strategyForm.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/strategyForm.vue
@@ -62,6 +62,14 @@
               :value="item.value">
             </el-option>
           </el-select>
+          <el-button v-if="saveData.dataSourceUuid!==''" type="warning" @click="dataSourceDebug">执行</el-button>
+        </el-form-item>
+        <el-form-item v-if="dataSourceDebugResult" label="执行结果">
+          <div style="background-color: black;color:#FFD700;line-height: 20px!important;">
+            <span>是否执行成功：{{ dataSourceDebugResult.success }}</span><br>
+            <span v-if="dataSourceDebugResult.success"><span>实际执行结果：{{ dataSourceDebugResult.realResult }}</span><br></span>
+            <span v-if="!dataSourceDebugResult.success">执行异常：{{ dataSourceDebugResult.exceptionMessage }}</span>
+          </div>
         </el-form-item>
         <el-form-item label="配置类型" prop="ruleType">
           <el-select
@@ -93,23 +101,34 @@
           </el-select>
         </el-form-item>
         <el-form-item label="字段清除" prop="ruleMode">
-          <el-checkbox :disabled="saveData.domainCode === ''" v-model="autoClear">规则模式切换自动清除中断相关配置数据</el-checkbox>
+          <el-checkbox :disabled="saveData.domainCode === '' || saveData.sceneCode === ''" v-model="autoClear">规则模式切换自动清除中断相关配置数据 (如果此项禁用则需要选择场景)</el-checkbox>
         </el-form-item>
         <el-form-item label="规则簇" required>
           <rule-tree-list ref="ruleTreeList"></rule-tree-list>
         </el-form-item>
+        <el-form-item label="规则测试">
+          <el-input :rows="10" type="textarea" placeholder="请输入脚本测试参数(JSON格式)" v-model="ruleDebugParam"></el-input>
+        </el-form-item>
+        <el-form-item v-if="ruleDebugResult" label="执行结果">
+          <div style="background-color: black;color:#FFD700;line-height: 20px!important;">
+            <span>请求参数：{{ ruleDebugResult.executorParam }}</span><br>
+            <span>是否执行成功：{{ ruleDebugResult.success }}</span><br>
+            <span>返回值是否是布尔类型：{{ ruleDebugResult.retBoolean }}</span><br>
+            <span v-if="ruleDebugResult.success"><span>实际执行结果：{{ ruleDebugResult.retValue }}</span><br></span>
+            <span v-if="!ruleDebugResult.success">执行异常：{{ ruleDebugResult.exceptionMessage }}</span>
+          </div>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clearForm">取 消</el-button>
         <el-button type="warning" @click="debug">测 试</el-button>
-        <el-button type="primary" @click="save">确 定</el-button>
+        <el-button :disabled="!testPass" type="primary" @click="save">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 <script>
 
-import {saveDomain} from "../../../api/domainApi";
 import {
   loadBaseDataSelector,
   loadDataSourceSelector,
@@ -117,13 +136,13 @@ import {
   loadDomainSceneSelector,
   loadDomainSelector,
   loadInterruptSelector,
-  loadOperatorSelector,
   loadResultTypeSelector,
   loadRuleModeSelector,
   loadRuleTypeSelector
 } from "../../../api/loadSelectorApi";
-import {remoteValidateSceneCode, remoteValidateStrategyName} from "../../../api/strategyApi";
+import {remoteValidateSceneCode, remoteValidateStrategyName, saveStrategy, strategyDebug} from "../../../api/strategyApi";
 import ruleTreeList from "../components/ruleTreeList";
+import {dataSourceDebugForUuid} from "../../../api/dataSourceApi";
 
 export default {
   name: "strategyForm",
@@ -240,11 +259,15 @@ export default {
       // selector
       selectors: {
         leftOptions: [],
-        operatorOptions: [],
         interruptOptions: [],
         resultTypeOptions: [],
         metadataOptions: [],
-      }
+      },
+      // debug
+      dataSourceDebugResult: undefined,
+      ruleDebugParam: '',
+      ruleDebugResult: undefined,
+      testPass: false
     }
   },
   created() {
@@ -277,7 +300,7 @@ export default {
     },
     async doSave(saveData) {
       let vm = this
-      let ret = await saveDomain(saveData);
+      let ret = await saveStrategy(saveData);
       if (ret.ok) {
         vm.$message({type: 'success', message: '保存成功!'});
       } else {
@@ -336,6 +359,10 @@ export default {
         }
         vm.dataSourceOptions = []
         vm.sceneOptions = []
+        vm.dataSourceDebugResult = undefined
+        vm.ruleDebugResult = undefined
+        vm.ruleDebugParam = ''
+        vm.testPass = false
         vm.$refs['ruleForm'].resetFields()
       } catch (e) {
         console.log(e)
@@ -358,26 +385,75 @@ export default {
         }
       }
     },
+    async dataSourceDebug() {
+      let ret = await dataSourceDebugForUuid(this.saveData.dataSourceUuid);
+      if (ret.ok) {
+        this.dataSourceDebugResult = ret.data.result
+      } else {
+        this.$message({type: 'error', message: '测试失败：' + ret.message});
+      }
+    },
     async debug() {
-      //  await strategyDebug()
+      let ret = await strategyDebug(this.saveData, this.ruleDebugParam);
+      if (ret.ok) {
+        this.ruleDebugResult = ret.data.result
+        this.testPass = this.ruleDebugResult.success
+      } else {
+        this.$message({type: 'error', message: '测试失败：' + ret.message});
+      }
     }
   },
   watch: {
     'saveData.domainCode': {
       async handler(newVal, oldVal) {
+        let vm = this
         if (newVal) {
-          this.$refs.ruleTreeList.toDisabled = false
-          this.dataSourceOptions = await loadDataSourceSelector(newVal);
-          this.sceneOptions = await loadDomainSceneSelector(newVal);
-          this.saveData.sceneCode = ''
-          this.saveData.dataSourceUuid = ''
+          console.log(vm.saveData)
+
+          if (vm.saveData.sceneCode !== '') {
+            vm.$refs.ruleTreeList.toDisabled = false
+          }
+
+          vm.dataSourceOptions = await loadDataSourceSelector(newVal);
+          vm.sceneOptions = await loadDomainSceneSelector(newVal);
+          vm.saveData.sceneCode = ''
+          vm.saveData.dataSourceUuid = ''
+
+          let conditions = vm.saveData.ruleListInfo.conditions;
+          let deleteConditionLength = conditions.length - 1;
+          for (let i = 0; i < deleteConditionLength; i++) {
+            conditions.splice(0, 1)
+          }
+          // 此时只会剩下一组
+          let group = conditions[0].group;
+          let deleteGroupLength = group.length - 1;
+          for (let i = 0; i < deleteGroupLength; i++) {
+            group.splice(0, 1)
+          }
+          // 值复原
+          group[0].name = ''
+          group[0].leftValue = ''
+          group[0].operator = ''
+          group[0].rightValue = ''
+          group[0].interrupt = ''
+          group[0].resultType = ''
+          group[0].returnVal = ''
+          group[0].children = []
 
           // selectors
-          this.selectors.leftOptions = await loadBaseDataSelector(newVal)
-          this.selectors.operatorOptions = await loadOperatorSelector()
-          this.selectors.interruptOptions = await loadInterruptSelector()
-          this.selectors.resultTypeOptions = await loadResultTypeSelector()
-          this.selectors.metadataOptions = await loadDomainMetadataSelector(newVal)
+          vm.selectors.leftOptions = await loadBaseDataSelector(newVal)
+          vm.selectors.interruptOptions = await loadInterruptSelector()
+          vm.selectors.resultTypeOptions = await loadResultTypeSelector()
+          vm.selectors.metadataOptions = await loadDomainMetadataSelector(newVal)
+        }
+      },
+      immediate: true
+    },
+    'saveData.sceneCode': {
+      async handler(newVal, oldVal) {
+        let vm = this
+        if (newVal) {
+          vm.$refs.ruleTreeList.toDisabled = false
         }
       },
       immediate: true
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/domain.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/domain.vue
index 7ae9322..0054059 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/domain.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/domain.vue
@@ -55,7 +55,7 @@
           width="300"
           label="创建/修改时间">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.createTime) }}/ {{ dateFormat(scope.row.updateTime) }}
+            {{ recDateFormat(scope.row.createTime) }}/ {{ recDateFormat(scope.row.updateTime) }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/metadata.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/metadata.vue
index 6c41421..48512a0 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/metadata.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/metadata.vue
@@ -71,7 +71,7 @@
           width="300"
           label="创建/修改时间">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.createTime) }}/ {{ dateFormat(scope.row.updateTime) }}
+            {{ recDateFormat(scope.row.createTime) }}/ {{ recDateFormat(scope.row.updateTime) }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/strategy.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/strategy.vue
index fa025fe..8a2e6e7 100644
--- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/strategy.vue
+++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/strategy.vue
@@ -94,7 +94,7 @@
           width="300"
           label="创建/修改时间">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.createTime) }}/ {{ dateFormat(scope.row.updateTime) }}
+            {{ recDateFormat(scope.row.createTime) }}/ {{ recDateFormat(scope.row.updateTime) }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DataSourceController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DataSourceController.java
index e77e4e6..bdc1099 100644
--- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DataSourceController.java
+++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DataSourceController.java
@@ -59,4 +59,10 @@ public class DataSourceController {
         DataSourceDebugResult result = dataSourceService.debug(dataSourceWebMapper.web2vo(dataSource));
         return R.builderOk().data("result", result).build();
     }
+
+    @GetMapping("debugUuid/{dataSourceUuid}")
+    public R dataSourceDebugForUuid(@PathVariable("dataSourceUuid") String dataSourceUuid) {
+        DataSourceDebugResult result = dataSourceService.debug(dataSourceService.queryByUuid(dataSourceUuid));
+        return R.builderOk().data("result", result).build();
+    }
 }
diff --git a/rec-common/src/main/java/cn/icanci/rec/common/enums/OperatorEnum.java b/rec-common/src/main/java/cn/icanci/rec/common/enums/OperatorEnum.java
index ef40d77..fff4465 100644
--- a/rec-common/src/main/java/cn/icanci/rec/common/enums/OperatorEnum.java
+++ b/rec-common/src/main/java/cn/icanci/rec/common/enums/OperatorEnum.java
@@ -31,7 +31,7 @@ public enum OperatorEnum {
                           /** 不包含 */
                           UN_CONTAIN("UN_CONTAIN", "不包含"),
                           /**
-                           * 右包含左(⊆)
+                           * 包含于(⊆或⊂)
                            */
                           INCLUDED("INCLUDED", "包含于(⊆或⊂)"),;
 
diff --git a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java
index 686af9d..6d2d679 100644
--- a/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java
+++ b/rec-engine/rec-engine-sdk/src/main/java/cn/icanci/rec/engine/sdk/rule/repository/EngineRepositoryHolder.java
@@ -64,7 +64,8 @@ public class EngineRepositoryHolder {
                 return;
             }
             // 2.新建或者获取域对应的仓储
-            EngineRepository repository = ENGINE_REPOSITORY_CONFIG.putIfAbsent(domain, new EngineRepository());
+            ENGINE_REPOSITORY_CONFIG.putIfAbsent(domain, new EngineRepository());
+            EngineRepository repository = ENGINE_REPOSITORY_CONFIG.get(domain);
 
             // 3.构建本地缓存
             // 3.1 构建域信息
@@ -120,7 +121,8 @@ public class EngineRepositoryHolder {
         if (CollectionUtils.isEmpty(scenePairs)) {
             return;
         }
-        EngineRepository repository = ENGINE_REPOSITORY_CONFIG.putIfAbsent(domain.getDomainCode(), new EngineRepository());
+        ENGINE_REPOSITORY_CONFIG.putIfAbsent(domain.getDomainCode(), new EngineRepository());
+        EngineRepository repository = ENGINE_REPOSITORY_CONFIG.get(domain.getDomainCode());
         repository.setDomainRepository(domain);
         repository.getBaseDataRepository().putAll(refreshBaseDatas);
         repository.getMetadataRepository().putAll(refreshMetadatas);
-- 
Gitee