odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(system): 重构系统模块接口和数据结构

Browse Source 
- 更新了多个控制器的接口设计，使用 CsPageArgs 封装分页参数
- 修改了部分 API 的 HTTP 方法，优化了请求结构
- 统一了查询接口的命名规范
- 调整了部分参数和返回值类型，提高了代码复用性
This commit is contained in:
odboy
2025-06-25 19:44:40 +08:00
parent 43d787f1e3
commit 620e076b86
39 changed files with 233 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava-front/src/api/data.js
+10 -2
View File
@@ -1,10 +1,18 @@
import request from '@/utils/request'
import qs from 'qs'
// export function initData(url, params) {
// return request({
// url: url + '?' + qs.stringify(params, { indices: false }),
// method: 'get'
// })
// }
export function initData(url, params) {
return request({
url: url + '?' + qs.stringify(params, { indices: false }),
method: 'get'
url: url,
method: 'post',
data: params
})
}
cutejava-front/src/api/system/dept.js
+5 -5
View File
@@ -3,8 +3,8 @@ import request from '@/utils/request'
export function queryDeptList(params) {
return request({
url: 'api/dept',
method: 'get',
params
method: 'post',
data: params
})
}
@@ -14,7 +14,7 @@ export function queryDeptSuperiorTree(ids, exclude) {
return request({
url: 'api/dept/queryDeptSuperiorTree?exclude=' + exclude,
method: 'post',
data
data: data
})
}
@@ -22,7 +22,7 @@ export function add(data) {
return request({
url: 'api/dept/saveDept',
method: 'post',
data
data: data
})
}
@@ -38,7 +38,7 @@ export function edit(data) {
return request({
url: 'api/dept/modifyDept',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/system/dict.js
+2 -2
View File
@@ -11,7 +11,7 @@ export function add(data) {
return request({
url: 'api/dict/saveDict',
method: 'post',
data
data: data
})
}
@@ -27,7 +27,7 @@ export function edit(data) {
return request({
url: 'api/dict/modifyDictById',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/system/dictDetail.js
+9 -20
View File
@@ -2,35 +2,24 @@ import request from '@/utils/request'
export function get(dictName) {
const params = {
dictName,
page: 0,
size: 9999
page: 1,
size: 999999,
args: {
dictName: dictName
}
}
return request({
url: 'api/dictDetail',
method: 'get',
params
method: 'post',
data: params
})
}
// export function getDictMap(dictName) {
// const params = {
// dictName,
// page: 0,
// size: 9999
// }
// return request({
// url: 'api/dictDetail/getDictDetailMaps',
// method: 'get',
// params
// })
// }
export function add(data) {
return request({
url: 'api/dictDetail/saveDictDetail',
method: 'post',
data
data: data
})
}
@@ -46,7 +35,7 @@ export function edit(data) {
return request({
url: 'api/dictDetail/modifyDictDetailById',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/tools/email.js → cutejava-front/src/api/system/email.js
+2 -2
View File
@@ -11,7 +11,7 @@ export function modifyEmailConfig(data) {
return request({
url: 'api/email/modifyEmailConfig',
method: 'post',
data
data: data
})
}
@@ -19,6 +19,6 @@ export function sendEmail(data) {
return request({
url: 'api/email/sendEmail',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/system/job.js
+9 -7
View File
@@ -2,14 +2,16 @@ import request from '@/utils/request'
export function getAllJob() {
const params = {
page: 0,
size: 9999,
enabled: true
page: 1,
size: 999999,
args: {
enabled: true
}
}
return request({
url: 'api/job',
method: 'get',
params
method: 'post',
data: params
})
}
@@ -17,7 +19,7 @@ export function add(data) {
return request({
url: 'api/job/saveJob',
method: 'post',
data
data: data
})
}
@@ -33,7 +35,7 @@ export function edit(data) {
return request({
url: 'api/job/modifyJobById',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/system/menu.js
+5 -5
View File
@@ -10,8 +10,8 @@ export function queryMenuListByPid(pid) {
export function getMenus(params) {
return request({
url: 'api/menus',
method: 'get',
params
method: 'post',
data: params
})
}
@@ -20,7 +20,7 @@ export function queryMenuSuperior(ids) {
return request({
url: 'api/menus/queryMenuSuperior',
method: 'post',
data
data: data
})
}
@@ -42,7 +42,7 @@ export function add(data) {
return request({
url: 'api/menus/saveMenu',
method: 'post',
data
data: data
})
}
@@ -58,7 +58,7 @@ export function edit(data) {
return request({
url: 'api/menus/modifyMenuById',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/monitor/online.js → cutejava-front/src/api/system/online.js
View File
cutejava-front/src/api/tools/qiniu.js → cutejava-front/src/api/system/qiniu.js
+1 -1
View File
@@ -11,7 +11,7 @@ export function modifyQiniuConfig(data) {
return request({
url: 'api/qiNiuContent/modifyQiniuConfig',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/quartzjob/timing.js → cutejava-front/src/api/system/quartzJob.js
+7 -7
View File
@@ -2,15 +2,15 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/jobs',
url: 'api/quartzJob/createQuartzJob',
method: 'post',
data
data: data
})
}
export function del(ids) {
return request({
url: 'api/jobs',
url: 'api/quartzJob',
method: 'delete',
data: ids
})
@@ -18,22 +18,22 @@ export function del(ids) {
export function edit(data) {
return request({
url: 'api/jobs',
url: 'api/quartzJob',
method: 'put',
data
data: data
})
}
export function switchQuartzJobStatus(id) {
return request({
url: 'api/jobs/switchQuartzJobStatus/' + id,
url: 'api/quartzJob/switchQuartzJobStatus/' + id,
method: 'post'
})
}
export function startQuartzJob(id) {
return request({
url: 'api/jobs/startQuartzJob/' + id,
url: 'api/quartzJob/startQuartzJob/' + id,
method: 'post'
})
}
cutejava-front/src/api/system/role.js
+2 -2
View File
@@ -12,7 +12,7 @@ export function add(data) {
return request({
url: 'api/roles/saveRole',
method: 'post',
data
data: data
})
}
@@ -43,7 +43,7 @@ export function edit(data) {
return request({
url: 'api/roles/modifyRoleById',
method: 'post',
data
data: data
})
}
cutejava-front/src/api/system/user.js
+13 -10
View File
@@ -5,7 +5,7 @@ export function add(data) {
return request({
url: 'api/users/saveUser',
method: 'post',
data
data: data
})
}
@@ -29,7 +29,7 @@ export function edit(data) {
return request({
url: 'api/users/modifyUserById',
method: 'post',
data
data: data
})
}
@@ -37,7 +37,7 @@ export function editUser(data) {
return request({
url: 'api/users/modifyUserCenterInfoById',
method: 'post',
data
data: data
})
}
@@ -49,7 +49,7 @@ export function updatePass(user) {
return request({
url: 'api/users/modifyUserPasswordByUsername',
method: 'post',
data
data: data
})
}
@@ -61,19 +61,22 @@ export function updateEmail(form) {
return request({
url: 'api/users/modifyUserEmailByUsername/' + form.code,
method: 'post',
data
data: data
})
}
export function queryUserMetaPage(query) {
const params = {
page: 1,
size: 50,
args: {
blurry: query
}
}
return request({
url: 'api/users/queryUserMetadataOptions',
method: 'post',
data: {
page: 1,
pageSize: 50,
blurry: query
}
data: params
})
}
cutejava-front/src/components/Crud/crud.js
+6 -4
View File
@@ -1,5 +1,5 @@
import { initData, download } from '@/api/data'
import { parseTime, downloadFile } from '@/utils/index'
import { download, initData } from '@/api/data'
import { downloadFile, parseTime } from '@/utils/index'
import Vue from 'vue'
/**
@@ -348,8 +348,10 @@ function CRUD(options) {
return {
page: crud.page.page,
size: crud.page.size,
...crud.query,
...crud.params
args: {
...crud.query,
...crud.params
}
}
},
// 当前页改变
cutejava-front/src/views/components/business/CuteDeptTree.vue
+5 -1
View File
@@ -60,7 +60,11 @@ export default {
params['pid'] = node.data.id
}
setTimeout(() => {
queryDeptList(params).then(res => {
queryDeptList({
page: 1,
size: 999999,
args: params
}).then(res => {
if (resolve) {
resolve(res.content)
} else {
cutejava-front/src/views/system/dept/index.vue
+19 -7
View File
@@ -29,14 +29,11 @@
/>
</el-form-item>
<el-form-item label="顶级部门">
<el-radio-group v-model="form.isTop" style="width: 140px">
<el-radio-group v-model="form.isTop" style="width: 370px">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="状态" prop="enabled">
<el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
<treeselect
v-model="form.pid"
@@ -46,6 +43,9 @@
placeholder="选择上级类目"
/>
</el-form-item>
<el-form-item label="状态" prop="enabled">
<el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -139,7 +139,11 @@ export default {
},
methods: {
getDeptDatas(tree, treeNode, resolve) {
const params = { pid: tree.id }
const params = {
page: 1,
size: 999999,
args: { pid: tree.id }
}
setTimeout(() => {
crudDept.queryDeptList(params).then(res => {
resolve(res.content)
@@ -178,7 +182,11 @@ export default {
})
},
getDepts() {
crudDept.queryDeptList({ enabled: true }).then(res => {
crudDept.queryDeptList({
page: 1,
size: 999999,
args: { enabled: true }
}).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
@@ -190,7 +198,11 @@ export default {
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudDept.queryDeptList({ enabled: true, pid: parentNode.id }).then(res => {
crudDept.queryDeptList({
page: 1,
size: 999999,
args: { enabled: true, pid: parentNode.id }
}).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
cutejava-front/src/views/system/druidsql/index.vue → cutejava-front/src/views/system/druidSql/index.vue
View File
cutejava-front/src/views/system/email/config.vue
+1 -1
View File
@@ -27,7 +27,7 @@
</template>
<script>
import { queryEmailConfig, modifyEmailConfig } from '@/api/tools/email'
import { queryEmailConfig, modifyEmailConfig } from '@/api/system/email'
export default {
name: 'Config',
data() {
cutejava-front/src/views/system/email/send.vue
+1 -1
View File
@@ -14,7 +14,7 @@
</template>
<script>
import { sendEmail } from '@/api/tools/email'
import { sendEmail } from '@/api/system/email'
import { upload } from '@/utils/upload'
import { mapGetters } from 'vuex'
import E from 'wangeditor'
cutejava-front/src/views/system/menu/index.vue
+6 -2
View File
@@ -200,7 +200,11 @@ export default {
}
},
getMenus(tree, treeNode, resolve) {
const params = { pid: tree.id }
const params = {
page: 1,
size: 999999,
args: { pid: tree.id }
}
setTimeout(() => {
crudMenu.getMenus(params).then(res => {
resolve(res.content)
@@ -220,7 +224,7 @@ export default {
},
loadMenus({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudMenu.getMenusTree(parentNode.id).then(res => {
crudMenu.queryMenuListByPid(parentNode.id).then(res => {
parentNode.children = res.map(function(obj) {
if (!obj.leaf) {
obj.children = null
cutejava-front/src/views/system/online/index.vue
+3 -3
View File
@@ -2,7 +2,7 @@
<div class="app-container">
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-input v-model="query.username" clearable size="small" placeholder="输入用户名称查询" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.userName" clearable size="small" placeholder="输入用户名称查询" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation />
</div>
<crudOperation>
@@ -55,7 +55,7 @@
</template>
<script>
import { kickOutUser } from '@/api/monitor/online'
import { kickOutUser } from '@/api/system/online'
import CRUD, { presenter, header, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -65,7 +65,7 @@ export default {
name: 'OnlineUser',
components: { pagination, crudOperation, rrOperation },
cruds() {
return CRUD({ url: 'auth/online', title: '在线用户' })
return CRUD({ url: 'api/user/online', title: '在线用户' })
},
mixins: [presenter(), header(), crud()],
data() {
cutejava-front/src/views/system/timing/index.vue → cutejava-front/src/views/system/quartzJob/index.vue
+11 -11
View File
@@ -85,16 +85,16 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="description" width="150px" label="描述" />
<el-table-column :show-overflow-tooltip="true" prop="createTime" width="136px" label="创建日期" />
<el-table-column v-if="checkPer(['admin','timing:edit','timing:del'])" label="操作" width="170px" align="center" fixed="right">
<el-table-column v-if="checkPer(['admin','quartzJob:edit','quartzJob:del'])" label="操作" width="170px" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
<el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
<el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
<el-button v-permission="['admin','quartzJob:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
<el-button v-permission="['admin','quartzJob:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
<el-button v-permission="['admin','quartzJob:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
{{ scope.row.isPause ? '恢复' : '暂停' }}
</el-button>
<el-popover
:ref="scope.row.id"
v-permission="['admin','timing:del']"
v-permission="['admin','quartzJob:del']"
placement="top"
width="200"
>
@@ -114,7 +114,7 @@
</template>
<script>
import crudJob from '@/api/quartzjob/timing'
import crudJob from '@/api/system/quartzJob'
import Log from './log'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
@@ -124,19 +124,19 @@ import DateRangePicker from '@/components/DateRangePicker'
const defaultForm = { id: null, jobName: null, subTask: null, beanName: null, methodName: null, params: null, cronExpression: null, pauseAfterFailure: true, isPause: false, personInCharge: null, email: null, description: null }
export default {
name: 'Timing',
name: 'QuartzJob',
components: { Log, pagination, crudOperation, rrOperation, DateRangePicker },
cruds() {
return CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
return CRUD({ title: '定时任务', url: 'api/quartzJob', crudMethod: { ...crudJob }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
data() {
return {
delLoading: false,
permission: {
add: ['admin', 'timing:add'],
edit: ['admin', 'timing:edit'],
del: ['admin', 'timing:del']
add: ['admin', 'quartzJob:add'],
edit: ['admin', 'quartzJob:edit'],
del: ['admin', 'quartzJob:del']
},
rules: {
jobName: [
cutejava-front/src/views/system/timing/log.vue → cutejava-front/src/views/system/quartzJob/log.vue
+1 -1
View File
@@ -82,7 +82,7 @@ export default {
},
// 获取数据前设置好接口地址
beforeInit() {
this.url = 'api/jobs/logs'
this.url = 'api/quartzJob/logs'
this.size = 6
return true
},
cutejava-front/src/views/system/role/index.vue
+10 -2
View File
@@ -284,7 +284,11 @@ export default {
},
// 获取部门数据
getDepts() {
queryDeptList({ enabled: true }).then(res => {
queryDeptList({
page: 1,
size: 999999,
args: { enabled: true }
}).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
@@ -317,7 +321,11 @@ export default {
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
queryDeptList({ enabled: true, pid: parentNode.id }).then(res => {
queryDeptList({
page: 1,
size: 999999,
args: { enabled: true, pid: parentNode.id }
}).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
cutejava-front/src/views/system/user/index.vue
+10 -2
View File
@@ -376,7 +376,11 @@ export default {
this.crud.toQuery()
},
getDepts() {
queryDeptList({ enabled: true }).then(res => {
queryDeptList({
page: 1,
size: 999999,
args: { enabled: true }
}).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
@@ -405,7 +409,11 @@ export default {
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
queryDeptList({ enabled: true, pid: parentNode.id }).then(res => {
queryDeptList({
page: 1,
size: 999999,
args: { enabled: true, pid: parentNode.id }
}).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null