diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java index 5bc23910..b02eb59b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java @@ -34,11 +34,12 @@ public class ConfigController { private final ConfigService configService; - private QueryWrapper getQueryWrapper(Config config) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(config.getName()), "name", config.getName()).orderByDesc("id") - .eq(StrUtil.isNotBlank(config.getKey()), "`key`", config.getKey()) - .eq(StrUtil.isNotBlank(config.getIsSys()), "is_sys", config.getIsSys()); + private LambdaQueryWrapper getQueryWrapper(Config config) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(config.getName()), Config::getName, config.getName()) + .eq(StrUtil.isNotBlank(config.getKey()), Config::getKey, config.getKey()) + .eq(StrUtil.isNotBlank(config.getIsSys()), Config::getIsSys, config.getIsSys()) + .orderByDesc(Config::getId); } @GetMapping("/list") @@ -53,7 +54,7 @@ public class ConfigController { return R.ok(configService.getById(id)); } - @GetMapping("/getByKey/{key}") + @GetMapping("/getByKey/{key:\\w+}") @Cacheable(value = CacheConstants.CONFIG_PARAM, key = "#key") public R getByKey(@PathVariable String key) { Config config = configService.getOne(new LambdaQueryWrapper().eq(Config::getKey, key)); @@ -80,11 +81,7 @@ public class ConfigController { @DeleteMapping("/remove/{id:[\\w,]+}") @PreAuthorize("@pms.hasPermission('config_del')") public R remove(@PathVariable String[] id) { - try { - configService.removeByIds(Arrays.asList(id)); - return R.ok(); - } catch (Exception e) { - return R.error(e.getMessage()); - } + configService.removeByIds(Arrays.asList(id)); + return R.ok(); } } diff --git a/kicc-ui/src/api/platform/system/controller/client.ts b/kicc-ui/src/api/platform/system/controller/client.ts index d33d1d7c..b960ec69 100644 --- a/kicc-ui/src/api/platform/system/controller/client.ts +++ b/kicc-ui/src/api/platform/system/controller/client.ts @@ -31,4 +31,4 @@ export const getClient = (id: string) => defHttp.get({ url: `${Api.get}/ export const delClient = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); /** 清理客户端缓存 */ -export const cleanCache = () => defHttp.put({ url: Api.cache }); +export const cleanCache = () => defHttp.delete({ url: Api.cache }); diff --git a/kicc-ui/src/api/platform/system/controller/config.ts b/kicc-ui/src/api/platform/system/controller/config.ts index a8ba25b0..a89f6022 100644 --- a/kicc-ui/src/api/platform/system/controller/config.ts +++ b/kicc-ui/src/api/platform/system/controller/config.ts @@ -1,25 +1,34 @@ -import { ConfigParams, Config, ConfigResult } from '../entity/config' +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { ConfigParams, Config } from '/@/api/platform/system/entity/config'; import { defHttp } from '/@/utils/http/axios'; -import {isDef} from "/@/utils/is"; enum Api { - Page = '/system_proxy/system/config/list', - Save = '/system_proxy/system/config/save', - Update = '/system_proxy/system/config/update', - Remove = '/system_proxy/system/config/remove', + list = '/system_proxy/system/config/list', + add = '/system_proxy/system/config/save', + get = '/system_proxy/system/config', + edit = '/system_proxy/system/config/update', + del = '/system_proxy/system/config/remove', + getByKey = '/system_proxy/system/config/getByKey' } -export const list = (params: ConfigParams) => - defHttp.get({ url: Api.Page, params }); +/** 查询配置列表 */ +export const listConfig = (params?: Partial) => defHttp.get({ url: Api.list, params }); +/** 新增配置 */ +export const addConfig = (params: Partial) => defHttp.post({ url: Api.add, data: params }); -export const set = (params: Config) => { - if (isDef(params.id)) { - return defHttp.put({ url: Api.Update, params }); - }else { - return defHttp.post({ url: Api.Save, params }); - } -} +/** 修改配置 */ +export const editConfig = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +/** 查询配置详细 */ +export const getConfig = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +/** 删除配置 */ +export const delConfig = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); -export const remove = (params: {ids: string}) => - defHttp.delete({ url: Api.Remove + `/${params.ids}` }); +/** 根据 key 查询配置详细 */ +export const getConfigByKey = (id: string) => defHttp.get({ url: `${Api.getByKey}/${id}` }); diff --git a/kicc-ui/src/api/platform/system/controller/dept.ts b/kicc-ui/src/api/platform/system/controller/dept.ts index f989ffa2..dba2070b 100644 --- a/kicc-ui/src/api/platform/system/controller/dept.ts +++ b/kicc-ui/src/api/platform/system/controller/dept.ts @@ -14,17 +14,17 @@ enum Api { del = '/system_proxy/system/dept/remove', } -// 查询部门列表 +/** 查询部门列表 */ export const listDept = (params?: Partial) => defHttp.get({ url: Api.list, params }); -// 新增部门 +/** 新增部门 */ export const addDept = (params: Partial) => defHttp.post({ url: Api.add, data: params }); -// 修改部门 +/** 修改部门 */ export const editDept = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); -// 查询部门详细 +/** 查询部门详细 */ export const getDept = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); -// 删除部门 +/** 删除部门 */ export const delDept = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/kicc-ui/src/api/platform/system/entity/config.ts b/kicc-ui/src/api/platform/system/entity/config.ts index 68bf89af..138bb18e 100644 --- a/kicc-ui/src/api/platform/system/entity/config.ts +++ b/kicc-ui/src/api/platform/system/entity/config.ts @@ -1,63 +1,25 @@ /** * @program: kicc-ui - * @description: 文件上传实体类 + * @description: 配置实体类 * 类型定义 * @author: entfrm开发团队-王翔 * @create: 2022/4/8 */ -import { Page, R, CommonEntity } from '/@/api/model'; - -export type ConfigParams = { - /** - * 参数主键 - */ - id: string; - - /** - * 参数名称 - */ - name: string; - - /** - * 参数键名 - */ - key: string; - - /** - * 系统内置 0:是,1否 - */ - isSys:string; - -} & Page; +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; +/** 配置查询参数 */ +export type ConfigParams = Page & Config; +/** 配置对象 */ export interface Config extends CommonEntity { - /** - * 参数主键 - */ id: string; - - /** - * 参数名称 - */ name: string; - - /** - * 参数键名 - */ key: string; - - /** - * 参数键值 - */ - value:string; - - /** - * 系统内置 0:是,1否 - */ - isSys:string; - + value: string; + isSys: string; + [key: string]: any; } - -export type ConfigResult = R; +/** 配置响应对象 */ +export type ConfigResult = R;