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

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}")

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<Dict> getQueryWrapper(Dict dict) {
+    private LambdaQueryWrapper<Dict> getQueryWrapper(Dict dict) {
-        return new QueryWrapper<Dict>()
+        return new LambdaQueryWrapper<Dict>()
-                .like(StrUtil.isNotBlank(dict.getName()), "name", dict.getName())
+                .like(StrUtil.isNotBlank(dict.getName()), Dict::getName, dict.getName())
-                .orderByDesc("id")
+                .eq(StrUtil.isNotBlank(dict.getType()), Dict::getType, dict.getType())
-                .eq(StrUtil.isNotBlank(dict.getType()), "type", dict.getType())
+                .eq(StrUtil.isNotBlank(dict.getStatus()), Dict::getStatus, dict.getStatus())
-                .eq(StrUtil.isNotBlank(dict.getStatus()), "status", 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) {
+    public R remove(@PathVariable String[] ids) {
-        try {
+        dictService.removeByIds(Arrays.asList(ids));
-            dictService.removeByIds(Arrays.asList(id));
+        return R.ok();
-            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();
     }

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<DictData> getQueryWrapper(DictData dictData) {
+    private LambdaQueryWrapper<DictData> getQueryWrapper(DictData dictData) {
-        return new QueryWrapper<DictData>()
+        return new LambdaQueryWrapper<DictData>()
-                .like(StrUtil.isNotBlank(dictData.getLabel()), "label", dictData.getLabel())
+                .like(StrUtil.isNotBlank(dictData.getLabel()), DictData::getLabel, dictData.getLabel())
-                .eq(StrUtil.isNotBlank(dictData.getDictType()), "dict_type", dictData.getDictType())
+                .eq(StrUtil.isNotBlank(dictData.getDictType()), DictData::getDictType, dictData.getDictType())
-                .orderByDesc("id");
+                .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) {
+    public R remove(@PathVariable String[] ids) {
-        dictDataService.removeByIds(Arrays.asList(id));
+        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("数据不存在");
-        }
-    }
 }

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

@@ -3,20 +3,20 @@
  * 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 {
-    list = '/system_proxy/system/config/list',
+  list = '/system_proxy/system/config/list',
-    add = '/system_proxy/system/config/save',
+  add = '/system_proxy/system/config/save',
-    get = '/system_proxy/system/config',
+  get = '/system_proxy/system/config',
-    edit = '/system_proxy/system/config/update',
+  edit = '/system_proxy/system/config/update',
-    del = '/system_proxy/system/config/remove',
+  del = '/system_proxy/system/config/remove',
-    getByKey = '/system_proxy/system/config/getByKey'
+  getByKey = '/system_proxy/system/config/getByKey'
 }
 
 /** 查询配置列表 */
-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}/
 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}` });

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

@@ -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',
+  list = '/system_proxy/system/dict/list',
-  GetById = '/system_proxy/system/dict',
+  add = '/system_proxy/system/dict/save',
-  Save = '/system_proxy/system/dict/save',
+  get = '/system_proxy/system/dict',
-  Update = '/system_proxy/system/dict/update',
+  edit = '/system_proxy/system/dict/update',
-  Remove = '/system_proxy/system/dict/remove',
+  del = '/system_proxy/system/dict/remove',
-  ChangeStatus = '/system_proxy/system/dict/changeStatus'
+  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 });
 
-/**
+/** 修改配置 */
- * 条件查询字典数据列表
+export const editDict = (params: Partial<Dict>) => defHttp.put({ url: Api.edit, 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});
-  }
-}
 
-/**
+/** 查询配置详细 */
- * 通过id获取
+export const getDict = (id: string) => defHttp.get<Dict>({ url: `${Api.get}/${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}` });
 
-/**
+/** 修改字典状态 */
- * 修改状态
+export const changeStatus = (id: string, status: string) => defHttp.put({ url: Api.changeStatus, data: { id: id, status: status } });
- * @param params
- */
-export const changeStatus = (params: Dict) =>
-    defHttp.get({url: Api.ChangeStatus, params});

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';
+ * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
-import {isDef} from "/@/utils/is";
+ * 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';
 
 enum Api {
-    List = '/system_proxy/system/dictData/list',
+  list = '/system_proxy/system/dictData/list',
-    GetById = '/system_proxy/system/dictData',
+  add = '/system_proxy/system/dictData/save',
-    GetByData = '/system_proxy/system/dictData/getDictData',
+  get = '/system_proxy/system/dictData',
-    GetByDictType = '/system_proxy/system/dictData/dictType',
+  edit = '/system_proxy/system/dictData/update',
-    Save = '/system_proxy/system/dictData/save',
+  del = '/system_proxy/system/dictData/remove',
-    Update = '/system_proxy/system/dictData/update',
+  getByDictType = '/system_proxy/system/dictData/dictType'
-    Remove = '/system_proxy/system/dictData/remove'
-
 }
 
-/**
+/** 查询字典数据列表 */
- * 条件查询字典数据列表
+export const listDictData = (params?: Partial<DictDataParams>) => defHttp.get<DictDataResult>({ url: Api.list, params }, { isReturnResultResponse: true });
- * @param params
- */
-export const list = (params: DictDataParams) =>
-    defHttp.get({url: Api.List, params});
 
-/**
+/** 新增字典数据 */
- * 修改或新增
+export const addDictData = (params: Partial<DictData>) => defHttp.post({ url: Api.add, data: params });
- * @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});
-    }
-}
 
-/**
+/** 修改字典数据 */
- * 通过id获取
+export const editDictData = (params: Partial<DictData>) => defHttp.put({ url: Api.edit, data: params });
- * @param params
- */
-export const getById = (params: { id: string }) =>
-    defHttp.get({url: Api.GetById + `/${params.id}`});
 
-/**
+/** 查询字典数据详细 */
- * 通过type和value查询
+export const getDictData = (id: string) => defHttp.get<DictData>({ url: `${Api.get}/${id}` });
- * @param params
- */
-export const getByData = (params: {dataType: string, value: string}) =>
-    defHttp.get({url: Api.GetByData, params});
 
-/**
+/** 删除字典数据 */
- * 获取字典数据通过字典类型
+export const delDictData = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
- * @param params
- */
-export const getByDictType = (params: {dictType: string}) =>
-    defHttp.get({url: Api.GetByDictType + `/${params.dictType}`})
 
-/**
+/** 根据字典类型查询字典数据 */
- * 删除字典数据
+export const getDataByDictType = (dictType: string) => defHttp.get<DictData[]>({ url: `${Api.getByDictType}/${dictType}` });
- * @param params
- */
-export const remove = (params: {id: string}) =>
-    defHttp.delete({url: Api.Remove + `/${params.id}` });

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

@@ -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 });

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 & {
+export type DictParams = Page & Dict;
-    id?:string;
-    name?:string;
-    type?:string;
-    isSys?:string;
-    status?:string;
 
-};
+/** 字典对象 */
-
+export interface Dict extends CommonEntity {
-
+    id: string;
-// 定义字典对象
+    name: string;
-export interface Dict extends CommonEntity{
+    type: string;
-    id:string;
+    isSys: string;
-    name:string;
+    status: string;
-    type:string;
+    [key: string]: any;
-    isSys:string;
-    status:string;
 }
 
-
+/** 字典响应对象 */
-// 根据字典对象生成响应模型
+export type DictResult = R<Dict[]>;
-export type DictResult = R<Dict>;

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 & {
+export type DictDataParams = Page & DictData;
-    id?: string;
-    dictType?: string;
-    label?: string;
-    value?: string;
-    sort?: string;
-
-}
 
+/** 字典数据对象 */
 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[]>;