From a6ab275c5f5cbb3547f2b4364418546ab3d0b7a5 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 4 May 2022 03:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=80=20=E9=87=8D=E6=9E=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A1=86=E6=9E=B6=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/feign/RemoteDictService.java | 2 + .../system/controller/DictController.java | 29 ++++--- .../system/controller/DictDataController.java | 27 +++---- .../api/platform/system/controller/config.ts | 18 ++--- .../api/platform/system/controller/dict.ts | 68 ++++++---------- .../platform/system/controller/dictdata.ts | 77 ++++++------------- .../src/api/platform/system/controller/log.ts | 12 --- .../src/api/platform/system/entity/dict.ts | 37 ++++----- .../api/platform/system/entity/dictData.ts | 23 +++--- 9 files changed, 106 insertions(+), 187 deletions(-) delete mode 100644 kicc-ui/src/api/platform/system/controller/log.ts diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java index c07f85d8..097f2137 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java @@ -24,7 +24,9 @@ import java.util.List; public interface RemoteDictService { /** + * 根据 type 查询字典数据 * @param type 字典类型 + * @param from 内部调用标志 * @return 返回字典项列表 */ @GetMapping(AppConstants.APP_SYSTEM + "/dictData/getDictByType/{type}") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java index 7e2939f5..89d28d7d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java @@ -1,6 +1,7 @@ package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -30,12 +31,12 @@ public class DictController { private final DictService dictService; - private QueryWrapper getQueryWrapper(Dict dict) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(dict.getName()), "name", dict.getName()) - .orderByDesc("id") - .eq(StrUtil.isNotBlank(dict.getType()), "type", dict.getType()) - .eq(StrUtil.isNotBlank(dict.getStatus()), "status", dict.getStatus()); + private LambdaQueryWrapper getQueryWrapper(Dict dict) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(dict.getName()), Dict::getName, dict.getName()) + .eq(StrUtil.isNotBlank(dict.getType()), Dict::getType, dict.getType()) + .eq(StrUtil.isNotBlank(dict.getStatus()), Dict::getStatus, dict.getStatus()) + .orderByDesc(Dict::getId); } @GetMapping("/list") @@ -67,21 +68,17 @@ public class DictController { } @SysLog("字典删除") - @DeleteMapping("/remove/{id:[\\w,]+}") + @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('dict_del')") - public R remove(@PathVariable String[] id) { - try { - dictService.removeByIds(Arrays.asList(id)); - return R.ok(); - } catch (Exception e) { - return R.error(e.getMessage()); - } + public R remove(@PathVariable String[] ids) { + dictService.removeByIds(Arrays.asList(ids)); + return R.ok(); } @SysLog("字典状态更改") - @GetMapping("/changeStatus") + @PutMapping("/changeStatus") @PreAuthorize("@pms.hasPermission('dict_edit')") - public R changeStatus(Dict dict) { + public R changeStatus(@RequestBody Dict dict) { dictService.updateById(dict); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java index e63eef9f..30064130 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java @@ -1,6 +1,7 @@ package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -35,14 +36,13 @@ import java.util.Arrays; public class DictDataController { private final DictDataService dictDataService; - private final RemoteDictService remoteDictService; - private QueryWrapper getQueryWrapper(DictData dictData) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(dictData.getLabel()), "label", dictData.getLabel()) - .eq(StrUtil.isNotBlank(dictData.getDictType()), "dict_type", dictData.getDictType()) - .orderByDesc("id"); + private LambdaQueryWrapper getQueryWrapper(DictData dictData) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(dictData.getLabel()), DictData::getLabel, dictData.getLabel()) + .eq(StrUtil.isNotBlank(dictData.getDictType()), DictData::getDictType, dictData.getDictType()) + .orderByDesc(DictData::getId); } @GetMapping("/list") @@ -86,20 +86,11 @@ public class DictDataController { } @SysLog("字典数据删除") - @DeleteMapping("/remove/{id:[\\w,]+}") + @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('dictData_del')") - public R remove(@PathVariable String[] id) { - dictDataService.removeByIds(Arrays.asList(id)); + public R remove(@PathVariable String[] ids) { + dictDataService.removeByIds(Arrays.asList(ids)); return R.ok(); } - @GetMapping("/getDictData") - public R getDictData(String dictType, String value) { - DictData dictData = dictDataService.getOne(new QueryWrapper().eq("dict_type", dictType).eq("value", value)); - if(dictData != null){ - return R.ok(dictData.getLabel()); - }else { - return R.error("数据不存在"); - } - } } diff --git a/kicc-ui/src/api/platform/system/controller/config.ts b/kicc-ui/src/api/platform/system/controller/config.ts index a89f6022..7f6b151f 100644 --- a/kicc-ui/src/api/platform/system/controller/config.ts +++ b/kicc-ui/src/api/platform/system/controller/config.ts @@ -3,20 +3,20 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ -import type { ConfigParams, Config } from '/@/api/platform/system/entity/config'; +import type { ConfigParams, Config, ConfigResult } from '/@/api/platform/system/entity/config'; import { defHttp } from '/@/utils/http/axios'; enum Api { - 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' + 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 listConfig = (params?: Partial) => defHttp.get({ url: Api.list, params }); +export const listConfig = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); /** 新增配置 */ export const addConfig = (params: Partial) => defHttp.post({ url: Api.add, data: params }); @@ -31,4 +31,4 @@ export const getConfig = (id: string) => defHttp.get({ url: `${Api.get}/ export const delConfig = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); /** 根据 key 查询配置详细 */ -export const getConfigByKey = (id: string) => defHttp.get({ url: `${Api.getByKey}/${id}` }); +export const getConfigByKey = (id: string) => defHttp.get({ url: `${Api.getByKey}/${id}` }); diff --git a/kicc-ui/src/api/platform/system/controller/dict.ts b/kicc-ui/src/api/platform/system/controller/dict.ts index 24ed3461..1b96cfea 100644 --- a/kicc-ui/src/api/platform/system/controller/dict.ts +++ b/kicc-ui/src/api/platform/system/controller/dict.ts @@ -1,54 +1,34 @@ -import { DictParams, DictResult, Dict } from '../entity/dict'; +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { DictParams, Dict, DictResult } from '/@/api/platform/system/entity/dict'; import { defHttp } from '/@/utils/http/axios'; -import {isDef} from "/@/utils/is"; enum Api { - List = '/system_proxy/system/dict/list', - GetById = '/system_proxy/system/dict', - Save = '/system_proxy/system/dict/save', - Update = '/system_proxy/system/dict/update', - Remove = '/system_proxy/system/dict/remove', - ChangeStatus = '/system_proxy/system/dict/changeStatus' + list = '/system_proxy/system/dict/list', + add = '/system_proxy/system/dict/save', + get = '/system_proxy/system/dict', + edit = '/system_proxy/system/dict/update', + del = '/system_proxy/system/dict/remove', + changeStatus='/system_proxy/system/dict/changeStatus' } +/** 查询配置列表 */ +export const listDict = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); +/** 新增配置 */ +export const addDict = (params: Partial) => defHttp.post({ url: Api.add, data: params }); -/** - * 条件查询字典数据列表 - * @param params - */ -export const list = (params: DictParams) => - defHttp.get({url: Api.List, params}); - -/** - * 修改或新增 - * @param params - */ -export const set = (params: Dict) => { - if (isDef(params.id)) { - return defHttp.put({url: Api.Update, params}); - } else { - return defHttp.post({url: Api.Save, params}); - } -} +/** 修改配置 */ +export const editDict = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); -/** - * 通过id获取 - * @param params - */ -export const getById = (params: { id: string }) => - defHttp.get({url: Api.GetById + `/${params.id}`}); +/** 查询配置详细 */ +export const getDict = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); -/** - * 删除字典数据 - * @param params - */ -export const remove = (params: {id: string}) => - defHttp.delete({url: Api.Remove + `/${params.id}` }); +/** 删除配置 */ +export const delDict = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); -/** - * 修改状态 - * @param params - */ -export const changeStatus = (params: Dict) => - defHttp.get({url: Api.ChangeStatus, params}); +/** 修改字典状态 */ +export const changeStatus = (id: string, status: string) => defHttp.put({ url: Api.changeStatus, data: { id: id, status: status } }); diff --git a/kicc-ui/src/api/platform/system/controller/dictdata.ts b/kicc-ui/src/api/platform/system/controller/dictdata.ts index 1f9c8d7f..417c8c83 100644 --- a/kicc-ui/src/api/platform/system/controller/dictdata.ts +++ b/kicc-ui/src/api/platform/system/controller/dictdata.ts @@ -1,61 +1,34 @@ -import {DictDataParams, DictDataResult, DictData} from '../entity/dictData'; -import {defHttp} from '/@/utils/http/axios'; -import {isDef} from "/@/utils/is"; +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { DictDataParams, DictData, DictDataResult } from '/@/api/platform/system/entity/dictData'; +import { defHttp } from '/@/utils/http/axios'; enum Api { - List = '/system_proxy/system/dictData/list', - GetById = '/system_proxy/system/dictData', - GetByData = '/system_proxy/system/dictData/getDictData', - GetByDictType = '/system_proxy/system/dictData/dictType', - Save = '/system_proxy/system/dictData/save', - Update = '/system_proxy/system/dictData/update', - Remove = '/system_proxy/system/dictData/remove' - + list = '/system_proxy/system/dictData/list', + add = '/system_proxy/system/dictData/save', + get = '/system_proxy/system/dictData', + edit = '/system_proxy/system/dictData/update', + del = '/system_proxy/system/dictData/remove', + getByDictType = '/system_proxy/system/dictData/dictType' } -/** - * 条件查询字典数据列表 - * @param params - */ -export const list = (params: DictDataParams) => - defHttp.get({url: Api.List, params}); +/** 查询字典数据列表 */ +export const listDictData = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); -/** - * 修改或新增 - * @param params - */ -export const set = (params: DictData) => { - if (isDef(params.id)) { - return defHttp.put({url: Api.Update, params}); - } else { - return defHttp.post({url: Api.Save, params}); - } -} +/** 新增字典数据 */ +export const addDictData = (params: Partial) => defHttp.post({ url: Api.add, data: params }); -/** - * 通过id获取 - * @param params - */ -export const getById = (params: { id: string }) => - defHttp.get({url: Api.GetById + `/${params.id}`}); +/** 修改字典数据 */ +export const editDictData = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); -/** - * 通过type和value查询 - * @param params - */ -export const getByData = (params: {dataType: string, value: string}) => - defHttp.get({url: Api.GetByData, params}); +/** 查询字典数据详细 */ +export const getDictData = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); -/** - * 获取字典数据通过字典类型 - * @param params - */ -export const getByDictType = (params: {dictType: string}) => - defHttp.get({url: Api.GetByDictType + `/${params.dictType}`}) +/** 删除字典数据 */ +export const delDictData = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); -/** - * 删除字典数据 - * @param params - */ -export const remove = (params: {id: string}) => - defHttp.delete({url: Api.Remove + `/${params.id}` }); +/** 根据字典类型查询字典数据 */ +export const getDataByDictType = (dictType: string) => defHttp.get({ url: `${Api.getByDictType}/${dictType}` }); diff --git a/kicc-ui/src/api/platform/system/controller/log.ts b/kicc-ui/src/api/platform/system/controller/log.ts deleted file mode 100644 index cbda8db2..00000000 --- a/kicc-ui/src/api/platform/system/controller/log.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { LogParams, LogListGetResultModel } from '../entity/logModel'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - LogList = '/mate-system/log/page', - LogEmpty = '/mate-system/log/empty', -} - -export const getLogListByPage = (params: LogParams) => - defHttp.get({ url: Api.LogList, params }); - -export const logEmpty = () => defHttp.post({ url: Api.LogEmpty }); diff --git a/kicc-ui/src/api/platform/system/entity/dict.ts b/kicc-ui/src/api/platform/system/entity/dict.ts index b59dfb58..f3ffc146 100644 --- a/kicc-ui/src/api/platform/system/entity/dict.ts +++ b/kicc-ui/src/api/platform/system/entity/dict.ts @@ -1,32 +1,25 @@ /** * @program: kicc-ui - * @description: 文件上传实体类 + * @description: 字典实体类 * 类型定义 * @author: entfrm开发团队-王翔 * @create: 2022/4/8 */ -import {CommonEntity, Page, R} from '/@/api/model'; +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; -// 定义查询参数 -export type DictParams = Page & { - id?:string; - name?:string; - type?:string; - isSys?:string; - status?:string; +/** 字典查询参数 */ +export type DictParams = Page & Dict; -}; - - -// 定义字典对象 -export interface Dict extends CommonEntity{ - id:string; - name:string; - type:string; - isSys:string; - status:string; +/** 字典对象 */ +export interface Dict extends CommonEntity { + id: string; + name: string; + type: string; + isSys: string; + status: string; + [key: string]: any; } - -// 根据字典对象生成响应模型 -export type DictResult = R; +/** 字典响应对象 */ +export type DictResult = R; diff --git a/kicc-ui/src/api/platform/system/entity/dictData.ts b/kicc-ui/src/api/platform/system/entity/dictData.ts index 4987651d..79a5265c 100644 --- a/kicc-ui/src/api/platform/system/entity/dictData.ts +++ b/kicc-ui/src/api/platform/system/entity/dictData.ts @@ -1,30 +1,25 @@ /** * @program: kicc-ui - * @description: 文件上传实体类 + * @description: 字典数据实体类 * 类型定义 * @author: entfrm开发团队-王翔 * @create: 2022/4/8 */ -import {CommonEntity, Page, R} from '/@/api/model'; +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; -// 定义查询参数 -export type DictDataParams = Page & { - id?: string; - dictType?: string; - label?: string; - value?: string; - sort?: string; - -} +/** 字典数据查询参数 */ +export type DictDataParams = Page & DictData; +/** 字典数据对象 */ export interface DictData extends CommonEntity { id: string; dictType: string; label: string; value: string; sort: number; - + [key: string]: any; } -// 根据字典对象生成响应模型 -export type DictDataResult = R; +/** 字典数据响应对象 */ +export type DictDataResult = R;