diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/SceneConfigServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/SceneConfigServiceImpl.java index e2057195..d651b301 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/SceneConfigServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/SceneConfigServiceImpl.java @@ -30,12 +30,15 @@ public class SceneConfigServiceImpl implements SceneConfigService { PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); LambdaQueryWrapper sceneConfigLambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(queryVO.getGroupName())) { + sceneConfigLambdaQueryWrapper.eq(SceneConfig::getGroupName, queryVO.getGroupName()); + } + if (StrUtil.isNotBlank(queryVO.getSceneName())) { sceneConfigLambdaQueryWrapper.eq(SceneConfig::getSceneName, queryVO.getSceneName()); } - pageDTO = sceneConfigMapper.selectPage(pageDTO, sceneConfigLambdaQueryWrapper - .eq(SceneConfig::getGroupName, queryVO.getGroupName()).orderByDesc(SceneConfig::getCreateDt)); + pageDTO = sceneConfigMapper.selectPage(pageDTO, sceneConfigLambdaQueryWrapper.orderByDesc(SceneConfig::getCreateDt)); return new PageResult<>(pageDTO, SceneConfigResponseVOConverter.INSTANCE.batchConvert(pageDTO.getRecords())); diff --git a/frontend/src/config/router.config.js b/frontend/src/config/router.config.js index 9c27ae55..e6f5486a 100644 --- a/frontend/src/config/router.config.js +++ b/frontend/src/config/router.config.js @@ -58,6 +58,25 @@ export const asyncRouterMap = [ redirect: '/retry/list', meta: { title: '重试任务管理', icon: 'schedule', hideChildrenInMenu: true, keepAlive: true, permission: ['retryTask'] }, children: [ + { + path: '/retry/scene/list', + name: 'SceneList', + component: () => import('@/views/task/SceneList'), + meta: { title: '场景列表', icon: 'profile', keepAlive: true, permission: ['retryTask'] } + }, + { + path: '/retry/scene/config', + name: 'SceneFrom', + hidden: true, + component: () => import('@/views/task/form/SceneFrom'), + meta: { title: '场景配置', icon: 'profile', keepAlive: true, permission: ['retryTask'] } + }, + { + path: '/retry/notify/list', + name: 'NotifyList', + component: () => import('@/views/task/NotifyList'), + meta: { title: '通知配置', icon: 'profile', keepAlive: true, permission: ['retryTask'] } + }, { path: '/retry/list', name: 'RetryTaskList', diff --git a/frontend/src/utils/enum.js b/frontend/src/utils/jobEnum.js similarity index 100% rename from frontend/src/utils/enum.js rename to frontend/src/utils/jobEnum.js diff --git a/frontend/src/utils/retryEnum.js b/frontend/src/utils/retryEnum.js new file mode 100644 index 00000000..ac5e9b5e --- /dev/null +++ b/frontend/src/utils/retryEnum.js @@ -0,0 +1,141 @@ +const enums = { + sceneStatus: { + '0': { + 'name': '停用', + 'color': '#9c1f1f' + }, + '1': { + 'name': '启用', + 'color': '#f5a22d' + } + }, + backOffLabels: { + '1': { + 'name': '延迟等级', + 'color': '#d06892' + }, + '2': { + 'name': '固定时间', + 'color': '#f5a22d' + }, + '3': { + 'name': 'CRON表达式', + 'color': '#e1f52d' + }, + '4': { + 'name': '随机等待', + 'color': '#a127f3' + } + }, + triggerInterval: { + '1': { + 'name': 'CRON表达式', + 'color': '#d06892' + }, + '2': { + 'name': '固定时间', + 'color': '#f5a22d' + } + }, + blockStrategy: { + '1': { + 'name': '丢弃策略', + 'color': '#d06892' + }, + '2': { + 'name': '覆盖', + 'color': '#f5a22d' + }, + '3': { + 'name': '并行', + 'color': '#e1f52d' + } + }, + executorType: { + '1': { + 'name': 'Java', + 'color': '#d06892' + } + }, + routeKey: { + '4': { + 'name': '轮询', + 'color': '#8f68d2' + }, + '1': { + 'name': '一致性Hash', + 'color': '#d06892' + }, + '2': { + 'name': '随机', + 'color': '#f5a22d' + }, + '3': { + 'name': 'LRU', + 'color': '#e1f52d' + } + }, + taskBatchStatus: { + '1': { + 'name': '待处理', + 'color': '#64a6ea' + }, + '2': { + 'name': '运行中', + 'color': '#1b7ee5' + }, + '3': { + 'name': '成功', + 'color': '#087da1' + }, + '4': { + 'name': '失败', + 'color': '#f52d80' + }, + '5': { + 'name': '停止', + 'color': '#ac2df5' + }, + '6': { + 'name': '取消', + 'color': '#f5732d' + } + }, + operationReason: { + '0': { + 'name': '' + }, + '1': { + 'name': '执行超时', + 'color': '#64a6ea' + }, + '2': { + 'name': '无客户端节点', + 'color': '#1b7ee5' + }, + '3': { + 'name': '任务已关闭', + 'color': '#087da1' + } + }, + taskStatus: { + '2': { + 'name': '运行中', + 'color': '#1b7ee5' + }, + '3': { + 'name': '成功', + 'color': '#087da1' + }, + '4': { + 'name': '失败', + 'color': '#f52d80' + }, + '5': { + 'name': '停止', + 'color': '#ac2df5' + } + } +} + +module.exports = enums diff --git a/frontend/src/views/config/basicConfigForm/BasicConfigForm.vue b/frontend/src/views/config/basicConfigForm/BasicConfigForm.vue index a8ee8021..94eaf232 100644 --- a/frontend/src/views/config/basicConfigForm/BasicConfigForm.vue +++ b/frontend/src/views/config/basicConfigForm/BasicConfigForm.vue @@ -1,17 +1,17 @@