fix:更改错误的项目文件名
parent
608f365b60
commit
22bc57b231
|
@ -1,9 +1,9 @@
|
|||
package com.ruoyi.dataAsset.client.config;
|
||||
package com.ruoyi.ruleEngine.client.config;
|
||||
|
||||
import com.ruoyi.common.core.domain.Result;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.dataAsset.remote.RemoteRuleEngineService;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.ruleEngine.remote.RemoteRuleEngineService;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.ApplicationArguments;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.client.config;
|
||||
package com.ruoyi.ruleEngine.client.config;
|
||||
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.context.annotation.Import;
|
|
@ -1 +1 @@
|
|||
com.ruoyi.dataAsset.client.config.RuleEngineClientConfig
|
||||
com.ruoyi.ruleEngine.client.config.RuleEngineClientConfig
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.constant;
|
||||
package com.ruoyi.ruleEngine.constant;
|
||||
|
||||
/**
|
||||
* 配置编码常量
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.constant;
|
||||
package com.ruoyi.ruleEngine.constant;
|
||||
|
||||
/**
|
||||
* 引擎版本常量
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.constant;
|
||||
package com.ruoyi.ruleEngine.constant;
|
||||
|
||||
/**
|
||||
* 规则运行常量
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.context;
|
||||
package com.ruoyi.ruleEngine.context;
|
||||
|
||||
import com.ruoyi.dataAsset.model.process.DataModelProcessModel;
|
||||
import com.ruoyi.ruleEngine.model.process.DataModelProcessModel;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.context;
|
||||
package com.ruoyi.ruleEngine.context;
|
||||
|
||||
import com.ruoyi.dataAsset.model.process.DataSetProcessModel;
|
||||
import com.ruoyi.ruleEngine.model.process.DataSetProcessModel;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.context;
|
||||
package com.ruoyi.ruleEngine.context;
|
||||
|
||||
import com.ruoyi.dataAsset.model.process.RecordProcessModel;
|
||||
import com.ruoyi.ruleEngine.model.process.RecordProcessModel;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.context;
|
||||
package com.ruoyi.ruleEngine.context;
|
||||
|
||||
/**
|
||||
* 任务上下文
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain;
|
||||
package com.ruoyi.ruleEngine.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
|
@ -10,9 +10,9 @@ import lombok.AllArgsConstructor;
|
|||
import lombok.experimental.SuperBuilder;
|
||||
import io.swagger.annotations.*;
|
||||
import com.ruoyi.common.core.annotation.Excel;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineMaintenanceQueryReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineMaintenanceSaveReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineMaintenanceEditReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceQueryReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceSaveReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceEditReq;
|
||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.Date;
|
|
@ -1,8 +1,9 @@
|
|||
package com.ruoyi.dataAsset.domain;
|
||||
package com.ruoyi.ruleEngine.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
@ -10,9 +11,8 @@ import lombok.AllArgsConstructor;
|
|||
import lombok.experimental.SuperBuilder;
|
||||
import io.swagger.annotations.*;
|
||||
import com.ruoyi.common.core.annotation.Excel;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionSaveReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionEditReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq;
|
||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.Date;
|
||||
|
@ -74,6 +74,11 @@ public class EngineVersion extends BaseEntity {
|
|||
@ApiModelProperty(name = "状态", value = "状态", required = true)
|
||||
private String status;
|
||||
|
||||
/** 描述 */
|
||||
@Excel(name = "描述")
|
||||
@ApiModelProperty(name = "描述", value = "描述", required = true)
|
||||
private String description;
|
||||
|
||||
/** 引擎维护编号 */
|
||||
@Excel(name = "引擎维护编号")
|
||||
@ApiModelProperty(name = "引擎维护编号", value = "引擎维护编号", required = true)
|
||||
|
@ -88,8 +93,10 @@ public class EngineVersion extends BaseEntity {
|
|||
.name(engineConfigQueryReq.getName())
|
||||
.versionCode(engineConfigQueryReq.getVersionCode())
|
||||
.ruleContent(engineConfigQueryReq.getRuleContent())
|
||||
.isActivate(engineConfigQueryReq.getIsActivate())
|
||||
.testStatus(engineConfigQueryReq.getTestStatus())
|
||||
.status(engineConfigQueryReq.getStatus())
|
||||
.description(engineConfigQueryReq.getDescription())
|
||||
.engineMaintenanceId(engineConfigQueryReq.getEngineMaintenanceId())
|
||||
.build();
|
||||
}
|
||||
|
@ -103,8 +110,10 @@ public class EngineVersion extends BaseEntity {
|
|||
.name(engineConfigSaveReq.getName())
|
||||
.versionCode(engineConfigSaveReq.getVersionCode())
|
||||
.ruleContent(engineConfigSaveReq.getRuleContent())
|
||||
.isActivate(engineConfigSaveReq.getIsActivate())
|
||||
.testStatus(engineConfigSaveReq.getTestStatus())
|
||||
.status(engineConfigSaveReq.getStatus())
|
||||
.description(engineConfigSaveReq.getDescription())
|
||||
.engineMaintenanceId(engineConfigSaveReq.getEngineMaintenanceId())
|
||||
.remark(engineConfigSaveReq.getRemark())
|
||||
.createBy(createBy.get())
|
||||
|
@ -122,8 +131,10 @@ public class EngineVersion extends BaseEntity {
|
|||
.name(engineConfigEditReq.getName())
|
||||
.versionCode(engineConfigEditReq.getVersionCode())
|
||||
.ruleContent(engineConfigEditReq.getRuleContent())
|
||||
.isActivate(engineConfigEditReq.getIsActivate())
|
||||
.testStatus(engineConfigEditReq.getTestStatus())
|
||||
.status(engineConfigEditReq.getStatus())
|
||||
.description(engineConfigEditReq.getDescription())
|
||||
.engineMaintenanceId(engineConfigEditReq.getEngineMaintenanceId())
|
||||
.remark(engineConfigEditReq.getRemark())
|
||||
.updateBy(updateBy.get())
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.model;
|
||||
package com.ruoyi.ruleEngine.domain.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import com.ruoyi.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
|
@ -24,12 +24,10 @@ public class EngineVersionEditReq extends BaseEntity {
|
|||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 版本类名 */
|
||||
@Excel(name = "版本类名")
|
||||
@ApiModelProperty(name = "版本类名", value = "版本类名", required = true)
|
||||
private String versionClass;
|
||||
|
||||
/** 版本名 */
|
||||
@Excel(name = "版本名")
|
||||
@ApiModelProperty(name = "版本名", value = "版本名", required = true)
|
||||
private String name;
|
||||
|
||||
|
@ -42,20 +40,21 @@ public class EngineVersionEditReq extends BaseEntity {
|
|||
private String ruleContent;
|
||||
|
||||
/** 是否激活 */
|
||||
@Excel(name = "是否激活")
|
||||
@ApiModelProperty(name = "是否激活", value = "是否激活", required = true)
|
||||
private String isActivate;
|
||||
|
||||
/** 测试状态 */
|
||||
@Excel(name = "测试状态")
|
||||
@ApiModelProperty(name = "测试状态", value = "测试状态", required = true)
|
||||
private String testStatus;
|
||||
|
||||
/** 状态 */
|
||||
@Excel(name = "状态")
|
||||
@ApiModelProperty(name = "状态", value = "状态", required = true)
|
||||
private String status;
|
||||
|
||||
/** 描述 */
|
||||
@ApiModelProperty(name = "描述", value = "描述", required = true)
|
||||
private String description;
|
||||
|
||||
/** 引擎维护编号 */
|
||||
@ApiModelProperty(name = "引擎维护编号", value = "引擎维护编号", required = true)
|
||||
private Long engineMaintenanceId;
|
|
@ -1,6 +1,5 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import com.ruoyi.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
@ -24,12 +23,10 @@ public class EngineVersionQueryReq extends BaseEntity {
|
|||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 版本类名 */
|
||||
@Excel(name = "版本类名")
|
||||
@ApiModelProperty(name = "版本类名", value = "版本类名", required = true)
|
||||
private String versionClass;
|
||||
|
||||
/** 版本名 */
|
||||
@Excel(name = "版本名")
|
||||
@ApiModelProperty(name = "版本名", value = "版本名", required = true)
|
||||
private String name;
|
||||
|
||||
|
@ -42,20 +39,21 @@ public class EngineVersionQueryReq extends BaseEntity {
|
|||
private String ruleContent;
|
||||
|
||||
/** 是否激活 */
|
||||
@Excel(name = "是否激活")
|
||||
@ApiModelProperty(name = "是否激活", value = "是否激活", required = true)
|
||||
private String isActivate;
|
||||
|
||||
/** 测试状态 */
|
||||
@Excel(name = "测试状态")
|
||||
@ApiModelProperty(name = "测试状态", value = "测试状态", required = true)
|
||||
private String testStatus;
|
||||
|
||||
/** 状态 */
|
||||
@Excel(name = "状态")
|
||||
@ApiModelProperty(name = "状态", value = "状态", required = true)
|
||||
private String status;
|
||||
|
||||
/** 描述 */
|
||||
@ApiModelProperty(name = "描述", value = "描述", required = true)
|
||||
private String description;
|
||||
|
||||
/** 引擎维护编号 */
|
||||
@ApiModelProperty(name = "引擎维护编号", value = "引擎维护编号")
|
||||
private Long engineMaintenanceId;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import com.ruoyi.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
|
@ -24,47 +24,42 @@ public class EngineVersionSaveReq extends BaseEntity {
|
|||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 编号 */
|
||||
|
||||
@ApiModelProperty(name = "编号", value = "编号")
|
||||
private Long id;
|
||||
|
||||
/** 版本类名 */
|
||||
@Excel(name = "版本类名")
|
||||
@ApiModelProperty(name = "版本类名", value = "版本类名", required = true)
|
||||
private String versionClass;
|
||||
|
||||
/** 版本名 */
|
||||
@Excel(name = "版本名")
|
||||
@ApiModelProperty(name = "版本名", value = "版本名", required = true)
|
||||
private String name;
|
||||
|
||||
/** 版本编码 */
|
||||
|
||||
@ApiModelProperty(name = "版本编码", value = "版本编码", required = true)
|
||||
private String versionCode;
|
||||
|
||||
/** 规则内容 */
|
||||
|
||||
@ApiModelProperty(name = "规则内容", value = "规则内容", required = true)
|
||||
private String ruleContent;
|
||||
|
||||
/** 是否激活 */
|
||||
@Excel(name = "是否激活")
|
||||
@ApiModelProperty(name = "是否激活", value = "是否激活", required = true)
|
||||
private String isActivate;
|
||||
|
||||
/** 测试状态 */
|
||||
@Excel(name = "测试状态")
|
||||
@ApiModelProperty(name = "测试状态", value = "测试状态", required = true)
|
||||
private String testStatus;
|
||||
|
||||
/** 状态 */
|
||||
@Excel(name = "状态")
|
||||
@ApiModelProperty(name = "状态", value = "状态", required = true)
|
||||
private String status;
|
||||
|
||||
/** 引擎维护编号 */
|
||||
/** 描述 */
|
||||
@ApiModelProperty(name = "描述", value = "描述", required = true)
|
||||
private String description;
|
||||
|
||||
/** 引擎维护编号 */
|
||||
@ApiModelProperty(name = "引擎维护编号", value = "引擎维护编号", required = true)
|
||||
private Long engineMaintenanceId;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.req;
|
||||
package com.ruoyi.ruleEngine.domain.req;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.resp;
|
||||
package com.ruoyi.ruleEngine.domain.resp;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.SuperBuilder;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.domain.resp;
|
||||
package com.ruoyi.ruleEngine.domain.resp;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.dynamicLoad;
|
||||
package com.ruoyi.ruleEngine.dynamicLoad;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.dynamicLoad;
|
||||
package com.ruoyi.ruleEngine.dynamicLoad;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.engine;
|
||||
package com.ruoyi.ruleEngine.engine;
|
||||
|
||||
/**
|
||||
* 引擎
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.engine.action;
|
||||
package com.ruoyi.ruleEngine.engine.action;
|
||||
|
||||
/**
|
||||
* 丢弃动作
|
|
@ -1,7 +1,7 @@
|
|||
package com.ruoyi.dataAsset.engine.custom;
|
||||
package com.ruoyi.ruleEngine.engine.custom;
|
||||
|
||||
import com.ruoyi.dataAsset.engine.action.ActionDiscard;
|
||||
import com.ruoyi.dataAsset.engine.scope.DataModelEngine;
|
||||
import com.ruoyi.ruleEngine.engine.action.ActionDiscard;
|
||||
import com.ruoyi.ruleEngine.engine.scope.DataModelEngine;
|
||||
|
||||
/**
|
||||
* 不为空自定义引擎
|
|
@ -1,9 +1,9 @@
|
|||
package com.ruoyi.dataAsset.engine.scope;
|
||||
package com.ruoyi.ruleEngine.engine.scope;
|
||||
|
||||
import com.ruoyi.dataAsset.engine.Engine;
|
||||
import com.ruoyi.dataAsset.model.DataModel;
|
||||
import com.ruoyi.dataAsset.model.process.DataModelProcessModel;
|
||||
import com.ruoyi.dataAsset.context.DataModelContextHolder;
|
||||
import com.ruoyi.ruleEngine.engine.Engine;
|
||||
import com.ruoyi.ruleEngine.model.DataModel;
|
||||
import com.ruoyi.ruleEngine.model.process.DataModelProcessModel;
|
||||
import com.ruoyi.ruleEngine.context.DataModelContextHolder;
|
||||
|
||||
/**
|
||||
* 数据模型引擎
|
|
@ -1,10 +1,11 @@
|
|||
package com.ruoyi.dataAsset.engine.scope;
|
||||
package com.ruoyi.ruleEngine.engine.scope;
|
||||
|
||||
import com.ruoyi.ruleEngine.context.DataSetContextHolder;
|
||||
import com.ruoyi.ruleEngine.engine.Engine;
|
||||
import com.ruoyi.ruleEngine.model.DataSetModel;
|
||||
import com.ruoyi.ruleEngine.model.RecordModel;
|
||||
import com.ruoyi.ruleEngine.model.process.DataSetProcessModel;
|
||||
|
||||
import com.ruoyi.dataAsset.context.DataSetContextHolder;
|
||||
import com.ruoyi.dataAsset.engine.Engine;
|
||||
import com.ruoyi.dataAsset.model.DataSetModel;
|
||||
import com.ruoyi.dataAsset.model.RecordModel;
|
||||
import com.ruoyi.dataAsset.model.process.DataSetProcessModel;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
|
@ -1,10 +1,11 @@
|
|||
package com.ruoyi.dataAsset.engine.scope;
|
||||
package com.ruoyi.ruleEngine.engine.scope;
|
||||
|
||||
import com.ruoyi.ruleEngine.context.RecordContextHolder;
|
||||
import com.ruoyi.ruleEngine.engine.Engine;
|
||||
import com.ruoyi.ruleEngine.model.DataModel;
|
||||
import com.ruoyi.ruleEngine.model.RecordModel;
|
||||
import com.ruoyi.ruleEngine.model.process.RecordProcessModel;
|
||||
|
||||
import com.ruoyi.dataAsset.context.RecordContextHolder;
|
||||
import com.ruoyi.dataAsset.engine.Engine;
|
||||
import com.ruoyi.dataAsset.model.DataModel;
|
||||
import com.ruoyi.dataAsset.model.RecordModel;
|
||||
import com.ruoyi.dataAsset.model.process.RecordProcessModel;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.model;
|
||||
package com.ruoyi.ruleEngine.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.model;
|
||||
package com.ruoyi.ruleEngine.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.model;
|
||||
package com.ruoyi.ruleEngine.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.model.process;
|
||||
package com.ruoyi.ruleEngine.model.process;
|
||||
|
||||
import com.ruoyi.dataAsset.model.DataModel;
|
||||
import com.ruoyi.ruleEngine.model.DataModel;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.model.process;
|
||||
package com.ruoyi.ruleEngine.model.process;
|
||||
|
||||
import com.ruoyi.dataAsset.model.DataSetModel;
|
||||
import com.ruoyi.ruleEngine.model.DataSetModel;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.model.process;
|
||||
package com.ruoyi.ruleEngine.model.process;
|
||||
|
||||
import com.ruoyi.dataAsset.model.RecordModel;
|
||||
import com.ruoyi.ruleEngine.model.RecordModel;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package com.ruoyi.dataAsset.util;
|
||||
package com.ruoyi.ruleEngine.util;
|
||||
|
||||
import com.ruoyi.dataAsset.context.DataSetContextHolder;
|
||||
import com.ruoyi.dataAsset.model.DataModel;
|
||||
import com.ruoyi.dataAsset.model.DataSetModel;
|
||||
import com.ruoyi.dataAsset.model.RecordModel;
|
||||
import com.ruoyi.dataAsset.model.process.DataSetProcessModel;
|
||||
import com.ruoyi.ruleEngine.context.DataSetContextHolder;
|
||||
import com.ruoyi.ruleEngine.model.DataModel;
|
||||
import com.ruoyi.ruleEngine.model.DataSetModel;
|
||||
import com.ruoyi.ruleEngine.model.RecordModel;
|
||||
import com.ruoyi.ruleEngine.model.process.DataSetProcessModel;
|
||||
import java.sql.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
|
@ -1,11 +1,10 @@
|
|||
package com.ruoyi.dataAsset.remote;
|
||||
package com.ruoyi.ruleEngine.remote;
|
||||
|
||||
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
||||
import com.ruoyi.common.core.domain.Result;
|
||||
import com.ruoyi.common.security.annotation.InnerAuth;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.dataAsset.remote.factory.RemoteRuleEngineFactory;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.ruleEngine.remote.factory.RemoteRuleEngineFactory;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
@ -1,9 +1,9 @@
|
|||
package com.ruoyi.dataAsset.remote.factory;
|
||||
package com.ruoyi.ruleEngine.remote.factory;
|
||||
|
||||
import com.ruoyi.common.core.domain.Result;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.dataAsset.remote.RemoteRuleEngineService;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.ruleEngine.remote.RemoteRuleEngineService;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import java.util.List;
|
||||
|
|
@ -1 +1 @@
|
|||
com.ruoyi.dataAsset.remote.factory.RemoteRuleEngineFactory
|
||||
com.ruoyi.ruleEngine.remote.factory.RemoteRuleEngineFactory
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<mainClass>com.ruoyi.dataAsset.GtlRuleEngineApplication</mainClass>
|
||||
<mainClass>com.ruoyi.ruleEngine.GtlRuleEngineApplication</mainClass>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset;
|
||||
package com.ruoyi.ruleEngine;
|
||||
|
||||
import com.ruoyi.common.security.annotation.EnableCustomConfig;
|
||||
import com.ruoyi.common.security.annotation.EnableMyFeignClients;
|
|
@ -1,10 +1,10 @@
|
|||
package com.ruoyi.dataAsset.controller;
|
||||
package com.ruoyi.ruleEngine.controller;
|
||||
|
||||
import com.ruoyi.common.core.domain.Result;
|
||||
import com.ruoyi.common.core.web.controller.BaseController;
|
||||
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
||||
import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.dataAsset.service.EngineConfigService;
|
||||
import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.ruleEngine.service.EngineConfigService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
@ -1,11 +1,11 @@
|
|||
package com.ruoyi.dataAsset.controller;
|
||||
package com.ruoyi.ruleEngine.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import com.ruoyi.common.core.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.web.page.TableDataInfo;
|
||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||
import com.ruoyi.dataAsset.service.EngineMaintenanceService;
|
||||
import com.ruoyi.ruleEngine.service.EngineMaintenanceService;
|
||||
import io.swagger.annotations.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
@ -21,10 +21,10 @@ import com.ruoyi.common.core.web.controller.BaseController;
|
|||
import com.ruoyi.common.log.annotation.Log;
|
||||
import com.ruoyi.common.log.enums.BusinessType;
|
||||
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
||||
import com.ruoyi.dataAsset.domain.EngineMaintenance;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineMaintenanceQueryReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineMaintenanceSaveReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineMaintenanceEditReq;
|
||||
import com.ruoyi.ruleEngine.domain.EngineMaintenance;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceQueryReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceSaveReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceEditReq;
|
||||
|
||||
|
||||
/**
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.dataAsset.controller;
|
||||
package com.ruoyi.ruleEngine.controller;
|
||||
|
||||
import com.ruoyi.common.core.domain.Result;
|
||||
import com.ruoyi.common.core.web.controller.BaseController;
|
||||
|
@ -6,14 +6,14 @@ import com.ruoyi.common.log.annotation.Log;
|
|||
import com.ruoyi.common.log.enums.BusinessType;
|
||||
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.domain.model.TestData;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionEditReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.dataAsset.domain.req.EngineVersionSaveReq;
|
||||
import com.ruoyi.dataAsset.domain.req.VersionClassCreateReq;
|
||||
import com.ruoyi.dataAsset.domain.resp.VersionClassCreateResp;
|
||||
import com.ruoyi.dataAsset.service.EngineVersionService;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.model.TestData;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq;
|
||||
import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
|
||||
import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
|
||||
import com.ruoyi.ruleEngine.service.EngineVersionService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
|
@ -1,7 +1,7 @@
|
|||
package com.ruoyi.dataAsset.mapper;
|
||||
package com.ruoyi.ruleEngine.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.ruoyi.dataAsset.domain.EngineMaintenance;
|
||||
import com.ruoyi.ruleEngine.domain.EngineMaintenance;
|
||||
|
||||
/**
|
||||
* 引擎维护Mapper接口
|
|
@ -1,7 +1,7 @@
|
|||
package com.ruoyi.dataAsset.mapper;
|
||||
package com.ruoyi.ruleEngine.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
|
||||
/**
|
||||
* 引擎规则版本Mapper接口
|
|
@ -1,6 +1,6 @@
|
|||
package com.ruoyi.dataAsset.service;
|
||||
package com.ruoyi.ruleEngine.service;
|
||||
|
||||
import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
package com.ruoyi.dataAsset.service;
|
||||
package com.ruoyi.ruleEngine.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.dataAsset.domain.EngineMaintenance;
|
||||
import com.ruoyi.ruleEngine.domain.EngineMaintenance;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
|
@ -1,10 +1,10 @@
|
|||
package com.ruoyi.dataAsset.service;
|
||||
package com.ruoyi.ruleEngine.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.domain.model.TestData;
|
||||
import com.ruoyi.dataAsset.domain.req.VersionClassCreateReq;
|
||||
import com.ruoyi.dataAsset.domain.resp.VersionClassCreateResp;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.model.TestData;
|
||||
import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
|
||||
import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
|
@ -1,8 +1,8 @@
|
|||
package com.ruoyi.dataAsset.service.impl;
|
||||
package com.ruoyi.ruleEngine.service.impl;
|
||||
|
||||
import com.ruoyi.dataAsset.constant.ConfigCodeConstants;
|
||||
import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.dataAsset.service.EngineConfigService;
|
||||
import com.ruoyi.ruleEngine.constant.ConfigCodeConstants;
|
||||
import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.ruleEngine.service.EngineConfigService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.io.IOException;
|
|
@ -1,16 +1,16 @@
|
|||
package com.ruoyi.dataAsset.service.impl;
|
||||
package com.ruoyi.ruleEngine.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.ruoyi.common.core.utils.ObjUtils;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.service.EngineVersionService;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.service.EngineVersionService;
|
||||
import com.ruoyi.ruleEngine.mapper.EngineMaintenanceMapper;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.dataAsset.mapper.EngineMaintenanceMapper;
|
||||
import com.ruoyi.dataAsset.domain.EngineMaintenance;
|
||||
import com.ruoyi.dataAsset.service.EngineMaintenanceService;
|
||||
import com.ruoyi.ruleEngine.domain.EngineMaintenance;
|
||||
import com.ruoyi.ruleEngine.service.EngineMaintenanceService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
@ -93,9 +93,10 @@ public class EngineMaintenanceServiceImpl extends ServiceImpl<EngineMaintenanceM
|
|||
*/
|
||||
@Override
|
||||
public void activate(Long id) {
|
||||
EngineMaintenance maintenance = this.getById(id);
|
||||
this.update(new LambdaUpdateWrapper<EngineMaintenance>()
|
||||
.eq(EngineMaintenance::getId,id)
|
||||
.set(EngineMaintenance::getIsActivate,"Y"));
|
||||
.set(EngineMaintenance::getIsActivate,maintenance.getIsActivate().equals("N")?"Y":"N"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -104,9 +105,10 @@ public class EngineMaintenanceServiceImpl extends ServiceImpl<EngineMaintenanceM
|
|||
*/
|
||||
@Override
|
||||
public void close(Long id) {
|
||||
EngineMaintenance maintenance = this.getById(id);
|
||||
this.update(new LambdaUpdateWrapper<EngineMaintenance>()
|
||||
.eq(EngineMaintenance::getId,id)
|
||||
.set(EngineMaintenance::getIsActivate,"N"));
|
||||
.set(EngineMaintenance::getIsActivate,maintenance.getStatus().equals("0")?"1":"0"));
|
||||
}
|
||||
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
package com.ruoyi.dataAsset.service.impl;
|
||||
package com.ruoyi.ruleEngine.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.common.core.exception.ServiceException;
|
||||
import com.ruoyi.common.core.utils.ObjUtils;
|
||||
import com.ruoyi.dataAsset.constant.EngineVersionConstants;
|
||||
import com.ruoyi.dataAsset.constant.RuleOperationConstants;
|
||||
import com.ruoyi.dataAsset.domain.EngineVersion;
|
||||
import com.ruoyi.dataAsset.domain.model.TestData;
|
||||
import com.ruoyi.dataAsset.domain.req.VersionClassCreateReq;
|
||||
import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.dataAsset.domain.resp.VersionClassCreateResp;
|
||||
import com.ruoyi.dataAsset.dynamicLoad.DynamicLoader;
|
||||
import com.ruoyi.dataAsset.mapper.EngineVersionMapper;
|
||||
import com.ruoyi.dataAsset.service.EngineConfigService;
|
||||
import com.ruoyi.dataAsset.service.EngineVersionService;
|
||||
import com.ruoyi.ruleEngine.constant.EngineVersionConstants;
|
||||
import com.ruoyi.ruleEngine.constant.RuleOperationConstants;
|
||||
import com.ruoyi.ruleEngine.domain.EngineVersion;
|
||||
import com.ruoyi.ruleEngine.domain.model.TestData;
|
||||
import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
|
||||
import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
|
||||
import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
|
||||
import com.ruoyi.ruleEngine.dynamicLoad.DynamicLoader;
|
||||
import com.ruoyi.ruleEngine.mapper.EngineVersionMapper;
|
||||
import com.ruoyi.ruleEngine.service.EngineConfigService;
|
||||
import com.ruoyi.ruleEngine.service.EngineVersionService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
Loading…
Reference in New Issue