diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/model/BaseDataDebugResult.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/model/BaseDataDebugResult.java new file mode 100644 index 0000000000000000000000000000000000000000..f885854aabeb763ce4a37c3f06f2634fde70e909 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/model/BaseDataDebugResult.java @@ -0,0 +1,60 @@ +package cn.icanci.rec.admin.biz.model; + +import java.io.Serializable; + +/** + * 基础数据Debug返回结果 + * + * @author icanci + * @since 1.0 Created in 2022/11/13 14:47 + */ +public class BaseDataDebugResult implements Serializable { + /** + * 前端传入的执行结果类型 + */ + private String reqResultType; + /** + * 脚本类型 + */ + private String scriptType; + /** + * 实际执行结果 + */ + private String realResult; + /** + * 执行过程中出现的异常 + */ + private String exceptionMessage; + + public String getReqResultType() { + return reqResultType; + } + + public void setReqResultType(String reqResultType) { + this.reqResultType = reqResultType; + } + + public String getRealResult() { + return realResult; + } + + public String getScriptType() { + return scriptType; + } + + public void setScriptType(String scriptType) { + this.scriptType = scriptType; + } + + public void setRealResult(String realResult) { + this.realResult = realResult; + } + + public String getExceptionMessage() { + return exceptionMessage; + } + + public void setExceptionMessage(String exceptionMessage) { + this.exceptionMessage = exceptionMessage; + } +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/BaseDataService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/BaseDataService.java index 99a32c52f781e1d58a28578f91008e47484146ff..44da7034988f8433454e05cb092352dbfaef2806 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/BaseDataService.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/BaseDataService.java @@ -1,11 +1,12 @@ package cn.icanci.rec.admin.biz.service; -import java.util.List; - +import cn.icanci.rec.admin.biz.model.BaseDataDebugResult; import cn.icanci.rec.admin.dal.mongodb.common.PageList; import cn.icanci.rec.common.model.TextValue; import cn.icanci.rec.common.model.config.BaseDataVO; +import java.util.List; + /** * @author icanci * @since 1.0 Created in 2022/11/12 08:57 @@ -44,6 +45,7 @@ public interface BaseDataService extends BaseService { * * @param baseData baseData * @param scriptContentTest 测试参数 + * @return BaseDataDebugResult */ - void debug(BaseDataVO baseData, String scriptContentTest); + BaseDataDebugResult debug(BaseDataVO baseData, 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 37bb72fad6122d9d94f6657615b8efe85650e83c..edbf31156afa3a58778698bc15fa618b1cf3d475 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 @@ -1,6 +1,7 @@ package cn.icanci.rec.admin.biz.service.impl; import cn.icanci.rec.admin.biz.mapper.BaseDataMapper; +import cn.icanci.rec.admin.biz.model.BaseDataDebugResult; import cn.icanci.rec.admin.biz.service.BaseDataService; import cn.icanci.rec.admin.dal.mongodb.common.PageList; import cn.icanci.rec.admin.dal.mongodb.daointerface.BaseDataDAO; @@ -17,6 +18,7 @@ import java.util.List; import javax.annotation.Resource; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.google.common.collect.Lists; @@ -85,7 +87,7 @@ public class BaseDataServiceImpl implements BaseDataService { } @Override - public void debug(BaseDataVO baseData, String scriptContentTest) { + public BaseDataDebugResult debug(BaseDataVO baseData, String scriptContentTest) { RecScriptEngineContext context; ResultTypeEnum resultType = baseData.getResultType(); if (resultType != null) { @@ -95,7 +97,12 @@ public class BaseDataServiceImpl implements BaseDataService { context = recScriptEngine.eval(baseData.getScriptType(), scriptContentTest); } Object realRetVal = context.getRealRetVal(); - System.out.println(realRetVal); - // TODO + + BaseDataDebugResult result = new BaseDataDebugResult(); + result.setReqResultType(baseData.getResultType() == null ? "无" : baseData.getResultType().getDesc()); + result.setScriptType(baseData.getScriptType().getDesc()); + result.setRealResult(String.valueOf(realRetVal)); + result.setExceptionMessage(context.getThrowable() == null ? StringUtils.EMPTY : context.getThrowable().getMessage()); + return result; } } 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 2787029baf1d1d0d727611424198fb690ea8c064..c6e80bc90bf1b09d79efaa169afba584dd2008cb 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 @@ -27,7 +27,6 @@ -