clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

说明： 

1、前端优化api日志页面
2、优化前端翻译页面
3、细化权限
This commit is contained in:
xjs 2021-12-26 22:52:28 +08:00
parent bcbeeba42c
commit 5782b7b226
8 changed files with 228 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java
View File

@ -1,5 +1,8 @@
package com.ruoyi.common.core.web.page;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.List;
@ -8,20 +11,25 @@ import java.util.List;
*
* @author ruoyi
*/
@ApiModel(value = "表格分页数据对象")
public class TableDataInfo implements Serializable
{
private static final long serialVersionUID = 1L;
/** 总记录数 */
@ApiModelProperty("总记录数")
private long total;
/** 列表数据 */
@ApiModelProperty("列表数据")
private List<?> rows;
/** 消息状态码 */
@ApiModelProperty("消息状态码")
private int code;
/** 消息内容 */
@ApiModelProperty("消息内容")
private String msg;
/**

18
ruoyi-ui/src/api/english/log.js → ruoyi-ui/src/api/business/english/log.js
View File

@ -17,24 +17,6 @@ export function getLog(id) {
})
}
// 新增日志
export function addLog(data) {
return request({
url: '/english/log',
method: 'post',
data: data
})
}
// 修改日志
export function updateLog(data) {
return request({
url: '/english/log',
method: 'put',
data: data
})
}
// 删除日志
export function delLog(id) {
return request({

89
ruoyi-ui/src/views/business/english/log/index.vue
View File

@ -10,15 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否请求成功" prop="isSuccess">
<el-input
v-model="queryParams.isSuccess"
placeholder="请输入是否请求成功"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -26,27 +18,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['english:log:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['english:log:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@ -72,23 +43,15 @@
</el-row>
<el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="接口名称" align="center" prop="apiName" />
<el-table-column label="请求API的url" align="center" prop="url" />
<el-table-column label="请求API的方法" align="center" prop="method" />
<el-table-column label="请求request" align="center" prop="request" />
<el-table-column label="响应体" align="center" prop="response" />
<el-table-column label="是否请求成功" align="center" prop="isSuccess" />
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="接口名称" align="center" prop="apiName" :show-overflow-tooltip="true"/>
<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true"/>
<el-table-column label="请求方法" align="center" prop="method" :show-overflow-tooltip="true"/>
<el-table-column label="请求体" align="center" prop="request" :show-overflow-tooltip="true"/>
<el-table-column label="响应体" align="center" prop="response" :show-overflow-tooltip="true"/>
<el-table-column label="是否请求成功" align="center" prop="isSuccess" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['english:log:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
@ -99,7 +62,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -107,21 +70,11 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改日志对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listLog, getLog, delLog, addLog, updateLog } from "@/api/english/log";
import { listLog, getLog, delLog} from "@/api/business/english/log";
export default {
name: "Log",
@ -222,26 +175,6 @@ export default {
this.title = "修改日志";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateLog(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addLog(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
@ -260,4 +193,4 @@ export default {
}
}
};
</script>
</script>

196
ruoyi-ui/src/views/business/english/translation/index.vue Normal file
View File

@ -0,0 +1,196 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="接口名称" prop="apiName">
<el-input
v-model="queryParams.apiName"
placeholder="请输入接口名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['english:log:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['english:log:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="接口名称" align="center" prop="apiName" :show-overflow-tooltip="true"/>
<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true"/>
<el-table-column label="请求方法" align="center" prop="method" :show-overflow-tooltip="true"/>
<el-table-column label="请求体" align="center" prop="request" :show-overflow-tooltip="true"/>
<el-table-column label="响应体" align="center" prop="response" :show-overflow-tooltip="true"/>
<el-table-column label="是否请求成功" align="center" prop="isSuccess" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['english:log:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listLog, getLog, delLog} from "@/api/business/english/log";
export default {
name: "Log",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 日志表格数据
logList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
apiName: null,
isSuccess: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询日志列表 */
getList() {
this.loading = true;
listLog(this.queryParams).then(response => {
this.logList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
apiName: null,
url: null,
method: null,
request: null,
response: null,
isSuccess: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加日志";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getLog(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改日志";
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除日志编号为"' + ids + '"的数据项？').then(function() {
return delLog(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('english/log/export', {
...this.queryParams
}, `log_${new Date().getTime()}.xlsx`)
}
}
};
</script>

10
xjs-business/xjs-business-english/src/main/java/com/xjs/log/controller/ApiLogController.java
View File

@ -1,16 +1,15 @@
package com.xjs.log.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.log.annotation.Log;
@ -31,6 +30,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
*/
@RestController
@RequestMapping("log")
@Api(tags = "业务模块-API日志")
public class ApiLogController extends BaseController {
@Autowired
private IApiLogService apiLogService;
@ -40,6 +40,7 @@ public class ApiLogController extends BaseController {
*/
@RequiresPermissions("english:log:list")
@GetMapping("/list")
@ApiOperation("查询日志列表")
public TableDataInfo list(ApiLog apiLog) {
startPage();
List<ApiLog> list = apiLogService.selectApiLogList(apiLog);
@ -52,6 +53,7 @@ public class ApiLogController extends BaseController {
@RequiresPermissions("english:log:export")
@Log(title = "API日志", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出日志列表")
public void export(HttpServletResponse response, ApiLog apiLog) {
List<ApiLog> list = apiLogService.selectApiLogList(apiLog);
ExcelUtil<ApiLog> util = new ExcelUtil<ApiLog>(ApiLog.class);
@ -63,6 +65,7 @@ public class ApiLogController extends BaseController {
*/
@RequiresPermissions("english:log:query")
@GetMapping(value = "/{id}")
@ApiOperation("获取日志详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(apiLogService.selectApiLogById(id));
}
@ -74,6 +77,7 @@ public class ApiLogController extends BaseController {
@RequiresPermissions("english:log:remove")
@Log(title = "API日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@ApiOperation("删除日志")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(apiLogService.deleteApiLogByIds(ids));
}

8
xjs-business/xjs-business-english/src/main/java/com/xjs/log/service/IApiLogService.java
View File

@ -17,7 +17,7 @@ public interface IApiLogService
* @param id 日志主键
* @return 日志
*/
public ApiLog selectApiLogById(Long id);
ApiLog selectApiLogById(Long id);
/**
* 查询日志列表
@ -25,7 +25,7 @@ public interface IApiLogService
* @param apiLog 日志
* @return 日志集合
*/
public List<ApiLog> selectApiLogList(ApiLog apiLog);
List<ApiLog> selectApiLogList(ApiLog apiLog);
/**
* 批量删除日志
@ -33,7 +33,7 @@ public interface IApiLogService
* @param ids 需要删除的日志主键集合
* @return 结果
*/
public int deleteApiLogByIds(Long[] ids);
int deleteApiLogByIds(Long[] ids);
/**
* 删除日志信息
@ -41,5 +41,5 @@ public interface IApiLogService
* @param id 日志主键
* @return 结果
*/
public int deleteApiLogById(Long id);
int deleteApiLogById(Long id);
}

1
xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java
View File

@ -37,6 +37,7 @@ public class TranslationController {
@ApiOperation("翻译接口")
@Log(title = "翻译管理")
@RequiresLogin
@RequiresPermissions("english:translation:api")
public AjaxResult translation(@Validated @RequestBody TranslationQo translationQo) {
TranslationVo translationVo=new TranslationVo();
if (BAIDU.equals(translationQo.getTranslationType())) {

1
xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml
View File

@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="apiName != null and apiName != ''"> and api_name like concat('%', #{apiName}, '%')</if>
<if test="isSuccess != null "> and is_success = #{isSuccess}</if>
</where>
order by id desc
</select>
<select id="selectApiLogById" parameterType="Long" resultMap="ApiLogResult">