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 c02dc1b0f8083c2c6adf0a66a2d3264c11dd80ab..99a32c52f781e1d58a28578f91008e47484146ff 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,10 +1,11 @@ package cn.icanci.rec.admin.biz.service; +import java.util.List; + 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 @@ -21,4 +22,28 @@ public interface BaseDataService extends BaseService { @Override PageList queryPage(BaseDataVO baseDataVO, int pageNum, int pageSize); + + /** + * BaseDataVO + * + * @param filedName filedName + * @param domainCode domainCode + * @return BaseDataVO + */ + BaseDataVO queryByFieldNameAndDomainCode(String filedName, String domainCode); + + /** + * 加载下拉框 + * + * @return 返回下拉框数据 + */ + List loadSelector(); + + /** + * 测试 + * + * @param baseData baseData + * @param scriptContentTest 测试参数 + */ + void 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 9c5095de4762b73258d45342aa82e7731d68d0e3..8b590ad65e04414edcc1e7b45d4f2de942d9d6da 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 @@ -5,14 +5,18 @@ 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; import cn.icanci.rec.admin.dal.mongodb.dateobject.BaseDataDO; +import cn.icanci.rec.common.model.TextValue; import cn.icanci.rec.common.model.config.BaseDataVO; import java.util.List; import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; +import com.google.common.collect.Lists; + /** * @author icanci * @since 1.0 Created in 2022/11/12 08:58 @@ -48,4 +52,34 @@ public class BaseDataServiceImpl implements BaseDataService { PageList pageQuery = baseDataDAO.pageQuery(baseDataMapper.vo2do(baseData), pageNum, pageSize); return new PageList<>(baseDataMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); } + + @Override + public BaseDataVO queryByFieldNameAndDomainCode(String fieldName, String domainCode) { + return baseDataMapper.do2vo(baseDataDAO.queryByFieldNameAndDomainCode(fieldName, domainCode)); + } + + @Override + public List loadSelector() { + List baseDatas = queryAll(); + if (CollectionUtils.isEmpty(baseDatas)) { + return Lists.newArrayList(); + } + List textValues = Lists.newArrayList(); + for (BaseDataVO baseData : baseDatas) { + String label; + if (isDeleted(baseData)) { + label = String.format(DELETED_FORMAT, baseData.getFieldName()); + } else { + label = String.format(NOT_DELETED_FORMAT, baseData.getFieldName()); + } + String value = baseData.getUuid(); + textValues.add(new TextValue(label, value)); + } + return textValues; + } + + @Override + public void debug(BaseDataVO baseData, String scriptContentTest) { + // TODO + } } diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java index 169c91e928734d4ec38b1fdacd220b6b3b39eea4..a10683233b45656542ad70d0ececfaac58ffe9c9 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java @@ -78,7 +78,7 @@ public class MetadataServiceImpl implements MetadataService { } else { label = String.format(NOT_DELETED_FORMAT, metadataName); } - textValues.add(new TextValue(label, metadata.getDomainCode(), metadata.getMetadataPairs())); + textValues.add(new TextValue(label, metadata.getUuid(), metadata.getMetadataPairs())); } return textValues; } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDataDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDataDAO.java index 2711b29c1e1505dab4daa467773c7cc9a64d3798..ad0e51539579d7816ed87c55525a943aaf02e20c 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDataDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDataDAO.java @@ -16,6 +16,8 @@ public interface BaseDataDAO extends BaseDAO { */ Class COLLECTION_CLASS = BaseDataDO.class; + BaseDataDO queryByFieldNameAndDomainCode(String fieldName, String domainCode); + interface BaseDataColumn extends BaseColumn { /** * 域Code @@ -25,6 +27,10 @@ public interface BaseDataDAO extends BaseDAO { * 基础数据名称 */ String fieldName = "fieldName"; + /** + * 基础数据Code + */ + String fieldCode = "fieldCode"; /** * 数据类型(布尔、字符串、数值、日期、元数据等) */ diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDataDO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDataDO.java index 8f37db96086d92201464866dd95b2852f6132eca..370ee2a768e9da33c480e1331392daf72e7d0ab2 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDataDO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDataDO.java @@ -23,6 +23,12 @@ public class BaseDataDO extends BaseDO { * @see DataTypeEnum#name() */ private String dataType; + /** + * 关联的元数据uuid + * + * {@link DataTypeEnum#METADATA} + */ + private String metadataUuid; /** * 脚本执行类型 * @@ -66,6 +72,14 @@ public class BaseDataDO extends BaseDO { this.dataType = dataType; } + public String getMetadataUuid() { + return metadataUuid; + } + + public void setMetadataUuid(String metadataUuid) { + this.metadataUuid = metadataUuid; + } + public String getScriptType() { return scriptType; } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoBaseDataDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoBaseDataDAO.java index d9e2e6832986cdf062decb1db804965b950f32d3..6997d9ebe54a1ecc1b0e3be81a15dc7b9ee02436 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoBaseDataDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoBaseDataDAO.java @@ -62,6 +62,15 @@ public class MongoBaseDataDAO extends AbstractBaseDAO implements Bas criteria.and(BaseDataColumn.env).is(DEFAULT_ENV); Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } + @Override + public BaseDataDO queryByFieldNameAndDomainCode(String fieldName, String domainCode) { + Criteria criteria = Criteria.where(BaseDataColumn.fieldName).is(fieldName); + criteria.and(BaseDataColumn.env).is(DEFAULT_ENV); + criteria.and(BaseDataColumn.domainCode).is(domainCode); + 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/basedataApi.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/basedataApi.js new file mode 100644 index 0000000000000000000000000000000000000000..1e816485e86e852420953af073e45c06aa1b51db --- /dev/null +++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/basedataApi.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +/** + * 验证 fieldName + * + * @param fieldName fieldName + * @param domainCode domainCode + * @returns {*} + */ +export async function remoteValidateFieldName(fieldName, domainCode) { + return await request({ + url: '/rec/baseData/validateFieldName/' + fieldName + "/" + domainCode, + method: 'get', + }) +} + +/** + * 保存 + * + * @param baseData baseData + * @returns {*} + */ +export async function saveBaseData(baseData) { + return await request({ + url: '/rec/baseData/save', + method: 'post', + data: baseData + }) +} + +/** + * 分页查询 + * + * @param baseData baseData + * @param paginator paginator + * @returns {*} + */ +export async function baseDataPageQuery(baseData, paginator) { + return await request({ + url: '/rec/baseData/query', + method: 'post', + data: { + 'baseData': baseData, + 'paginator': paginator + } + }) +} + +/** + * 测试 + * + * @param baseData baseData + * @param scriptContentTest scriptContentTest + * @returns {*} + */ +export async function baseDataDebug(baseData, scriptContentTest) { + return await request({ + url: '/rec/baseData/debug', + method: 'post', + data: { + 'baseData': baseData, + 'scriptContentTest': scriptContentTest + } + }) +} diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js index efa7986a9589263aca1667294f13dbb928d0e9d4..23c305a6f552aa5ac7241c8c514710d58e76355c 100644 --- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js +++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/loadSelectorApi.js @@ -6,43 +6,187 @@ import request from '@/utils/request' * @returns {*} */ export async function loadDomainSelector() { - let ret = await request({ - url: '/rec/domain/loadSelector', - method: 'get', - }); - if (ret.ok) { - return ret.data.textValues; - } - return [] + let ret = await request({ + url: '/rec/domain/loadSelector', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] } +/** + * loadMetadataSelector + * + * @returns {*} + */ +export async function loadMetadataSelector(domainCode) { + let ret = await request({ + url: '/rec/metadata/loadSelector/' + domainCode, + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + + /** * @param domainCode domainCode * @returns {*} */ export async function loadDomainSceneSelector(domainCode) { - let ret = await request({ - url: '/rec/scene/loadSelector/' + domainCode, - method: 'get', - }); - if (ret.ok) { - return ret.data.textValues; - } - return [] + let ret = await request({ + url: '/rec/scene/loadSelector/' + domainCode, + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] } - /** * @param domainCode domainCode * @returns {*} */ export async function loadDomainMetadataSelector(domainCode) { - let ret = await request({ - url: '/rec/metadata/loadSelector/' + domainCode, - method: 'get', - }); - if (ret.ok) { - return ret.data.textValues; - } - return [] + let ret = await request({ + url: '/rec/metadata/loadSelector/' + domainCode, + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadDataSourceTypeSelector + * + * @returns {*} + */ +export async function loadDataSourceTypeSelector() { + let ret = await request({ + url: '/rec/common/dataSourceType', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadDataTypeSelector + * + * @returns {*} + */ +export async function loadDataTypeSelector() { + let ret = await request({ + url: '/rec/common/dataType', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadHttpRequestTypeSelector + * + * @returns {*} + */ +export async function loadHttpRequestTypeSelector() { + let ret = await request({ + url: '/rec/common/httpRequestType', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadInterruptSelector + * + * @returns {*} + */ +export async function loadInterruptSelector() { + let ret = await request({ + url: '/rec/common/interrupt', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadOperatorSelector + * + * @returns {*} + */ +export async function loadOperatorSelector() { + let ret = await request({ + url: '/rec/common/operator', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadResultTypeSelector + * + * @returns {*} + */ +export async function loadResultTypeSelector() { + let ret = await request({ + url: '/rec/common/resultType', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadRuleTypeSelector + * + * @returns {*} + */ +export async function loadRuleTypeSelector() { + let ret = await request({ + url: '/rec/common/ruleType', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] +} + +/** + * loadScriptTypeSelector + * + * @returns {*} + */ +export async function loadScriptTypeSelector() { + let ret = await request({ + url: '/rec/common/scriptType', + method: 'get', + }); + if (ret.ok) { + return ret.data.textValues; + } + return [] } diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/metadataApi.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/metadataApi.js index f4458d5858cdd1cbd1b98c2b57f9d0a01d959e26..50436f950c29bf381472cab0cbfe55b674f9e46e 100644 --- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/metadataApi.js +++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/api/metadataApi.js @@ -1,14 +1,15 @@ import request from '@/utils/request' /** - * 验证 domainName + * 验证 metadataName * - * @param domainName domainName + * @param metadataName metadataName + * @param domainCode domainCode * @returns {*} */ -export async function remoteValidateMetadataName(domainName, domainCode) { +export async function remoteValidateMetadataName(metadataName, domainCode) { return await request({ - url: '/rec/metadata/validateMetadataName/' + domainName + "/" + domainCode, + url: '/rec/metadata/validateMetadataName/' + metadataName + "/" + domainCode, method: 'get', }) } diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/router/index.js b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/router/index.js index 0b3a976d95e438846f41623c189ce910480caa08..f7cdd5ab5b6c42c826ca09922aa385445e55b98f 100644 --- a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/router/index.js +++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/router/index.js @@ -70,6 +70,14 @@ export const constantRouterMap = [ title: '元数据配置', icon: 'clipboard' } + }, { + path: 'baseData', + name: 'baseData', + component: () => import('@/views/ruleConfig/baseData'), + meta: { + title: '基础数据配置', + icon: 'clipboard' + } }, ] }, 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 new file mode 100644 index 0000000000000000000000000000000000000000..2787029baf1d1d0d727611424198fb690ea8c064 --- /dev/null +++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/baseData.vue @@ -0,0 +1,258 @@ + + diff --git a/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/baseDataForm.vue b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/baseDataForm.vue new file mode 100644 index 0000000000000000000000000000000000000000..3991e99f032b216a2f2302e48c89716c75543b59 --- /dev/null +++ b/rec-admin/rec-admin-views/src/main/resources/vueboot/src/views/ruleConfig/dialog/baseDataForm.vue @@ -0,0 +1,231 @@ + + + diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/CommonController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/CommonController.java new file mode 100644 index 0000000000000000000000000000000000000000..f2378b1384e1751e7326a56de8f24c05ca49fcf9 --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/CommonController.java @@ -0,0 +1,71 @@ +package cn.icanci.rec.admin.web.controller; + +import cn.icanci.rec.common.enums.*; +import cn.icanci.rec.common.model.TextValue; +import cn.icanci.rec.common.result.R; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 20:12 + */ +@RestController +@RequestMapping("/rec/common") +public class CommonController { + + @GetMapping("dataSourceType") + public R dataSourceType() { + List textValues = Arrays.stream(DataSourceTypeEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("dataType") + public R dataType() { + List textValues = Arrays.stream(DataTypeEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("httpRequestType") + public R httpRequestType() { + List textValues = Arrays.stream(HttpRequestTypeEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("interrupt") + public R interrupt() { + List textValues = Arrays.stream(InterruptEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("operator") + public R operator() { + List textValues = Arrays.stream(OperatorEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("resultType") + public R resultType() { + List textValues = Arrays.stream(ResultTypeEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("ruleType") + public R ruleType() { + List textValues = Arrays.stream(RuleTypeEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + + @GetMapping("scriptType") + public R scriptType() { + List textValues = Arrays.stream(ScriptTypeEnum.values()).map(x -> new TextValue(x.getDesc(), x.name())).collect(Collectors.toList()); + return R.builderOk().data("textValues", textValues).build(); + } + +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/BaseDataController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/BaseDataController.java new file mode 100644 index 0000000000000000000000000000000000000000..d929dd5134ddc102169429a783a28824df02cd1e --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/BaseDataController.java @@ -0,0 +1,63 @@ +package cn.icanci.rec.admin.web.controller.config; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.*; + +import cn.icanci.rec.admin.biz.service.BaseDataService; +import cn.icanci.rec.admin.web.form.BaseDataDebugForm; +import cn.icanci.rec.admin.web.form.BaseDataQueryForm; +import cn.icanci.rec.admin.web.mapper.BaseDataWebMapper; +import cn.icanci.rec.admin.web.model.BaseData; +import cn.icanci.rec.common.model.TextValue; +import cn.icanci.rec.common.model.config.BaseDataVO; +import cn.icanci.rec.common.result.R; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 20:30 + */ +@RestController +@RequestMapping("/rec/baseData") +public class BaseDataController { + @Resource + private BaseDataService baseDataService; + @Resource + private BaseDataWebMapper baseDataWebMapper; + + // ================================ CRUD ================================ + @PostMapping("query") + public R query(@RequestBody BaseDataQueryForm form) { + return R.builderOk() + .data("queryPage", baseDataService.queryPage(baseDataWebMapper.web2vo(form.getBaseData()), form.getPaginator().getCurrentPage(), form.getPaginator().getPageSize())) + .build(); + } + + @PostMapping("save") + public R save(@RequestBody BaseData baseData) { + baseDataService.save(baseDataWebMapper.web2vo(baseData)); + return R.builderOk().build(); + } + + @GetMapping("validateFieldName/{fieldName}/{domainCode}") + public R validateFieldName(@PathVariable("fieldName") String fieldName, @PathVariable("domainCode") String domainCode) { + BaseDataVO baseData = baseDataService.queryByFieldNameAndDomainCode(fieldName, domainCode); + return R.builderOk().data("result", baseData == null).build(); + } + // ================================ Load Selectors ================================ + + @GetMapping("loadSelector") + public R loadSelector() { + List textValues = baseDataService.loadSelector(); + return R.builderOk().data("textValues", textValues).build(); + } + // ================================ Debug ================================ + + @GetMapping("debug") + public R debug(@RequestBody BaseDataDebugForm form) { + baseDataService.debug(baseDataWebMapper.web2vo(form.getBaseData()), form.getScriptContentTest()); + return R.builderOk().data("debugResp", textValues).build(); + } +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataDebugForm.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataDebugForm.java new file mode 100644 index 0000000000000000000000000000000000000000..677fe04c912d351acccbe4dfb0dd57c287a80e7b --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataDebugForm.java @@ -0,0 +1,32 @@ +package cn.icanci.rec.admin.web.form; + +import cn.icanci.rec.admin.web.model.BaseData; + +import java.io.Serializable; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 21:57 + */ +public class BaseDataDebugForm implements Serializable { + private static final long serialVersionUID = -191495744900802008L; + + private BaseData baseData; + private String scriptContentTest; + + public BaseData getBaseData() { + return baseData; + } + + public void setBaseData(BaseData baseData) { + this.baseData = baseData; + } + + public String getScriptContentTest() { + return scriptContentTest; + } + + public void setScriptContentTest(String scriptContentTest) { + this.scriptContentTest = scriptContentTest; + } +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java index de13fb1788fe3f4aa2ecbe4735048a2f91445ad4..0f10c32edbe19f223e155009f2b62ee3c42b6cee 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java @@ -24,6 +24,12 @@ public class BaseData extends Base { * @see DataTypeEnum#name() */ private String dataType; + /** + * 关联的元数据uuid + * + * {@link DataTypeEnum#METADATA} + */ + private String metadataUuid; /** * 脚本执行类型 * @@ -59,6 +65,14 @@ public class BaseData extends Base { this.fieldName = fieldName; } + public String getMetadataUuid() { + return metadataUuid; + } + + public void setMetadataUuid(String metadataUuid) { + this.metadataUuid = metadataUuid; + } + public String getDataType() { return dataType; } diff --git a/rec-common/src/main/java/cn/icanci/rec/common/enums/ModuleTypeEnum.java b/rec-common/src/main/java/cn/icanci/rec/common/enums/ModuleTypeEnum.java index 10e3f6f4a443dcd43b8695f38fa3b716395d8a16..d0e053204dadbe3f883ec6b7170bad2e71ed0c3d 100644 --- a/rec-common/src/main/java/cn/icanci/rec/common/enums/ModuleTypeEnum.java +++ b/rec-common/src/main/java/cn/icanci/rec/common/enums/ModuleTypeEnum.java @@ -16,6 +16,10 @@ public enum ModuleTypeEnum { * REC_METADATA */ REC_METADATA("REC_METADATA", "规则元数据"), + /** + * REC_BASE_DATA + */ + REC_BASE_DATA("REC_BASE_DATA", "规则基础数据"), ; diff --git a/rec-common/src/main/java/cn/icanci/rec/common/model/config/BaseDataVO.java b/rec-common/src/main/java/cn/icanci/rec/common/model/config/BaseDataVO.java index 7cabc048242d33c020025d088d5a041720d0092c..75cb7c0e8749b4f0f9cd2411d9542e28f1ba4878 100644 --- a/rec-common/src/main/java/cn/icanci/rec/common/model/config/BaseDataVO.java +++ b/rec-common/src/main/java/cn/icanci/rec/common/model/config/BaseDataVO.java @@ -23,9 +23,14 @@ public class BaseDataVO extends BaseVO { * 数据类型(布尔、字符串、数值、日期、元数据等) */ private DataTypeEnum dataType; + /** + * 关联的元数据uuid + * + * {@link DataTypeEnum#METADATA} + */ + private String metadataUuid; /** * 脚本执行类型 - * */ private ScriptTypeEnum scriptType; /** @@ -53,6 +58,7 @@ public class BaseDataVO extends BaseVO { this.fieldName = fieldName; } + public DataTypeEnum getDataType() { return dataType; } @@ -61,6 +67,14 @@ public class BaseDataVO extends BaseVO { this.dataType = dataType; } + public String getMetadataUuid() { + return metadataUuid; + } + + public void setMetadataUuid(String metadataUuid) { + this.metadataUuid = metadataUuid; + } + public ScriptTypeEnum getScriptType() { return scriptType; }