From 5782b7b22664b4b900d5ac85036309eb774e67c4 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Sun, 26 Dec 2021 22:52:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A=201=E3=80=81?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96api=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=202=E3=80=81=E4=BC=98=E5=8C=96=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=BF=BB=E8=AF=91=E9=A1=B5=E9=9D=A2=203=E3=80=81?= =?UTF-8?q?=E7=BB=86=E5=8C=96=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/web/page/TableDataInfo.java | 8 + .../src/api/{ => business}/english/log.js | 18 -- .../src/views/business/english/log/index.vue | 89 +------- .../business/english/translation/index.vue | 196 ++++++++++++++++++ .../xjs/log/controller/ApiLogController.java | 10 +- .../com/xjs/log/service/IApiLogService.java | 8 +- .../controller/TranslationController.java | 1 + .../resources/mapper/english/ApiLogMapper.xml | 1 + 8 files changed, 228 insertions(+), 103 deletions(-) rename ruoyi-ui/src/api/{ => business}/english/log.js (61%) create mode 100644 ruoyi-ui/src/views/business/english/translation/index.vue diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java index 41dc0fe7..c49056c7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java @@ -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; /** diff --git a/ruoyi-ui/src/api/english/log.js b/ruoyi-ui/src/api/business/english/log.js similarity index 61% rename from ruoyi-ui/src/api/english/log.js rename to ruoyi-ui/src/api/business/english/log.js index 317e73db..953d75c5 100644 --- a/ruoyi-ui/src/api/english/log.js +++ b/ruoyi-ui/src/api/business/english/log.js @@ -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({ diff --git a/ruoyi-ui/src/views/business/english/log/index.vue b/ruoyi-ui/src/views/business/english/log/index.vue index 645c2d45..b682d95e 100644 --- a/ruoyi-ui/src/views/business/english/log/index.vue +++ b/ruoyi-ui/src/views/business/english/log/index.vue @@ -10,15 +10,7 @@ @keyup.enter.native="handleQuery" /> - - - + 搜索 重置 @@ -26,27 +18,6 @@ - - 新增 - - - 修改 - - - - - - - - - + + + + + + + \ No newline at end of file + diff --git a/ruoyi-ui/src/views/business/english/translation/index.vue b/ruoyi-ui/src/views/business/english/translation/index.vue new file mode 100644 index 00000000..b682d95e --- /dev/null +++ b/ruoyi-ui/src/views/business/english/translation/index.vue @@ -0,0 +1,196 @@ + + + diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/controller/ApiLogController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/controller/ApiLogController.java index 1967afc7..1f7e1869 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/controller/ApiLogController.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/controller/ApiLogController.java @@ -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 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 list = apiLogService.selectApiLogList(apiLog); ExcelUtil util = new ExcelUtil(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)); } diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/service/IApiLogService.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/service/IApiLogService.java index ca81a8f6..2e39d272 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/service/IApiLogService.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/service/IApiLogService.java @@ -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 selectApiLogList(ApiLog apiLog); + List 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); } diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java index 35fd2d9e..4f9fbead 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java @@ -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())) { diff --git a/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml b/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml index ea757a1b..db858c35 100644 --- a/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml +++ b/xjs-business/xjs-business-english/src/main/resources/mapper/english/ApiLogMapper.xml @@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and api_name like concat('%', #{apiName}, '%') and is_success = #{isSuccess} + order by id desc