Browse Source

📀 重构前端框架进行适配后端框架

master
wangxiang 3 years ago
parent
commit
a6ab275c5f
  1. 2
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java
  2. 27
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java
  3. 27
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java
  4. 6
      kicc-ui/src/api/platform/system/controller/config.ts
  5. 68
      kicc-ui/src/api/platform/system/controller/dict.ts
  6. 75
      kicc-ui/src/api/platform/system/controller/dictdata.ts
  7. 12
      kicc-ui/src/api/platform/system/controller/log.ts
  8. 25
      kicc-ui/src/api/platform/system/entity/dict.ts
  9. 23
      kicc-ui/src/api/platform/system/entity/dictData.ts

2
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; @@ -24,7 +24,9 @@ import java.util.List;
public interface RemoteDictService {
/**
* 根据 type 查询字典数据
* @param type 字典类型
* @param from 内部调用标志
* @return 返回字典项列表
*/
@GetMapping(AppConstants.APP_SYSTEM + "/dictData/getDictByType/{type}")

27
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java

@ -1,6 +1,7 @@ @@ -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 { @@ -30,12 +31,12 @@ public class DictController {
private final DictService dictService;
private QueryWrapper<Dict> getQueryWrapper(Dict dict) {
return new QueryWrapper<Dict>()
.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<Dict> getQueryWrapper(Dict dict) {
return new LambdaQueryWrapper<Dict>()
.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 { @@ -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));
public R remove(@PathVariable String[] ids) {
dictService.removeByIds(Arrays.asList(ids));
return R.ok();
} catch (Exception e) {
return R.error(e.getMessage());
}
}
@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();
}

27
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java

@ -1,6 +1,7 @@ @@ -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; @@ -35,14 +36,13 @@ import java.util.Arrays;
public class DictDataController {
private final DictDataService dictDataService;
private final RemoteDictService remoteDictService;
private QueryWrapper<DictData> getQueryWrapper(DictData dictData) {
return new QueryWrapper<DictData>()
.like(StrUtil.isNotBlank(dictData.getLabel()), "label", dictData.getLabel())
.eq(StrUtil.isNotBlank(dictData.getDictType()), "dict_type", dictData.getDictType())
.orderByDesc("id");
private LambdaQueryWrapper<DictData> getQueryWrapper(DictData dictData) {
return new LambdaQueryWrapper<DictData>()
.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 { @@ -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<DictData>().eq("dict_type", dictType).eq("value", value));
if(dictData != null){
return R.ok(dictData.getLabel());
}else {
return R.error("数据不存在");
}
}
}

6
kicc-ui/src/api/platform/system/controller/config.ts

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> 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 {
@ -16,7 +16,7 @@ enum Api { @@ -16,7 +16,7 @@ enum Api {
}
/** 查询配置列表 */
export const listConfig = (params?: Partial<ConfigParams>) => defHttp.get({ url: Api.list, params });
export const listConfig = (params?: Partial<ConfigParams>) => defHttp.get<ConfigResult>({ url: Api.list, params }, { isReturnResultResponse: true });
/** 新增配置 */
export const addConfig = (params: Partial<Config>) => defHttp.post({ url: Api.add, data: params });
@ -31,4 +31,4 @@ export const getConfig = (id: string) => defHttp.get<Config>({ url: `${Api.get}/ @@ -31,4 +31,4 @@ export const getConfig = (id: string) => defHttp.get<Config>({ 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<Config>({ url: `${Api.getByKey}/${id}` });

68
kicc-ui/src/api/platform/system/controller/dict.ts

@ -1,54 +1,34 @@ @@ -1,54 +1,34 @@
import { DictParams, DictResult, Dict } from '../entity/dict';
/**
* api模板规范代码参考,
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> 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<DictParams>) => defHttp.get<DictResult>({ url: Api.list, params }, { isReturnResultResponse: true });
/** 新增配置 */
export const addDict = (params: Partial<Dict>) => defHttp.post({ url: Api.add, data: params });
/**
*
* @param params
*/
export const list = (params: DictParams) =>
defHttp.get({url: Api.List, params});
/** 修改配置 */
export const editDict = (params: Partial<Dict>) => defHttp.put({ url: Api.edit, data: 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 getDict = (id: string) => defHttp.get<Dict>({ url: `${Api.get}/${id}` });
/**
* id获取
* @param params
*/
export const getById = (params: { id: string }) =>
defHttp.get({url: Api.GetById + `/${params.id}`});
/** 删除配置 */
export const delDict = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
/**
*
* @param params
*/
export const remove = (params: {id: string}) =>
defHttp.delete({url: Api.Remove + `/${params.id}` });
/**
*
* @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 } });

75
kicc-ui/src/api/platform/system/controller/dictdata.ts

@ -1,61 +1,34 @@ @@ -1,61 +1,34 @@
import {DictDataParams, DictDataResult, DictData} from '../entity/dictData';
/**
* api模板规范代码参考,
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* author entfrm开发团队-
*/
import type { DictDataParams, DictData, DictDataResult } from '/@/api/platform/system/entity/dictData';
import { defHttp } from '/@/utils/http/axios';
import {isDef} from "/@/utils/is";
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<DictDataParams>) => defHttp.get<DictDataResult>({ 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<DictData>) => 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<DictData>) => 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<DictData>({ 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<DictData[]>({ url: `${Api.getByDictType}/${dictType}` });

12
kicc-ui/src/api/platform/system/controller/log.ts

@ -1,12 +0,0 @@ @@ -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<LogListGetResultModel>({ url: Api.LogList, params });
export const logEmpty = () => defHttp.post({ url: Api.LogEmpty });

25
kicc-ui/src/api/platform/system/entity/dict.ts

@ -1,32 +1,25 @@ @@ -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;
[key: string]: any;
}
// 根据字典对象生成响应模型
export type DictResult = R<Dict>;
/** 字典响应对象 */
export type DictResult = R<Dict[]>;

23
kicc-ui/src/api/platform/system/entity/dictData.ts

@ -1,30 +1,25 @@ @@ -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<DictData>;
/** 字典数据响应对象 */
export type DictDataResult = R<DictData[]>;

Loading…
Cancel
Save